From ed10ea19218063a90824b77f1c7ff406d7aa7a5a Mon Sep 17 00:00:00 2001
From: Yanick Minder <79108296+kcinay055679@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:56:37 +0100
Subject: [PATCH] Merge main into prod (#1172)

* update version to 3.0.1 (#1170)

* [VU] Automated version update

* Set correct properties (#1164)

* db dump for prod and staging

* change public schema to okr_pitc

* update prod properties

* remove old way to set okr-champions from prod.properties

* update loglevels

* remove sql scripts

---------

Co-authored-by: peggimann <peggimann@puzzle.com>
Co-authored-by: Yanick Minder <minder@puzzle.ch>

* [VU] Automated version update

---------

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: peggimann <113369749+peggimann@users.noreply.github.com>
Co-authored-by: peggimann <peggimann@puzzle.com>
---
 backend/pom.xml                               |  4 +--
 .../resources/application-prod.properties     | 36 ++++++++++++++++++-
 .../src/main/resources/application.properties |  2 ++
 pom.xml                                       |  2 +-
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index f97fc3720e..4663554620 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>ch.puzzle.okr</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.206-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>backend</artifactId>
-    <version>2.0.206-SNAPSHOT</version>
+    <version>3.0.3-SNAPSHOT</version>
     <name>backend</name>
     <description>Puzzle OKR Tool</description>
 
diff --git a/backend/src/main/resources/application-prod.properties b/backend/src/main/resources/application-prod.properties
index 9461ba2585..913354d0ad 100644
--- a/backend/src/main/resources/application-prod.properties
+++ b/backend/src/main/resources/application-prod.properties
@@ -1,4 +1,38 @@
-# logging level for production
+# logging level for staging
+logging.level.ch.puzzle.okr=warn
 logging.level.org.springframework=warn
+logging.level.org.flywaydb.core=warn
 
 
+connect.src=https://sso.puzzle.ch
+
+
+hibernate.connection.url=jdbc:postgresql://localhost:5432/okr
+hibernate.connection.username=user
+hibernate.connection.password=pwd
+hibernate.multiTenancy=SCHEMA
+
+
+# TENANT Configuration
+okr.tenant-ids=pitc
+okr.datasource.driver-class-name=org.postgresql.Driver
+
+# pitc
+okr.tenants.pitc.datasource.url=jdbc:postgresql://localhost:5432/okr
+okr.tenants.pitc.datasource.username=user
+okr.tenants.pitc.datasource.password=pwd
+okr.tenants.pitc.datasource.schema=okr_pitc
+okr.tenants.pitc.user.champion.emails=gl@gl.com
+okr.tenants.pitc.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:8544/realms/pitc/protocol/openid-connect/certs
+okr.tenants.pitc.security.oauth2.frontend.issuer-url=http://localhost:8544/realms/pitc
+okr.tenants.pitc.security.oauth2.frontend.client-id=pitc_okr_prod
+
+
+# pit client customization
+okr.tenants.pitc.clientcustomization.logo=assets/images/okr-logo.svg
+okr.tenants.pitc.clientcustomization.triangles=assets/images/triangles-okr-header.svg
+okr.tenants.pitc.clientcustomization.background-logo=assets/images/puzzle-p.svg
+okr.tenants.pitc.clientcustomization.favicon=assets/favicon.png
+okr.tenants.pitc.clientcustomization.title=Puzzle OKR
+okr.tenants.pitc.clientcustomization.customstyles.okr-topbar-background-color=#1e5a96
+okr.tenants.pitc.clientcustomization.customstyles.okr-banner-background-color=#dcedf9
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 03faf88d85..70b1ff8014 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -12,6 +12,8 @@ spring.flyway.baseline-on-migrate=true
 # debug options
 logging.level.ch.puzzle.okr=INFO
 logging.level.org.springframework.security=INFO
+logging.level.org.flywaydb.core=INFO
+
 
 # cache configuration
 caching.authorization.users.TTL=1800000
diff --git a/pom.xml b/pom.xml
index 9272512469..70d1aff896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>ch.puzzle.okr</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.206-SNAPSHOT</version>
+    <version>3.0.3-SNAPSHOT</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>