From 9db13d5b624af431fba8fd0f30a1d99d06ebd23a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Thu, 2 Nov 2023 10:56:54 +0100 Subject: [PATCH] Prod properties updated, db migration cleanup --- lis-app/pom.xml | 2 +- lis-app/src/main/resources/application.yaml | 3 ++- lis-db/migrations/README | 12 +++++++++++- .../009_add_partner_for_invoice_import_test.sql | 10 ---------- ...012_create_payment.sql => 009_create_payment.sql} | 0 ...=> 010_modify_invoice_rename_income_incoming.sql} | 0 .../migrations/scripts/010_reset_partner_index.sql | 9 --------- ...id_to_invoice.sql => 011_add_paid_to_invoice.sql} | 0 .../migrations/scripts/011_reset_project_index.sql | 9 --------- .../scripts/015_reset_project_status_index.sql | 9 --------- 10 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 lis-db/migrations/scripts/009_add_partner_for_invoice_import_test.sql rename lis-db/migrations/scripts/{012_create_payment.sql => 009_create_payment.sql} (100%) rename lis-db/migrations/scripts/{013_modify_invoice_rename_income_incoming.sql => 010_modify_invoice_rename_income_incoming.sql} (100%) delete mode 100644 lis-db/migrations/scripts/010_reset_partner_index.sql rename lis-db/migrations/scripts/{014_add_paid_to_invoice.sql => 011_add_paid_to_invoice.sql} (100%) delete mode 100644 lis-db/migrations/scripts/011_reset_project_index.sql delete mode 100644 lis-db/migrations/scripts/015_reset_project_status_index.sql diff --git a/lis-app/pom.xml b/lis-app/pom.xml index f1cfc2e..b8a4848 100644 --- 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"> 4.0.0 lis-app - 0.1.7-SNAPSHOT + 0.1.8-SNAPSHOT hu.user lis diff --git a/lis-app/src/main/resources/application.yaml b/lis-app/src/main/resources/application.yaml index 184308b..8206eec 100644 --- 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 c942715..c7b8cc8 100644 --- 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 -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 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 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 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 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. - - -- 2.54.0