Prod properties updated, db migration cleanup

diff --git a/lis-app/pom.xml b/lis-app/pom.xml
index f1cfc2e6e22336018af51fd6a0b7a2f784463934..b8a4848d41ac5e6430cd3cf11c89616edb9c9f68 100644 (file)
--- a/lis-app/pom.xml
+++ b/lis-app/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>lis-app</artifactId>
-    <version>0.1.7-SNAPSHOT</version>
+    <version>0.1.8-SNAPSHOT</version>
     <parent>
         <groupId>hu.user</groupId>
         <artifactId>lis</artifactId>

diff --git a/lis-app/src/main/resources/application.yaml b/lis-app/src/main/resources/application.yaml
index 184308b8d39cc8418a9d204a365b9ce7125a7cc4..8206eeca03e1db42952b596fcd619142a44e0480 100644 (file)
--- a/lis-app/src/main/resources/application.yaml
+++ b/lis-app/src/main/resources/application.yaml
@@ -46,7 +46,7 @@ camunda.bpm:
     create: All tasks
   job-execution.enabled: true
 logging:
-  #  config: logback.xml
+  config: classpath:logback-prod.xml
   level:
     org.hibernate.engine.jdbc.spi.SqlExceptionHelper: ERROR
     org.springframework.web.clientRestTemplate: ERROR
@@ -59,6 +59,7 @@ application:
   workflow:
     import-invoice:
       input-path: /temp/invoice-import
+      project-id-pattern: \d{4}-\d{4}
 service:
   nav:
     trust:

diff --git a/lis-db/migrations/README b/lis-db/migrations/README
index c942715907c0e21035038f4a39d6279f261a0130..c7b8cc869524e251cbc8a2b8cc9853284194f9fc 100644 (file)
--- a/lis-db/migrations/README
+++ b/lis-db/migrations/README
@@ -79,4 +79,14 @@ Move data
 DB2 SQL
 -------
 ALTER TABLE "tableName" ALTER COLUMN "columnName" RESTART WITH <new index value>
-ALTER TABLE org RENAME COLUMN deptnumb TO deptnum
\ No newline at end of file
+ALTER TABLE org RENAME COLUMN deptnumb TO deptnum
+
+INSERT INTO PARTNER(name, vat_nr, address, active)
+VALUES('Értékesítő Kft', '99999999-2-41', '1234 Budapest, Hármas utca 1', 1);
+
+ALTER TABLE partner ALTER COLUMN id RESTART WITH 4;
+
+ALTER TABLE project ALTER COLUMN id RESTART WITH 2;
+
+ALTER TABLE project_status ALTER COLUMN id RESTART WITH 2;
+

diff --git a/lis-db/migrations/scripts/009_add_partner_for_invoice_import_test.sql b/lis-db/migrations/scripts/009_add_partner_for_invoice_import_test.sql
deleted file mode 100644 (file)
index bcf7c07..0000000
--- a/lis-db/migrations/scripts/009_add_partner_for_invoice_import_test.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- // add partner for invoice import test
--- Migration SQL that makes the change goes here.
-
-INSERT INTO PARTNER(id, name, vat_nr, address, active)
-VALUES(3, 'Értékesítő Kft', '99999999-2-41', '1234 Budapest, Hármas utca 1', 1);
-
--- //@UNDO
--- SQL to undo the change goes here.
-
-DELETE FROM PARTNER WHERE name = 'Értékesítő Kft';

diff --git a/lis-db/migrations/scripts/012_create_payment.sql b/lis-db/migrations/scripts/009_create_payment.sql
similarity index 100%
rename from lis-db/migrations/scripts/012_create_payment.sql
rename to lis-db/migrations/scripts/009_create_payment.sql

diff --git a/lis-db/migrations/scripts/013_modify_invoice_rename_income_incoming.sql b/lis-db/migrations/scripts/010_modify_invoice_rename_income_incoming.sql
similarity index 100%
rename from lis-db/migrations/scripts/013_modify_invoice_rename_income_incoming.sql
rename to lis-db/migrations/scripts/010_modify_invoice_rename_income_incoming.sql

diff --git a/lis-db/migrations/scripts/010_reset_partner_index.sql b/lis-db/migrations/scripts/010_reset_partner_index.sql
deleted file mode 100644 (file)
index 16fbb70..0000000
--- a/lis-db/migrations/scripts/010_reset_partner_index.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- // reset partner index
--- Migration SQL that makes the change goes here.
-
-ALTER TABLE partner ALTER COLUMN id RESTART WITH 4;
-
--- //@UNDO
--- SQL to undo the change goes here.
-
-

diff --git a/lis-db/migrations/scripts/014_add_paid_to_invoice.sql b/lis-db/migrations/scripts/011_add_paid_to_invoice.sql
similarity index 100%
rename from lis-db/migrations/scripts/014_add_paid_to_invoice.sql
rename to lis-db/migrations/scripts/011_add_paid_to_invoice.sql

diff --git a/lis-db/migrations/scripts/011_reset_project_index.sql b/lis-db/migrations/scripts/011_reset_project_index.sql
deleted file mode 100644 (file)
index 9349902..0000000
--- a/lis-db/migrations/scripts/011_reset_project_index.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- // reset project index
--- Migration SQL that makes the change goes here.
-
-ALTER TABLE project ALTER COLUMN id RESTART WITH 2;
-
--- //@UNDO
--- SQL to undo the change goes here.
-
-

diff --git a/lis-db/migrations/scripts/015_reset_project_status_index.sql b/lis-db/migrations/scripts/015_reset_project_status_index.sql
deleted file mode 100644 (file)
index fad2834..0000000
--- a/lis-db/migrations/scripts/015_reset_project_status_index.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- // reset project index
--- Migration SQL that makes the change goes here.
-
-ALTER TABLE project_status ALTER COLUMN id RESTART WITH 2;
-
--- //@UNDO
--- SQL to undo the change goes here.
-
-