From e73b6bd69bf1e35e376438f0f435d7e62f7faad8 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@knecon.com>
Date: Thu, 23 Nov 2023 21:38:09 +0200
Subject: [PATCH] Migration local testing

---
 .../configuration/UserMessagingConfiguration.java  |  2 +-
 .../processor/migration/SaasMigrationService.java  |  4 ++--
 .../src/main/resources/application-dev.yaml        | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/UserMessagingConfiguration.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/UserMessagingConfiguration.java
index a92085370..e3f399e5f 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/UserMessagingConfiguration.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/UserMessagingConfiguration.java
@@ -141,7 +141,7 @@ public class UserMessagingConfiguration {
 
 
     @Bean(name = "userExchange")
-    TopicExchange tenantExchange(@Value("${fforesight.user-exchange.name}") String userExchange) {
+    TopicExchange userExchange(@Value("${fforesight.user-exchange.name}") String userExchange) {
 
         return new TopicExchange(userExchange);
     }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java
index cb023ab9a..302d5ecf3 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java
@@ -99,8 +99,8 @@ public class SaasMigrationService implements TenantSyncService {
 
     public void handleError(String dossierId, String fileId, String errorCause, String retryQueue) {
         var migrationEntry = saasMigrationStatusPersistenceService.findById(fileId);
-        int numErrors = migrationEntry.getProcessingErrorCounter();
-        if (numErrors <= settings.getMaxErrorRetries()) {
+        Integer numErrors = migrationEntry.getProcessingErrorCounter();
+        if (numErrors !=null && numErrors <= settings.getMaxErrorRetries()) {
             saasMigrationStatusPersistenceService.updateErrorCounter(fileId, numErrors + 1, errorCause);
             rabbitTemplate.convertAndSend(retryQueue, MigrationRequest.builder()
                     .dossierId(dossierId)
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yaml
index 0be5aa24b..d4007e382 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yaml
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yaml
@@ -22,6 +22,7 @@ multitenancy:
           prepStmtCacheSqlLimit: 2048
     liquibase:
       changeLog: classpath:db/changelog/db.changelog-tenant.yaml
+      clear-checksums: true
 
 monitoring:enabled: true
 cors.enabled: true
@@ -37,4 +38,15 @@ fforesight:
     auth-server-url: 'http://localhost:8080/auth'
   jobs:
     enabled: true
-
+    datasource:
+      url: jdbc:postgresql://${PSQL_HOST:localhost}:${PSQL_PORT:25432}/${PSQL_DATABASE:tenantmanager}?ApplicationName=${spring.application.name:}-scheduler&cachePrepStmts=true&useServerPrepStmts=true&rewriteBatchedStatements=true
+      driverClassName: org.postgresql.Driver
+      username: ${PSQL_USERNAME:tenantmanager}
+      password: ${PSQL_PASSWORD:r3dact3d}
+      platform: org.hibernate.dialect.PostgreSQL95Dialect
+      hikari:
+        maximumPoolSize: 2
+        data-source-properties:
+          cachePrepStmts: true
+          prepStmtCacheSize: 1000
+          prepStmtCacheSqlLimit: 2048