From 7d932d975e1f68750b3229a51ca23e0e8ead0e8b Mon Sep 17 00:00:00 2001
From: Jazz Grewal <39718912+jazzgrewal@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:27:26 -0700
Subject: [PATCH] changed the postgres variables to align local with the test
 environment, and same for the application.yml for the spring boot (#402)

---
 backend/src/main/resources/application.yml | 10 +++++-----
 docker-compose.yml                         |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 852728b5..9235bfde 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -31,8 +31,8 @@ spring:
 # Database, and JPA - Postgres
     postgres:
       driver-class-name: org.postgresql.Driver
-      url: jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:postgres}
-      username: ${POSTGRES_USER:postgres}
+      url: jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:nr-silva}
+      username: ${POSTGRES_USER:nr-silva}
       password: ${POSTGRES_PASSWORD:default}
       connectionTimeout: ${DB_POOL_CONN_TIMEOUT:120000}
       idleTimeout: ${DB_POOL_IDLE_TIMEOUT:60000}
@@ -60,8 +60,8 @@ spring:
     enabled: true
     baseline-on-migrate: true
     locations: classpath:db/migration
-    url: jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:postgres}
-    user: ${POSTGRES_USER:postgres}
+    url: jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:nr-silva}
+    user: ${POSTGRES_USER:nr-silva}
     password: ${POSTGRES_PASSWORD:default}
 
 # OpenSearch settings
@@ -105,7 +105,7 @@ nr:
       wms-layers:
         whitelist: ${WMS_LAYERS_WHITELIST_USERS:NONE}
       opening-search:
-        org-units: ${OPENING_SEARCH_ORG_UNITS:DCK}
+        org-units: ${OPENING_SEARCH_ORG_UNITS:-"DCK,DSQ,DVA,DKM,DSC,DFN,DSI,DCR,DMK,DQC,DKA,DCS,DOS,DSE,DCC,DMH,DQU,DNI,DND,DRM,DPG,DSS,DPC"}
 
 # Forest Client API
 forest-client-api:
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d4cd41a..b66f85db 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,9 +21,9 @@ x-backend: &backend
   #restart: always
 
 x-db-vars: &db-vars
-  POSTGRES_USER: postgres
+  POSTGRES_USER: nr-silva
   POSTGRES_PASSWORD: default
-  POSTGRES_DB: postgres
+  POSTGRES_DB: nr-silva
 
 services:
   frontend: