diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c97cb41
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,3 @@
+FROM postgres:15-alpine
+EXPOSE 5432:5432
+ENV POSTGRES_PASSWORD=password
\ No newline at end of file
diff --git a/InnoMetrics-RestAPI/src/main/resources/application-dev.properties b/InnoMetrics-RestAPI/src/main/resources/application-dev.properties
index 7cb120d..2a57182 100644
--- a/InnoMetrics-RestAPI/src/main/resources/application-dev.properties
+++ b/InnoMetrics-RestAPI/src/main/resources/application-dev.properties
@@ -3,5 +3,5 @@
#spring.datasource.password = postgres
#eureka.instance.ip-address=127.0.0.1
eureka.client.serviceUrl.defaultZone= http://localhost:8761/eureka/
-spring.datasource.url = jdbc:postgresql://10.90.138.244:5432/postgres
-spring.datasource.password = 1nn0M3tr1c5
\ No newline at end of file
+spring.datasource.url = jdbc:postgresql://localhost:5432/postgres
+spring.datasource.password = password
\ No newline at end of file
diff --git a/InnoMetrics-RestAPI/src/main/resources/liquibase/DBCreation.yml b/InnoMetrics-RestAPI/src/main/resources/liquibase/DBCreation.yml
old mode 100644
new mode 100755
index 17b99a0..dbceeb3
--- a/InnoMetrics-RestAPI/src/main/resources/liquibase/DBCreation.yml
+++ b/InnoMetrics-RestAPI/src/main/resources/liquibase/DBCreation.yml
@@ -1,503 +1,504 @@
-databaseChangeLog:
- - changeSet:
- id: SchemaCreation_innometrics
- author: xvasquez
- changes:
- - sql: "CREATE SCHEMA innometrics;"
- - changeSet:
- id: DatabaseCreation_innometrics
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometrics
- tableName: role
- remarks: Table to store system roles information
- columns:
- - column:
- name: name
- type: Varchar(256)
- constraints:
- primaryKey: true
- primaryKeyName: role_pk
- - column:
- name: description
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometrics
- tableName: user
- remarks: Table to store users information
- columns:
- - column:
- name: email
- type: Varchar(256)
- constraints:
- primaryKey: true
- primaryKeyName: user_pk
- - column:
- name: password
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: name
- type: Varchar(1024)
- - column:
- name: surname
- type: Varchar(1024)
- - column:
- name: confirmed_at
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometrics
- tableName: user_roles
- remarks: Table to store the role associated to a user
- columns:
- - column:
- name: name
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_role
- references: innometrics.role(name)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: project
- remarks: Table to store users information
- columns:
- - column:
- name: projectid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: project_pk
- - column:
- name: name
- type: Varchar(256)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometrics
- tableName: project_managers
- remarks: Table to store the list of managers for each project
- columns:
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_managers
- references: innometrics.project(projectid)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_managers
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: project_users
- remarks: Table to store the list of users for each project
- columns:
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_users
- references: innometrics.project(projectid)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_users
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: invited_managers
- remarks: Table to store the list of invited managers for each project
- columns:
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_invmanagers
- references: innometrics.project(projectid)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_invmanagers
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: invited_users
- remarks: Table to store the list of invited users for each project
- columns:
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_invusers
- references: innometrics.project(projectid)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_invusers
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: activity
- remarks: Table to store activities information
- columns:
- - column:
- name: activityid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: activity_pk
- - column:
- name: activitytype
- type: Varchar(256)
- constraints:
- nullable: false
- defaultValue: "os"
- - column:
- name: idle_activity
- type: Boolean
- constraints:
- nullable: false
- defaultValue: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_activity
- references: innometrics.user(email)
- nullable: false
- - column:
- name: start_time
- type: Date
- constraints:
- nullable: false
- - column:
- name: end_time
- type: Date
- constraints:
- nullable: false
- - column:
- name: executable_name
- type: Varchar(512)
- constraints:
- nullable: false
- - column:
- name: browser_url
- type: Varchar(1024)
- - column:
- name: browser_title
- type: Varchar(1024)
- - column:
- name: ip_address
- type: Varchar(1024)
- - column:
- name: mac_address
- type: Varchar(1024)
- - column:
- name: value
- type: Varchar(1024)
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: Measure_tables_creation
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometrics
- tableName: measurementtypes
- remarks: Table to store the types of measurements that can be collected
- columns:
- - column:
- name: measurementtypeid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: measurementtypes_pk
- - column:
- name: label
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: description
- type: varchar(1024)
- - column:
- name: weight
- type: float
- constraints:
- nullable: false
- - column:
- name: scale
- type: float
- - column:
- name: operation
- type: Varchar(100)
- - column:
- name: isActive
- type: varchar(1)
- constraints:
- nullable: false
- defaultValue: "Y"
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometrics
- tableName: measurements
- remarks: Table the measurements collected by each data collector
- columns:
- - column:
- name: id
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: measurements_pk
- - column:
- name: activityid
- type: Integer
- constraints:
- foreignKeyName: fk_activity_measurement
- references: innometrics.activity(activityid)
- nullable: false
- - column:
- name: measurementtypeid
- type: Integer
- constraints:
- foreignKeyName: fk_measuretype_measurement
- references: innometrics.measurementtypes(measurementtypeid)
- nullable: false
- - column:
- name: value
- type: float
- constraints:
- nullable: false
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: rename_column
- author: xvasquez
- changes:
- - renameColumn:
- schemaName: innometrics
- tableName: measurementtypes
- columnDataType: varchar(1)
- newColumnName: isactive
- oldColumnName: isActive
- - changeSet:
- id: refactor_measurement_table
- author: xvasquez
- changes:
- - modifyDataType:
- schemaName: innometrics
- tableName: measurements
- columnName: value
- newDataType: Varchar(128)
- - addColumn:
- schemaName: innometrics
- tableName: measurements
- columns:
- - column:
- name: alternativelabel
- type: Varchar(256)
- - changeSet:
- id: remove_fk_for_activitie_users
- author: xvasquez
- changes:
- - dropForeignKeyConstraint:
- baseTableName: activity
- baseTableSchemaName: innometrics
- constraintName: fk_user_activity
-
- - changeSet:
- id: creation_table_to_manage_collector_version
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometrics
- tableName: collector_version
- columns:
- - column:
- name: id
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: collectorversion_pk
- - column:
- name: osversion
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: value
- type: Varchar(25)
- constraints:
- nullable: false
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
+databaseChangeLog:
+ - changeSet:
+ id: SchemaCreation_innometrics
+ author: xvasquez
+ changes:
+ # SOMETHING WRONG SAME SCHEMA IN ACTIVITIES COLLECTOR!!!
+ - sql: "CREATE SCHEMA innometrics;"
+ - changeSet:
+ id: DatabaseCreation_innometrics
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometrics
+ tableName: role
+ remarks: Table to store system roles information
+ columns:
+ - column:
+ name: name
+ type: Varchar(256)
+ constraints:
+ primaryKey: true
+ primaryKeyName: role_pk
+ - column:
+ name: description
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometrics
+ tableName: user
+ remarks: Table to store users information
+ columns:
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ primaryKey: true
+ primaryKeyName: user_pk
+ - column:
+ name: password
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: name
+ type: Varchar(1024)
+ - column:
+ name: surname
+ type: Varchar(1024)
+ - column:
+ name: confirmed_at
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometrics
+ tableName: user_roles
+ remarks: Table to store the role associated to a user
+ columns:
+ - column:
+ name: name
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_role
+ references: innometrics.role(name)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: project
+ remarks: Table to store users information
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: project_pk
+ - column:
+ name: name
+ type: Varchar(256)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometrics
+ tableName: project_managers
+ remarks: Table to store the list of managers for each project
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_project_managers
+ references: innometrics.project(projectid)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_managers
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: project_users
+ remarks: Table to store the list of users for each project
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_project_users
+ references: innometrics.project(projectid)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_users
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: invited_managers
+ remarks: Table to store the list of invited managers for each project
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_project_invmanagers
+ references: innometrics.project(projectid)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_invmanagers
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: invited_users
+ remarks: Table to store the list of invited users for each project
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_project_invusers
+ references: innometrics.project(projectid)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_invusers
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: activity
+ remarks: Table to store activities information
+ columns:
+ - column:
+ name: activityid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: activity_pk
+ - column:
+ name: activitytype
+ type: Varchar(256)
+ constraints:
+ nullable: false
+ defaultValue: "os"
+ - column:
+ name: idle_activity
+ type: Boolean
+ constraints:
+ nullable: false
+ defaultValue: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_activity
+ references: innometrics.user(email)
+ nullable: false
+ - column:
+ name: start_time
+ type: Date
+ constraints:
+ nullable: false
+ - column:
+ name: end_time
+ type: Date
+ constraints:
+ nullable: false
+ - column:
+ name: executable_name
+ type: Varchar(512)
+ constraints:
+ nullable: false
+ - column:
+ name: browser_url
+ type: Varchar(1024)
+ - column:
+ name: browser_title
+ type: Varchar(1024)
+ - column:
+ name: ip_address
+ type: Varchar(1024)
+ - column:
+ name: mac_address
+ type: Varchar(1024)
+ - column:
+ name: value
+ type: Varchar(1024)
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: Measure_tables_creation
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometrics
+ tableName: measurementtypes
+ remarks: Table to store the types of measurements that can be collected
+ columns:
+ - column:
+ name: measurementtypeid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: measurementtypes_pk
+ - column:
+ name: label
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: description
+ type: varchar(1024)
+ - column:
+ name: weight
+ type: float
+ constraints:
+ nullable: false
+ - column:
+ name: scale
+ type: float
+ - column:
+ name: operation
+ type: Varchar(100)
+ - column:
+ name: isActive
+ type: varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: "Y"
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometrics
+ tableName: measurements
+ remarks: Table the measurements collected by each data collector
+ columns:
+ - column:
+ name: id
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: measurements_pk
+ - column:
+ name: activityid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_activity_measurement
+ references: innometrics.activity(activityid)
+ nullable: false
+ - column:
+ name: measurementtypeid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_measuretype_measurement
+ references: innometrics.measurementtypes(measurementtypeid)
+ nullable: false
+ - column:
+ name: value
+ type: float
+ constraints:
+ nullable: false
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: rename_column
+ author: xvasquez
+ changes:
+ - renameColumn:
+ schemaName: innometrics
+ tableName: measurementtypes
+ columnDataType: varchar(1)
+ newColumnName: isactive
+ oldColumnName: isActive
+ - changeSet:
+ id: refactor_measurement_table
+ author: xvasquez
+ changes:
+ - modifyDataType:
+ schemaName: innometrics
+ tableName: measurements
+ columnName: value
+ newDataType: Varchar(128)
+ - addColumn:
+ schemaName: innometrics
+ tableName: measurements
+ columns:
+ - column:
+ name: alternativelabel
+ type: Varchar(256)
+ - changeSet:
+ id: remove_fk_for_activitie_users
+ author: xvasquez
+ changes:
+ - dropForeignKeyConstraint:
+ baseTableName: activity
+ baseTableSchemaName: innometrics
+ constraintName: fk_user_activity
+
+ - changeSet:
+ id: creation_table_to_manage_collector_version
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometrics
+ tableName: collector_version
+ columns:
+ - column:
+ name: id
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: collectorversion_pk
+ - column:
+ name: osversion
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: value
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
type: Varchar(25)
\ No newline at end of file
diff --git a/InnoMetrics-RestAPI/src/main/resources/liquibaseScript.xml b/InnoMetrics-RestAPI/src/main/resources/liquibaseScript.xml
index c514959..fbe9ba7 100644
--- a/InnoMetrics-RestAPI/src/main/resources/liquibaseScript.xml
+++ b/InnoMetrics-RestAPI/src/main/resources/liquibaseScript.xml
@@ -4,7 +4,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
-
-
+
diff --git a/InnoMetrics-RestAPI/target/classes/application-dev.properties b/InnoMetrics-RestAPI/target/classes/application-dev.properties
index 7cb120d..2a57182 100644
--- a/InnoMetrics-RestAPI/target/classes/application-dev.properties
+++ b/InnoMetrics-RestAPI/target/classes/application-dev.properties
@@ -3,5 +3,5 @@
#spring.datasource.password = postgres
#eureka.instance.ip-address=127.0.0.1
eureka.client.serviceUrl.defaultZone= http://localhost:8761/eureka/
-spring.datasource.url = jdbc:postgresql://10.90.138.244:5432/postgres
-spring.datasource.password = 1nn0M3tr1c5
\ No newline at end of file
+spring.datasource.url = jdbc:postgresql://localhost:5432/postgres
+spring.datasource.password = password
\ No newline at end of file
diff --git a/InnoMetrics-RestAPI/target/classes/liquibase/DBCreation.yml b/InnoMetrics-RestAPI/target/classes/liquibase/DBCreation.yml
index 17b99a0..dbceeb3 100644
--- a/InnoMetrics-RestAPI/target/classes/liquibase/DBCreation.yml
+++ b/InnoMetrics-RestAPI/target/classes/liquibase/DBCreation.yml
@@ -1,503 +1,504 @@
-databaseChangeLog:
- - changeSet:
- id: SchemaCreation_innometrics
- author: xvasquez
- changes:
- - sql: "CREATE SCHEMA innometrics;"
- - changeSet:
- id: DatabaseCreation_innometrics
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometrics
- tableName: role
- remarks: Table to store system roles information
- columns:
- - column:
- name: name
- type: Varchar(256)
- constraints:
- primaryKey: true
- primaryKeyName: role_pk
- - column:
- name: description
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometrics
- tableName: user
- remarks: Table to store users information
- columns:
- - column:
- name: email
- type: Varchar(256)
- constraints:
- primaryKey: true
- primaryKeyName: user_pk
- - column:
- name: password
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: name
- type: Varchar(1024)
- - column:
- name: surname
- type: Varchar(1024)
- - column:
- name: confirmed_at
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometrics
- tableName: user_roles
- remarks: Table to store the role associated to a user
- columns:
- - column:
- name: name
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_role
- references: innometrics.role(name)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: project
- remarks: Table to store users information
- columns:
- - column:
- name: projectid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: project_pk
- - column:
- name: name
- type: Varchar(256)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometrics
- tableName: project_managers
- remarks: Table to store the list of managers for each project
- columns:
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_managers
- references: innometrics.project(projectid)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_managers
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: project_users
- remarks: Table to store the list of users for each project
- columns:
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_users
- references: innometrics.project(projectid)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_users
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: invited_managers
- remarks: Table to store the list of invited managers for each project
- columns:
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_invmanagers
- references: innometrics.project(projectid)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_invmanagers
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: invited_users
- remarks: Table to store the list of invited users for each project
- columns:
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_invusers
- references: innometrics.project(projectid)
- nullable: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_invusers
- references: innometrics.user(email)
- nullable: false
- - createTable:
- schemaName: innometrics
- tableName: activity
- remarks: Table to store activities information
- columns:
- - column:
- name: activityid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: activity_pk
- - column:
- name: activitytype
- type: Varchar(256)
- constraints:
- nullable: false
- defaultValue: "os"
- - column:
- name: idle_activity
- type: Boolean
- constraints:
- nullable: false
- defaultValue: false
- - column:
- name: email
- type: Varchar(256)
- constraints:
- foreignKeyName: fk_user_activity
- references: innometrics.user(email)
- nullable: false
- - column:
- name: start_time
- type: Date
- constraints:
- nullable: false
- - column:
- name: end_time
- type: Date
- constraints:
- nullable: false
- - column:
- name: executable_name
- type: Varchar(512)
- constraints:
- nullable: false
- - column:
- name: browser_url
- type: Varchar(1024)
- - column:
- name: browser_title
- type: Varchar(1024)
- - column:
- name: ip_address
- type: Varchar(1024)
- - column:
- name: mac_address
- type: Varchar(1024)
- - column:
- name: value
- type: Varchar(1024)
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: Measure_tables_creation
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometrics
- tableName: measurementtypes
- remarks: Table to store the types of measurements that can be collected
- columns:
- - column:
- name: measurementtypeid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: measurementtypes_pk
- - column:
- name: label
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: description
- type: varchar(1024)
- - column:
- name: weight
- type: float
- constraints:
- nullable: false
- - column:
- name: scale
- type: float
- - column:
- name: operation
- type: Varchar(100)
- - column:
- name: isActive
- type: varchar(1)
- constraints:
- nullable: false
- defaultValue: "Y"
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometrics
- tableName: measurements
- remarks: Table the measurements collected by each data collector
- columns:
- - column:
- name: id
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: measurements_pk
- - column:
- name: activityid
- type: Integer
- constraints:
- foreignKeyName: fk_activity_measurement
- references: innometrics.activity(activityid)
- nullable: false
- - column:
- name: measurementtypeid
- type: Integer
- constraints:
- foreignKeyName: fk_measuretype_measurement
- references: innometrics.measurementtypes(measurementtypeid)
- nullable: false
- - column:
- name: value
- type: float
- constraints:
- nullable: false
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: rename_column
- author: xvasquez
- changes:
- - renameColumn:
- schemaName: innometrics
- tableName: measurementtypes
- columnDataType: varchar(1)
- newColumnName: isactive
- oldColumnName: isActive
- - changeSet:
- id: refactor_measurement_table
- author: xvasquez
- changes:
- - modifyDataType:
- schemaName: innometrics
- tableName: measurements
- columnName: value
- newDataType: Varchar(128)
- - addColumn:
- schemaName: innometrics
- tableName: measurements
- columns:
- - column:
- name: alternativelabel
- type: Varchar(256)
- - changeSet:
- id: remove_fk_for_activitie_users
- author: xvasquez
- changes:
- - dropForeignKeyConstraint:
- baseTableName: activity
- baseTableSchemaName: innometrics
- constraintName: fk_user_activity
-
- - changeSet:
- id: creation_table_to_manage_collector_version
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometrics
- tableName: collector_version
- columns:
- - column:
- name: id
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: collectorversion_pk
- - column:
- name: osversion
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: value
- type: Varchar(25)
- constraints:
- nullable: false
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
+databaseChangeLog:
+ - changeSet:
+ id: SchemaCreation_innometrics
+ author: xvasquez
+ changes:
+ # SOMETHING WRONG SAME SCHEMA IN ACTIVITIES COLLECTOR!!!
+ - sql: "CREATE SCHEMA innometrics;"
+ - changeSet:
+ id: DatabaseCreation_innometrics
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometrics
+ tableName: role
+ remarks: Table to store system roles information
+ columns:
+ - column:
+ name: name
+ type: Varchar(256)
+ constraints:
+ primaryKey: true
+ primaryKeyName: role_pk
+ - column:
+ name: description
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometrics
+ tableName: user
+ remarks: Table to store users information
+ columns:
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ primaryKey: true
+ primaryKeyName: user_pk
+ - column:
+ name: password
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: name
+ type: Varchar(1024)
+ - column:
+ name: surname
+ type: Varchar(1024)
+ - column:
+ name: confirmed_at
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometrics
+ tableName: user_roles
+ remarks: Table to store the role associated to a user
+ columns:
+ - column:
+ name: name
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_role
+ references: innometrics.role(name)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: project
+ remarks: Table to store users information
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: project_pk
+ - column:
+ name: name
+ type: Varchar(256)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometrics
+ tableName: project_managers
+ remarks: Table to store the list of managers for each project
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_project_managers
+ references: innometrics.project(projectid)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_managers
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: project_users
+ remarks: Table to store the list of users for each project
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_project_users
+ references: innometrics.project(projectid)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_users
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: invited_managers
+ remarks: Table to store the list of invited managers for each project
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_project_invmanagers
+ references: innometrics.project(projectid)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_invmanagers
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: invited_users
+ remarks: Table to store the list of invited users for each project
+ columns:
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_project_invusers
+ references: innometrics.project(projectid)
+ nullable: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_invusers
+ references: innometrics.user(email)
+ nullable: false
+ - createTable:
+ schemaName: innometrics
+ tableName: activity
+ remarks: Table to store activities information
+ columns:
+ - column:
+ name: activityid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: activity_pk
+ - column:
+ name: activitytype
+ type: Varchar(256)
+ constraints:
+ nullable: false
+ defaultValue: "os"
+ - column:
+ name: idle_activity
+ type: Boolean
+ constraints:
+ nullable: false
+ defaultValue: false
+ - column:
+ name: email
+ type: Varchar(256)
+ constraints:
+ foreignKeyName: fk_user_activity
+ references: innometrics.user(email)
+ nullable: false
+ - column:
+ name: start_time
+ type: Date
+ constraints:
+ nullable: false
+ - column:
+ name: end_time
+ type: Date
+ constraints:
+ nullable: false
+ - column:
+ name: executable_name
+ type: Varchar(512)
+ constraints:
+ nullable: false
+ - column:
+ name: browser_url
+ type: Varchar(1024)
+ - column:
+ name: browser_title
+ type: Varchar(1024)
+ - column:
+ name: ip_address
+ type: Varchar(1024)
+ - column:
+ name: mac_address
+ type: Varchar(1024)
+ - column:
+ name: value
+ type: Varchar(1024)
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: Measure_tables_creation
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometrics
+ tableName: measurementtypes
+ remarks: Table to store the types of measurements that can be collected
+ columns:
+ - column:
+ name: measurementtypeid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: measurementtypes_pk
+ - column:
+ name: label
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: description
+ type: varchar(1024)
+ - column:
+ name: weight
+ type: float
+ constraints:
+ nullable: false
+ - column:
+ name: scale
+ type: float
+ - column:
+ name: operation
+ type: Varchar(100)
+ - column:
+ name: isActive
+ type: varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: "Y"
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometrics
+ tableName: measurements
+ remarks: Table the measurements collected by each data collector
+ columns:
+ - column:
+ name: id
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: measurements_pk
+ - column:
+ name: activityid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_activity_measurement
+ references: innometrics.activity(activityid)
+ nullable: false
+ - column:
+ name: measurementtypeid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_measuretype_measurement
+ references: innometrics.measurementtypes(measurementtypeid)
+ nullable: false
+ - column:
+ name: value
+ type: float
+ constraints:
+ nullable: false
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: rename_column
+ author: xvasquez
+ changes:
+ - renameColumn:
+ schemaName: innometrics
+ tableName: measurementtypes
+ columnDataType: varchar(1)
+ newColumnName: isactive
+ oldColumnName: isActive
+ - changeSet:
+ id: refactor_measurement_table
+ author: xvasquez
+ changes:
+ - modifyDataType:
+ schemaName: innometrics
+ tableName: measurements
+ columnName: value
+ newDataType: Varchar(128)
+ - addColumn:
+ schemaName: innometrics
+ tableName: measurements
+ columns:
+ - column:
+ name: alternativelabel
+ type: Varchar(256)
+ - changeSet:
+ id: remove_fk_for_activitie_users
+ author: xvasquez
+ changes:
+ - dropForeignKeyConstraint:
+ baseTableName: activity
+ baseTableSchemaName: innometrics
+ constraintName: fk_user_activity
+
+ - changeSet:
+ id: creation_table_to_manage_collector_version
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometrics
+ tableName: collector_version
+ columns:
+ - column:
+ name: id
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: collectorversion_pk
+ - column:
+ name: osversion
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: value
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
type: Varchar(25)
\ No newline at end of file
diff --git a/InnoMetrics-RestAPI/target/classes/liquibaseScript.xml b/InnoMetrics-RestAPI/target/classes/liquibaseScript.xml
index c514959..fbe9ba7 100644
--- a/InnoMetrics-RestAPI/target/classes/liquibaseScript.xml
+++ b/InnoMetrics-RestAPI/target/classes/liquibaseScript.xml
@@ -4,7 +4,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
-
-
+
diff --git a/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 05c7645..2ab0369 100644
--- a/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,102 +1 @@
-com\innopolis\innometrics\restapi\DTO\PageListResponse.class
-com\innopolis\innometrics\restapi\DTO\TimeReportResponse.class
-com\innopolis\innometrics\restapi\entity\CollectorVersion.class
-com\innopolis\innometrics\restapi\DTO\ProfileRequest.class
-com\innopolis\innometrics\restapi\repository\MeasurementTypeRepository.class
-com\innopolis\innometrics\restapi\DTO\ActivitiesReportByUserRequest.class
-com\innopolis\innometrics\restapi\DTO\MeasurementReport.class
-com\innopolis\innometrics\restapi\entity\Permission_id.class
-com\innopolis\innometrics\restapi\DTO\UserListRequest.class
-com\innopolis\innometrics\restapi\repository\PageRepository.class
-com\innopolis\innometrics\restapi\DTO\CategoryRequest.class
-com\innopolis\innometrics\restapi\DTO\CategoryResponse.class
-com\innopolis\innometrics\restapi\repository\MeasurementRepository.class
-com\innopolis\innometrics\restapi\service\TeammemberService.class
-com\innopolis\innometrics\restapi\DTO\TeamRequest.class
-com\innopolis\innometrics\restapi\DTO\AppCategoryRequest.class
-com\innopolis\innometrics\restapi\DTO\AuthRequest.class
-com\innopolis\innometrics\restapi\DTO\UserRequest.class
-com\innopolis\innometrics\restapi\DTO\BugReportRequest.class
-com\innopolis\innometrics\restapi\DTO\BugTrackingRequest.class
-com\innopolis\innometrics\restapi\controller\BugsAPI.class
-com\innopolis\innometrics\restapi\entity\Project.class
-com\innopolis\innometrics\restapi\DTO\ActivitiesReportResponse.class
-com\innopolis\innometrics\restapi\service\RoleService.class
-com\innopolis\innometrics\restapi\DTO\ActivityReport.class
-com\innopolis\innometrics\restapi\DTO\PageResponse.class
-com\innopolis\innometrics\activitiescollector\DTO\CategoriesReport.class
-com\innopolis\innometrics\restapi\DTO\DeleteRequest.class
-com\innopolis\innometrics\restapi\controller\AdminAPI.class
-com\innopolis\innometrics\restapi\DTO\CompanyRequest.class
-com\innopolis\innometrics\restapi\DTO\Report.class
-com\innopolis\innometrics\restapi\entity\Activity.class
-com\innopolis\innometrics\restapi\DTO\AppCategoryResponse.class
-com\innopolis\innometrics\restapi\DTO\AuthResponse.class
-com\innopolis\innometrics\restapi\entity\MeasurementType.class
-com\innopolis\innometrics\restapi\DTO\ProjectListRequest.class
-com\innopolis\innometrics\restapi\config\WebSecurityConfig.class
-com\innopolis\innometrics\restapi\DTO\PageRequest.class
-com\innopolis\innometrics\restapi\DTO\ProcessReport.class
-com\innopolis\innometrics\restapi\config\RestTemplateResponseErrorHandler.class
-com\innopolis\innometrics\restapi\service\ActivityService.class
-com\innopolis\innometrics\restapi\repository\CollectorVersionRepository.class
-com\innopolis\innometrics\restapi\service\CategoryService.class
-com\innopolis\innometrics\restapi\DTO\CompanyListRequest.class
-com\innopolis\innometrics\restapi\service\CompanyService.class
-com\innopolis\innometrics\restapi\DTO\ActivitiesReportByUser.class
-com\innopolis\innometrics\restapi\DTO\MeasurementTypeResponse.class
-com\innopolis\innometrics\restapi\DTO\TeamListRequest.class
-com\innopolis\innometrics\restapi\DTO\RoleRequest.class
-com\innopolis\innometrics\restapi\service\UserService.class
-com\innopolis\innometrics\restapi\DTO\ProjectRequest.class
-com\innopolis\innometrics\restapi\DTO\CumulativeActivityReport.class
-com\innopolis\innometrics\restapi\config\JwtRequestFilter.class
-com\innopolis\innometrics\restapi\controller\AuthAPI.class
-com\innopolis\innometrics\restapi\repository\ProjectRepository.class
-com\innopolis\innometrics\restapi\config\SwaggerConfig.class
-com\innopolis\innometrics\restapi\DTO\WorkingTreeListRequest.class
-com\innopolis\innometrics\restapi\service\ReportService.class
-com\innopolis\innometrics\restapi\repository\PermissionRepository.class
-com\innopolis\innometrics\restapi\config\JwtAuthenticationEntryPoint.class
-com\innopolis\innometrics\restapi\DTO\CumulativeReportResponse.class
-com\innopolis\innometrics\restapi\exceptions\BaseErrorHandler.class
-com\innopolis\innometrics\restapi\service\TeamService.class
-com\innopolis\innometrics\restapi\DTO\RoleResponse.class
-com\innopolis\innometrics\restapi\DTO\CurrentActivityReport.class
-com\innopolis\innometrics\restapi\DTO\TimeReportByUser.class
-com\innopolis\innometrics\restapi\DTO\RoleListResponse.class
-com\innopolis\innometrics\restapi\repository\ActivityRepository.class
-com\innopolis\innometrics\restapi\DTO\AddProcessReportRequest.class
-com\innopolis\innometrics\restapi\DTO\UserListResponse.class
-com\innopolis\innometrics\restapi\DTO\CategoryListResponse.class
-com\innopolis\innometrics\restapi\DTO\MeasurementTypeRequest.class
-com\innopolis\innometrics\restapi\DTO\UserResponse.class
-com\innopolis\innometrics\restapi\DTO\TimeReportRequest.class
-com\innopolis\innometrics\restapi\service\ProcessService.class
-com\innopolis\innometrics\restapi\DTO\ICategoriesReport.class
-com\innopolis\innometrics\restapi\DTO\PermissionResponse.class
-com\innopolis\innometrics\restapi\DTO\ProcessReportResponse.class
-com\innopolis\innometrics\restapi\repository\UserRepository.class
-com\innopolis\innometrics\restapi\DTO\ActivitiesReportByUserResponse.class
-com\innopolis\innometrics\restapi\entity\Page.class
-com\innopolis\innometrics\restapi\service\PermissionService.class
-com\innopolis\innometrics\restapi\entity\Measurement.class
-com\innopolis\innometrics\restapi\service\CollectorVersionService.class
-com\innopolis\innometrics\restapi\entity\User.class
-com\innopolis\innometrics\restapi\controller\DataCollectorsAPI.class
-com\innopolis\innometrics\restapi\RestapiApplication.class
-com\innopolis\innometrics\restapi\repository\RoleRepository.class
-com\innopolis\innometrics\restapi\DTO\TeammembersListRequest.class
-com\innopolis\innometrics\restapi\DTO\ProcessDayReportResponse.class
-com\innopolis\innometrics\restapi\DTO\CategoriesTimeReportResponse.class
-com\innopolis\innometrics\restapi\DTO\PageListRequest.class
-com\innopolis\innometrics\restapi\entity\Role.class
-com\innopolis\innometrics\restapi\service\ProfileService.class
-com\innopolis\innometrics\restapi\DTO\BugTrackingListRequest.class
-com\innopolis\innometrics\restapi\service\BugTrackingService.class
-com\innopolis\innometrics\restapi\DTO\WorkingTreeRequest.class
-com\innopolis\innometrics\restapi\DTO\TeammembersRequest.class
-com\innopolis\innometrics\restapi\service\AdminService.class
-com\innopolis\innometrics\restapi\entity\Permission.class
-com\innopolis\innometrics\restapi\config\JwtToken.class
-com\innopolis\innometrics\restapi\exceptions\ValidationException.class
+com/innopolis/innometrics/activitiescollector/DTO/CategoriesReport.class
diff --git a/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index a3ccab9..a870727 100644
--- a/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,102 +1,102 @@
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ProcessReport.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\MeasurementReport.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\Page.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\ReportService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\Permission_id.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ProcessReportResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\Permission.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\RoleRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\CategoryService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CompanyListRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ProfileRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\Role.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\MeasurementRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\config\JwtToken.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ActivitiesReportByUserRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CategoriesReport.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\UserRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\AuthResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\Activity.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\exceptions\ValidationException.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\TeammemberService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\Project.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ActivitiesReportByUserResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CategoriesTimeReportResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\AppCategoryRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\MeasurementType.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\WorkingTreeRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\ProcessService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ActivitiesReportResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\BugTrackingService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\config\JwtAuthenticationEntryPoint.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\AddProcessReportRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ProcessDayReportResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\UserListResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\CollectorVersion.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\UserRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\TimeReportByUser.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\PermissionService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\config\SwaggerConfig.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\BugTrackingRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CumulativeReportResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ProjectListRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\WorkingTreeListRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\CollectorVersionService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\TeamRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CurrentActivityReport.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ICategoriesReport.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CategoryListResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\controller\AuthAPI.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\BugReportRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\RoleRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\config\JwtRequestFilter.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\AdminService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\controller\BugsAPI.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\MeasurementTypeRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\DeleteRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\PageRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\UserResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\PermissionResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\TeamListRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ActivityReport.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CompanyRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ProjectRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\BugTrackingListRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\ProfileService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\AppCategoryResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\MeasurementTypeResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CategoryResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\CollectorVersionRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\CompanyService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\config\RestTemplateResponseErrorHandler.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\TimeReportResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\PageListRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\PageRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\RoleService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CategoryRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\TeammembersRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\controller\DataCollectorsAPI.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\User.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\exceptions\BaseErrorHandler.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\UserService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\PermissionRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\RoleListResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\TimeReportRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\TeamService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\ProjectRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\controller\AdminAPI.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\repository\ActivityRepository.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\config\WebSecurityConfig.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\ActivitiesReportByUser.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\Report.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\RoleResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\PageListResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\AuthRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\UserListRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\service\ActivityService.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\CumulativeActivityReport.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\entity\Measurement.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\PageResponse.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\MeasurementTypeRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\DTO\TeammembersListRequest.java
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\main\java\com\innopolis\innometrics\restapi\RestapiApplication.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ProcessDayReportResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/CategoryService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/config/RestTemplateResponseErrorHandler.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CategoryRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/RoleResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CategoriesTimeReportResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/AppCategoryResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/controller/DataCollectorsAPI.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/UserRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CategoryResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/ProcessService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/Page.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/config/JwtRequestFilter.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/BugTrackingService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CategoryListResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/TeammembersRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/PermissionRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/PageRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/TimeReportByUser.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/config/JwtAuthenticationEntryPoint.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/AuthRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/TeamRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/Role.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/exceptions/BaseErrorHandler.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/RoleRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CompanyRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/UserListResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/UserRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/Permission.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/AddProcessReportRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/RoleService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ActivitiesReportResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/controller/AdminAPI.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/ReportService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/DeleteRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/ActivityRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/controller/AuthAPI.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ProcessReportResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/AppCategoryRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/CollectorVersion.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/MeasurementTypeRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/MeasurementType.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/config/WebSecurityConfig.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ProcessReport.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/CollectorVersionService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/config/SwaggerConfig.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/ProfileService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/PageResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/PermissionResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/BugTrackingRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ActivitiesReportByUserRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ProjectListRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/PageListResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CumulativeReportResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/WorkingTreeRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/CompanyService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ActivitiesReportByUser.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ICategoriesReport.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ProjectRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/BugTrackingListRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ActivitiesReportByUserResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ProfileRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/AuthResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/TeamListRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/ProjectRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/PermissionService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/TeamService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/Activity.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/PageRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/WorkingTreeListRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/TeammemberService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CompanyListRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/User.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/UserListRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/Report.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/Measurement.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CurrentActivityReport.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/ActivityService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/MeasurementReport.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/PageListRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/UserResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/MeasurementTypeRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/RoleRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/BugReportRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CumulativeActivityReport.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/ActivityReport.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/MeasurementTypeResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/MeasurementRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/config/JwtToken.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/controller/BugsAPI.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/RoleListResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/AdminService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/Permission_id.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/exceptions/ValidationException.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/RestapiApplication.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/TimeReportResponse.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/repository/CollectorVersionRepository.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/entity/Project.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/service/UserService.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/TeammembersListRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/TimeReportRequest.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/main/java/com/innopolis/innometrics/restapi/DTO/CategoriesReport.java
diff --git a/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
index 42ea438..e69de29 100644
--- a/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -1 +0,0 @@
-com\innopolis\innometrics\restapi\RestapiApplicationTests.class
diff --git a/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
index 390f128..3abaf78 100644
--- a/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/InnoMetrics-RestAPI/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -1 +1 @@
-C:\Users\x.vasquez\Documents\repos\innometrics-java-backend\InnoMetrics-RestAPI\src\test\java\com\innopolis\innometrics\restapi\RestapiApplicationTests.java
+/mnt/c/Users/amiro/projects/innometrics-java-backend/InnoMetrics-RestAPI/src/test/java/com/innopolis/innometrics/restapi/RestapiApplicationTests.java
diff --git a/activities-collector/src/main/resources/application-dev.properties b/activities-collector/src/main/resources/application-dev.properties
index b0267ea..9a14b7c 100644
--- a/activities-collector/src/main/resources/application-dev.properties
+++ b/activities-collector/src/main/resources/application-dev.properties
@@ -1,5 +1,6 @@
eureka.client.serviceUrl.defaultZone= http://localhost:8761/eureka/
#spring.datasource.url = jdbc:postgresql://10.90.138.244:5432/
#spring.datasource.password = 1nn0M3tr1c5
-spring.datasource.url = jdbc:postgresql://188.130.155.202:25432/postgres
-spring.datasource.password = 1nn0M3tr1c5
\ No newline at end of file
+spring.datasource.url = jdbc:postgresql://localhost:5432/postgres
+spring.datasource.password = password
+spring.datasource.username = postgres
\ No newline at end of file
diff --git a/activities-collector/src/main/resources/liquibase/DBCreation.yml b/activities-collector/src/main/resources/liquibase/DBCreation.yml
index b4b6f33..d7a9323 100644
--- a/activities-collector/src/main/resources/liquibase/DBCreation.yml
+++ b/activities-collector/src/main/resources/liquibase/DBCreation.yml
@@ -851,120 +851,6 @@ databaseChangeLog:
- column:
name: osversion
type: Varchar(256)
- - changeSet:
- id: SchemaCreation_innometricscnf_
- author: xvasquez
- changes:
- - sql: "CREATE SCHEMA innometricsconfig;"
- - changeSet:
- id: configtablecreation
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometricsconfig
- tableName: cl_categories
- remarks: Table to store categories availables to the classification module
- columns:
- - column:
- name: catid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: classCategories_pk
- - column:
- name: catname
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: catdescription
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
-
- - createTable:
- schemaName: innometricsconfig
- tableName: cl_apps_categories
- remarks: Table to store the apps belong to each category
- columns:
- - column:
- name: appid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: classApps_pk
- - column:
- name: catid
- type: Integer
- constraints:
- foreignKeyName: fk_classCategories
- references: innometricsconfig.cl_categories(catid)
- nullable: false
- - column:
- name: appname
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: appdescription
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: executablefile
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- changeSet:
id: "add column mac_address to cumlativerepactivity table"
author: azag
diff --git a/activities-collector/src/main/resources/liquibaseScript.xml b/activities-collector/src/main/resources/liquibaseScript.xml
index 4f597b0..7156981 100644
--- a/activities-collector/src/main/resources/liquibaseScript.xml
+++ b/activities-collector/src/main/resources/liquibaseScript.xml
@@ -4,5 +4,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
-
+
diff --git a/agents-gateway/src/main/resources/liquibase/DBCreation.yml b/agents-gateway/src/main/resources/liquibase/DBCreation.yml
old mode 100644
new mode 100755
index 8a8b917..dd3d975
--- a/agents-gateway/src/main/resources/liquibase/DBCreation.yml
+++ b/agents-gateway/src/main/resources/liquibase/DBCreation.yml
@@ -1,552 +1,548 @@
-databaseChangeLog:
- - changeSet:
- id: SchemaCreation_innometricsagents
- author: xvasquez
- changes:
- - sql: "CREATE SCHEMA innometricsagents;"
- - changeSet:
- id: DatabaseCreation_innometricsAgents
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometricsagents
- tableName: agentconfig
- remarks: Table to store the agents basic configuration
- columns:
- - column:
- name: agentid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: agent_pk
- - column:
- name: agentname
- type: Varchar(256)
- constraints:
- nullable: false
- - column:
- name: description
- type: Varchar(1024)
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometricsagents
- tableName: agentconfigmethods
- remarks: Table to store the agents methods endpoint
- columns:
- - column:
- name: methodid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: agentconfigmethods_pk
- - column:
- name: agentid
- type: Integer
- constraints:
- foreignKeyName: fk_agentconfig
- references: innometricsagents.agentconfig(agentid)
- nullable: false
- - column:
- name: endpoint
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: description
- type: Varchar(128)
- - column:
- name: operation
- type: Varchar(128)
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometricsagents
- tableName: agentconfigdetails
- remarks: Table to store the details of agents configuration
- columns:
- - column:
- name: configdetid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: agentconfigdet_pk
- - column:
- name: methodid
- type: Integer
- constraints:
- foreignKeyName: fk_methodconfig
- references: innometricsagents.agentconfigmethods(methodid)
- nullable: false
- - column:
- name: paramname
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: paramtype
- type: Varchar(128)
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValue: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: adding_response_config_table
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometricsagents
- tableName: agentresponseconfig
- remarks: Table to store the details of agents response configuration
- columns:
- - column:
- name: configresponseid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: agentresponseconfig_pk
- - column:
- name: methodid
- type: Integer
- constraints:
- foreignKeyName: fk_methodresponseconfig
- references: innometricsagents.agentconfigmethods(methodid)
- nullable: false
- - column:
- name: responseparam
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: paramname
- type: Varchar(128)
- - column:
- name: paramtype
- type: Varchar(128)
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: "adding request type to methods config"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfigmethods
- columns:
- - column:
- name: requesttype
- type: Varchar(256)
- - changeSet:
- id: "adding fetching data structures"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: sourcetype
- type: Varchar(256)
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: dbschemasource
- type: Varchar(256)
- - createTable:
- schemaName: innometricsagents
- tableName: repos_x_project
- remarks: Table to store the relationship between a particular project and its corresponding repos
- columns:
- - column:
- name: configid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: reposproject_pk
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_auth_users
- references: innometricsauth.project(projectid)
- nullable: false
- - column:
- name: agentid
- type: Integer
- constraints:
- foreignKeyName: fk_agentconfig_fetching
- references: innometricsagents.agentconfig(agentid)
- nullable: false
- - column:
- name: repoid
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometricsagents
- tableName: agent_data_config
- remarks: Table to store the configuration to fetch the events data from the data base
- columns:
- - column:
- name: datacofingid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: dataconfig_pk
- - column:
- name: agentid
- type: Integer
- constraints:
- foreignKeyName: fk_agentconfig_data
- references: innometricsagents.agentconfig(agentid)
- nullable: false
- - column:
- name: schemaname
- type: Varchar(128)
- constraints:
- nullable: true
- - column:
- name: tablename
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: eventdatefield
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: eventauthorfield
- type: Varchar(128)
- constraints:
- nullable: false
- - column:
- name: eventdescriptionfield
- type: Varchar(128)
- constraints:
- nullable: true
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: "adding repo id field to agent configuration"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: repoidfield
- type: Varchar(256)
- - changeSet:
- id: "adding event type to data config"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agent_data_config
- columns:
- - column:
- name: eventtype
- type: Varchar(256)
- - changeSet:
- id: "adding OAuth field to agent configuration"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: oauthuri
- type: Varchar(256)
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: authenticationmethod
- type: Varchar(256)
- - changeSet:
- id: "update OAuth field to agent configuration"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: accesstokenendpoint
- type: Varchar(256)
- constraints:
- nullable: true
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: authorizationbaseurl
- type: Varchar(256)
- constraints:
- nullable: true
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: requesttokenendpoint
- type: Varchar(256)
- constraints:
- nullable: true
- - changeSet:
- id: "update OAuth API field to agent configuration"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: apikey
- type: Varchar(256)
- constraints:
- nullable: true
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfig
- columns:
- - column:
- name: apisecret
- type: Varchar(256)
- constraints:
- nullable: true
- - changeSet:
- id: "adding agents_x_project table"
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometricsagents
- tableName: agents_x_project
- remarks: Table to store the relationship between a particular project and its corresponding agents
- columns:
- - column:
- name: configid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: agentsproject_pk
- - column:
- name: projectid
- type: Integer
- constraints:
- foreignKeyName: fk_project_agents
- references: innometricsauth.project(projectid)
- nullable: false
- - column:
- name: agentid
- type: Integer
- constraints:
- foreignKeyName: fk_agent_projects
- references: innometricsagents.agentconfig(agentid)
- nullable: false
- - column:
- name: key
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: token
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: "adding request param name to agentconfigdetails"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfigdetails
- columns:
- - column:
- name: requestparam
- type: Varchar(256)
- constraints:
- nullable: true
- - changeSet:
- id: "adding default value for request param name to agentconfigdetails"
- author: xvasquez
- changes:
- - addColumn:
- schemaName: innometricsagents
- tableName: agentconfigdetails
- columns:
- - column:
- name: defaultvalue
- type: Varchar(256)
- constraints:
- nullable: true
+databaseChangeLog:
+ - changeSet:
+ id: SchemaCreation_innometricsagents
+ author: xvasquez
+ changes:
+ - sql: "CREATE SCHEMA innometricsagents;"
+ - changeSet:
+ id: DatabaseCreation_innometricsAgents
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ remarks: Table to store the agents basic configuration
+ columns:
+ - column:
+ name: agentid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: agent_pk
+ - column:
+ name: agentname
+ type: Varchar(256)
+ constraints:
+ nullable: false
+ - column:
+ name: description
+ type: Varchar(1024)
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometricsagents
+ tableName: agentconfigmethods
+ remarks: Table to store the agents methods endpoint
+ columns:
+ - column:
+ name: methodid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: agentconfigmethods_pk
+ - column:
+ name: agentid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agentconfig
+ references: innometricsagents.agentconfig(agentid)
+ nullable: false
+ - column:
+ name: endpoint
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: description
+ type: Varchar(128)
+ - column:
+ name: operation
+ type: Varchar(128)
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometricsagents
+ tableName: agentconfigdetails
+ remarks: Table to store the details of agents configuration
+ columns:
+ - column:
+ name: configdetid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: agentconfigdet_pk
+ - column:
+ name: methodid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_methodconfig
+ references: innometricsagents.agentconfigmethods(methodid)
+ nullable: false
+ - column:
+ name: paramname
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: paramtype
+ type: Varchar(128)
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValue: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: adding_response_config_table
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometricsagents
+ tableName: agentresponseconfig
+ remarks: Table to store the details of agents response configuration
+ columns:
+ - column:
+ name: configresponseid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: agentresponseconfig_pk
+ - column:
+ name: methodid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_methodresponseconfig
+ references: innometricsagents.agentconfigmethods(methodid)
+ nullable: false
+ - column:
+ name: responseparam
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: paramname
+ type: Varchar(128)
+ - column:
+ name: paramtype
+ type: Varchar(128)
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: "adding request type to methods config"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfigmethods
+ columns:
+ - column:
+ name: requesttype
+ type: Varchar(256)
+ - changeSet:
+ id: "adding fetching data structures"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: sourcetype
+ type: Varchar(256)
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: dbschemasource
+ type: Varchar(256)
+ - createTable:
+ schemaName: innometricsagents
+ tableName: repos_x_project
+ remarks: Table to store the relationship between a particular project and its corresponding repos
+ columns:
+ - column:
+ name: configid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: reposproject_pk
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ nullable: false
+ - column:
+ name: agentid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agentconfig_fetching
+ references: innometricsagents.agentconfig(agentid)
+ nullable: false
+ - column:
+ name: repoid
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometricsagents
+ tableName: agent_data_config
+ remarks: Table to store the configuration to fetch the events data from the data base
+ columns:
+ - column:
+ name: datacofingid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: dataconfig_pk
+ - column:
+ name: agentid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agentconfig_data
+ references: innometricsagents.agentconfig(agentid)
+ nullable: false
+ - column:
+ name: schemaname
+ type: Varchar(128)
+ constraints:
+ nullable: true
+ - column:
+ name: tablename
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: eventdatefield
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: eventauthorfield
+ type: Varchar(128)
+ constraints:
+ nullable: false
+ - column:
+ name: eventdescriptionfield
+ type: Varchar(128)
+ constraints:
+ nullable: true
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: "adding repo id field to agent configuration"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: repoidfield
+ type: Varchar(256)
+ - changeSet:
+ id: "adding event type to data config"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agent_data_config
+ columns:
+ - column:
+ name: eventtype
+ type: Varchar(256)
+ - changeSet:
+ id: "adding OAuth field to agent configuration"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: oauthuri
+ type: Varchar(256)
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: authenticationmethod
+ type: Varchar(256)
+ - changeSet:
+ id: "update OAuth field to agent configuration"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: accesstokenendpoint
+ type: Varchar(256)
+ constraints:
+ nullable: true
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: authorizationbaseurl
+ type: Varchar(256)
+ constraints:
+ nullable: true
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: requesttokenendpoint
+ type: Varchar(256)
+ constraints:
+ nullable: true
+ - changeSet:
+ id: "update OAuth API field to agent configuration"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: apikey
+ type: Varchar(256)
+ constraints:
+ nullable: true
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfig
+ columns:
+ - column:
+ name: apisecret
+ type: Varchar(256)
+ constraints:
+ nullable: true
+ - changeSet:
+ id: "adding agents_x_project table"
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometricsagents
+ tableName: agents_x_project
+ remarks: Table to store the relationship between a particular project and its corresponding agents
+ columns:
+ - column:
+ name: configid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: agentsproject_pk
+ - column:
+ name: projectid
+ type: Integer
+ constraints:
+ nullable: false
+ - column:
+ name: agentid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agent_projects
+ references: innometricsagents.agentconfig(agentid)
+ nullable: false
+ - column:
+ name: key
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: token
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: "adding request param name to agentconfigdetails"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfigdetails
+ columns:
+ - column:
+ name: requestparam
+ type: Varchar(256)
+ constraints:
+ nullable: true
+ - changeSet:
+ id: "adding default value for request param name to agentconfigdetails"
+ author: xvasquez
+ changes:
+ - addColumn:
+ schemaName: innometricsagents
+ tableName: agentconfigdetails
+ columns:
+ - column:
+ name: defaultvalue
+ type: Varchar(256)
+ constraints:
+ nullable: true
diff --git a/agents-gateway/src/main/resources/liquibase/DBUpdate.yml b/agents-gateway/src/main/resources/liquibase/DBUpdate.yml
old mode 100644
new mode 100755
index 3cdb6b2..70e67a8
--- a/agents-gateway/src/main/resources/liquibase/DBUpdate.yml
+++ b/agents-gateway/src/main/resources/liquibase/DBUpdate.yml
@@ -1,136 +1,132 @@
-databaseChangeLog:
- - changeSet:
- id: "update db structure agents"
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometricsagents
- tableName: agents_x_company
- remarks: "Table to store the configuration for an agent linked to on particular company"
- columns:
- - column:
- name: configid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: agentscompany_pk
- - column:
- name: companyid
- type: Integer
- constraints:
- foreignKeyName: fk_company_agents
- references: innometricsauth.company(companyid)
- nullable: false
- - column:
- name: agentid
- type: Integer
- constraints:
- foreignKeyName: fk_agent_projects
- references: innometricsagents.agentconfig(agentid)
- nullable: false
- - column:
- name: key
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: token
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometricsagents
- tableName: externalproject_x_team
- remarks: Table to store teams information
- columns:
- - column:
- name: configid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: externalproject_pk
- - column:
- name: teamid
- type: Integer
- constraints:
- foreignKeyName: fk_teams_auth_project
- references: innometricsauth.teams(teamid)
- nullable: false
- - column:
- name: agentid
- type: Integer
- constraints:
- foreignKeyName: fk_agentconfig_fetching
- references: innometricsagents.agentconfig(agentid)
- nullable: false
- - column:
- name: repoid
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - changeSet:
- id: "Remove not null constraint"
- author: xvasquez
- changes:
- - dropNotNullConstraint:
- schemaName: innometricsagents
- tableName: agents_x_company
- columnName: key
- - changeSet:
- id: "Remove not null constraint 2"
- author: xvasquez
- changes:
- - dropNotNullConstraint:
- schemaName: innometricsagents
- tableName: agents_x_project
+databaseChangeLog:
+ - changeSet:
+ id: "update db structure agents"
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometricsagents
+ tableName: agents_x_company
+ remarks: "Table to store the configuration for an agent linked to on particular company"
+ columns:
+ - column:
+ name: configid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: agentscompany_pk
+ - column:
+ name: companyid
+ type: Integer
+ constraints:
+ nullable: false
+ - column:
+ name: agentid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agent_projects
+ references: innometricsagents.agentconfig(agentid)
+ nullable: false
+ - column:
+ name: key
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: token
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometricsagents
+ tableName: externalproject_x_team
+ remarks: Table to store teams information
+ columns:
+ - column:
+ name: configid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: externalproject_pk
+ - column:
+ name: teamid
+ type: Integer
+ constraints:
+ nullable: false
+ - column:
+ name: agentid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agentconfig_fetching
+ references: innometricsagents.agentconfig(agentid)
+ nullable: false
+ - column:
+ name: repoid
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - changeSet:
+ id: "Remove not null constraint"
+ author: xvasquez
+ changes:
+ - dropNotNullConstraint:
+ schemaName: innometricsagents
+ tableName: agents_x_company
+ columnName: key
+ - changeSet:
+ id: "Remove not null constraint 2"
+ author: xvasquez
+ changes:
+ - dropNotNullConstraint:
+ schemaName: innometricsagents
+ tableName: agents_x_project
columnName: key
\ No newline at end of file
diff --git a/agents-gateway/src/main/resources/liquibase/DBUpdate2.yml b/agents-gateway/src/main/resources/liquibase/DBUpdate2.yml
old mode 100644
new mode 100755
index a15af24..c9727f6
--- a/agents-gateway/src/main/resources/liquibase/DBUpdate2.yml
+++ b/agents-gateway/src/main/resources/liquibase/DBUpdate2.yml
@@ -1,180 +1,180 @@
-databaseChangeLog:
- - changeSet:
- id: "multi agent handler"
- author: xvasquez
- changes:
- - createTable:
- schemaName: innometricsagents
- tableName: agent_webhooks
- remarks: "Table to store the webhook header"
- columns:
- - column:
- name: webookid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: webhook_pk
- - column:
- name: agentid
- type: Integer
- constraints:
- foreignKeyName: fk_agent_webhooks
- references: innometricsagents.agentconfig(agentid)
- nullable: false
- - column:
- name: webhooktag
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometricsagents
- tableName: webhook_mapping
- remarks: "Table to store the configuration for the webhook fields"
- columns:
- - column:
- name: configid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: webhook_mapping_pk
- - column:
- name: webookid
- type: Integer
- constraints:
- foreignKeyName: fk_agent_webhooks
- references: innometricsagents.agent_webhooks(webookid)
- nullable: false
- - column:
- name: eventfieldid
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: mappingrule
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: defaultvalue
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: datatype
- type: Varchar(100)
- constraints:
- nullable: false
- - column:
- name: isactive
- type: Varchar(1)
- constraints:
- nullable: false
- defaultValue: 'Y'
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
- type: Varchar(25)
- - createTable:
- schemaName: innometricsagents
- tableName: repos_events
- remarks: "table to store multiple agents events"
- columns:
- - column:
- name: eventid
- type: Integer
- autoIncrement: true
- constraints:
- primaryKey: true
- primaryKeyName: repos_events_pk
- - column:
- name: agentid
- type: Integer
- constraints:
- foreignKeyName: fk_agentconfig_repos_events
- references: innometricsagents.agentconfig(agentid)
- nullable: false
- - column:
- name: repoid
- type: Integer
- constraints:
- foreignKeyName: fk_agentconfig_repo_id
- references: innometricsagents.repos_x_project(configid)
- nullable: false
- - column:
- name: eventtype
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: eventdate
- type: Date
- constraints:
- nullable: false
- - column:
- name: eventauthor
- type: Varchar(1024)
- constraints:
- nullable: false
- - column:
- name: metadata
- type: json
- constraints:
- nullable: true
- - column:
- name: creationdate
- type: Date
- constraints:
- nullable: false
- defaultValueComputed: current_timestamp
- - column:
- name: createdby
- type: Varchar(25)
- constraints:
- nullable: false
- defaultValueComputed: USER
- - column:
- name: lastupdate
- type: Date
- - column:
- name: updateby
+databaseChangeLog:
+ - changeSet:
+ id: "multi agent handler"
+ author: xvasquez
+ changes:
+ - createTable:
+ schemaName: innometricsagents
+ tableName: agent_webhooks
+ remarks: "Table to store the webhook header"
+ columns:
+ - column:
+ name: webookid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: webhook_pk
+ - column:
+ name: agentid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agent_webhooks
+ references: innometricsagents.agentconfig(agentid)
+ nullable: false
+ - column:
+ name: webhooktag
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometricsagents
+ tableName: webhook_mapping
+ remarks: "Table to store the configuration for the webhook fields"
+ columns:
+ - column:
+ name: configid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: webhook_mapping_pk
+ - column:
+ name: webookid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agent_webhooks
+ references: innometricsagents.agent_webhooks(webookid)
+ nullable: false
+ - column:
+ name: eventfieldid
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: mappingrule
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: defaultvalue
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: datatype
+ type: Varchar(100)
+ constraints:
+ nullable: false
+ - column:
+ name: isactive
+ type: Varchar(1)
+ constraints:
+ nullable: false
+ defaultValue: 'Y'
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
+ type: Varchar(25)
+ - createTable:
+ schemaName: innometricsagents
+ tableName: repos_events
+ remarks: "table to store multiple agents events"
+ columns:
+ - column:
+ name: eventid
+ type: Integer
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ primaryKeyName: repos_events_pk
+ - column:
+ name: agentid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agentconfig_repos_events
+ references: innometricsagents.agentconfig(agentid)
+ nullable: false
+ - column:
+ name: repoid
+ type: Integer
+ constraints:
+ foreignKeyName: fk_agentconfig_repo_id
+ references: innometricsagents.repos_x_project(configid)
+ nullable: false
+ - column:
+ name: eventtype
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: eventdate
+ type: Date
+ constraints:
+ nullable: false
+ - column:
+ name: eventauthor
+ type: Varchar(1024)
+ constraints:
+ nullable: false
+ - column:
+ name: metadata
+ type: json
+ constraints:
+ nullable: true
+ - column:
+ name: creationdate
+ type: Date
+ constraints:
+ nullable: false
+ defaultValueComputed: current_timestamp
+ - column:
+ name: createdby
+ type: Varchar(25)
+ constraints:
+ nullable: false
+ defaultValueComputed: USER
+ - column:
+ name: lastupdate
+ type: Date
+ - column:
+ name: updateby
type: Varchar(25)
\ No newline at end of file
diff --git a/auth-server/src/main/resources/application-dev.properties b/auth-server/src/main/resources/application-dev.properties
index 9a3365f..7dd0e73 100644
--- a/auth-server/src/main/resources/application-dev.properties
+++ b/auth-server/src/main/resources/application-dev.properties
@@ -4,5 +4,5 @@
#spring.datasource.url = jdbc:postgresql://10.90.138.244:5432/postgres
#spring.datasource.password = 1nn0M3tr1c5
eureka.client.serviceUrl.defaultZone= http://localhost:8761/eureka/
-spring.datasource.url = jdbc:postgresql://188.130.155.202:25432/
-spring.datasource.password = 1nn0M3tr1c5
\ No newline at end of file
+spring.datasource.url = jdbc:postgresql://localhost:5432/
+spring.datasource.password = password
\ No newline at end of file
diff --git a/auth-server/src/main/resources/liquibase/DBUpdate2.yml b/auth-server/src/main/resources/liquibase/DBUpdate2.yml
index 6819472..fe1fe41 100644
--- a/auth-server/src/main/resources/liquibase/DBUpdate2.yml
+++ b/auth-server/src/main/resources/liquibase/DBUpdate2.yml
@@ -14,5 +14,4 @@ databaseChangeLog:
constraints:
references: innometricsauth.role(name)
foreignKeyName: fk_role
-# references: innometricsauth.company(companyid)
nullable: false
\ No newline at end of file
diff --git a/auth-server/src/main/resources/liquibaseScript.xml b/auth-server/src/main/resources/liquibaseScript.xml
index e8c324c..1986cbe 100644
--- a/auth-server/src/main/resources/liquibaseScript.xml
+++ b/auth-server/src/main/resources/liquibaseScript.xml
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
-
+
diff --git a/config-service/src/main/resources/application-dev.properties b/config-service/src/main/resources/application-dev.properties
index d05967a..be19106 100644
--- a/config-service/src/main/resources/application-dev.properties
+++ b/config-service/src/main/resources/application-dev.properties
@@ -1,2 +1,2 @@
-spring.datasource.url = jdbc:postgresql://10.90.138.244:5432/
-spring.datasource.password = 1nn0M3tr1c5
\ No newline at end of file
+spring.datasource.url = jdbc:postgresql://localhost:5432/
+spring.datasource.password = password
\ No newline at end of file