From 0d18708b13026c5cc0cbb06a1c4fee62ee0db575 Mon Sep 17 00:00:00 2001
From: Maverick Studer <maverick.studer@knecon.com>
Date: Mon, 11 Nov 2024 12:31:53 +0100
Subject: [PATCH] RED-10196: Backend adaptions for RM/DM unification

---
 .gitlab-ci.yml                                  |  2 +-
 build.gradle.kts                                |  2 +-
 .../utils/TestTenantProvider.java               | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b17158..5656509 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ include:
     ref: 'main'
     file: 'ci-templates/gradle_java.yml'
 
-
 deploy:
   stage: deploy
   tags:
@@ -18,4 +17,5 @@ deploy:
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_COMMIT_BRANCH =~ /^release/
+    - if: $CI_COMMIT_BRANCH =~ /^feature/
     - if: $CI_COMMIT_TAG
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index d627877..a6ccd46 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,7 +27,7 @@ val testContainersVersion = "1.20.1"
 
 dependencies {
     api("com.fasterxml.jackson.core:jackson-databind:2.15.2:")
-    api("com.knecon.fforesight:tenant-commons:0.31.0")
+    api("com.knecon.fforesight:tenant-commons:0.31.0-RED10196.0")
     api("com.zaxxer:HikariCP:5.0.1")
     api("com.google.guava:guava:32.1.2-jre")
     api("org.liquibase:liquibase-core:4.20.0")
diff --git a/src/test/java/com/knecon/fforesight/databasetenantcommons/utils/TestTenantProvider.java b/src/test/java/com/knecon/fforesight/databasetenantcommons/utils/TestTenantProvider.java
index 6855245..b5c4c0b 100644
--- a/src/test/java/com/knecon/fforesight/databasetenantcommons/utils/TestTenantProvider.java
+++ b/src/test/java/com/knecon/fforesight/databasetenantcommons/utils/TestTenantProvider.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
+import com.knecon.fforesight.tenantcommons.TenantApplicationType;
 import com.knecon.fforesight.tenantcommons.TenantProvider;
 import com.knecon.fforesight.tenantcommons.listener.ITenantEventHandler;
 import com.knecon.fforesight.tenantcommons.model.TenantCreatedEvent;
@@ -26,7 +27,10 @@ public class TestTenantProvider implements TenantProvider {
     @Override
     public TenantResponse getTenant(String s) {
 
-        return tenants.stream().filter(t -> t.getTenantId().equals(s)).findFirst().orElse(null);
+        return tenants.stream()
+                .filter(t -> t.getTenantId().equals(s))
+                .findFirst()
+                .orElse(null);
     }
 
 
@@ -37,6 +41,17 @@ public class TestTenantProvider implements TenantProvider {
     }
 
 
+    @Override
+    public TenantApplicationType getTenantApplicationType(String s) {
+
+        return tenants.stream()
+                .filter(t -> t.getTenantId().equals(s))
+                .findFirst()
+                .map(TenantResponse::getApplicationType)
+                .orElse(TenantApplicationType.RedactManager);
+    }
+
+
     public void addTenant(TenantResponse tenantResponse) {
 
         this.tenants.add(tenantResponse);