#826 | refactor: variable name change for default org password after …

…review
avniproject · Dec 12, 2024 · a6c219b · a6c219b
1 parent 856d903
commit a6c219b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/service/metabase/MetabaseService.java b/avni-server-api/src/main/java/org/avni/server/service/metabase/MetabaseService.java
@@ -14,7 +14,7 @@
 @Service
 public class MetabaseService {
 
-    @Value("${avni.org.password}")
+    @Value("${avni.default.org.user.db.password}")
     private String AVNI_DEFAULT_ORG_USER_DB_PASSWORD;
     public static final String DB_ENGINE = "postgres";
     private final OrganisationService organisationService;

diff --git a/avni-server-api/src/main/java/org/avni/server/web/OrganisationController.java b/avni-server-api/src/main/java/org/avni/server/web/OrganisationController.java
@@ -30,7 +30,7 @@ public class OrganisationController implements RestControllerResourceProcessor<O
     private final OrganisationCategoryRepository organisationCategoryRepository;
     private final OrganisationStatusRepository organisationStatusRepository;
 
-    @Value("${avni.org.password}")
+    @Value("${avni.default.org.user.db.password}")
     private String AVNI_DEFAULT_ORG_USER_DB_PASSWORD;
 
     @Autowired

diff --git a/avni-server-api/src/main/java/org/avni/server/web/OrganisationGroupController.java b/avni-server-api/src/main/java/org/avni/server/web/OrganisationGroupController.java
@@ -29,7 +29,7 @@
 @RestController
 public class OrganisationGroupController implements RestControllerResourceProcessor<OrganisationGroup> {
 
-    @Value("${avni.org.password}")
+    @Value("${avni.default.org.user.db.password}")
     private String AVNI_DEFAULT_ORG_USER_DB_PASSWORD;
     private final Logger logger;
     private final OrganisationGroupRepository organisationGroupRepository;

diff --git a/avni-server-api/src/main/resources/application.properties b/avni-server-api/src/main/resources/application.properties
@@ -168,4 +168,4 @@ metabase.api.key=${METABASE_API_KEY:mb_uhFRMqCSre4v/hTZTsQcMnh8k2GCZFX2tGmSBdoxN
 avni.endpoints.endOfLife.1=${AVNI_ENDPOINT_END_OF_LIFE_1:2024-09-05}
 
 #default org configuration
-avni.org.password=${AVNI_ORG_PASSWORD:password}
+avni.default.org.user.db.password=${AVNI_DEFAULT_ORG_USER_DB_PASSWORD:password}
diff --git a/avni-server-api/src/test/java/org/avni/server/service/builder/TestOrganisationService.java b/avni-server-api/src/test/java/org/avni/server/service/builder/TestOrganisationService.java
@@ -18,8 +18,8 @@ public class TestOrganisationService {
     private final UserRepository userRepository;
     private final TestWebContextService testWebContextService;
     private final OrganisationService organisationService;
-    @Value("${avni.org.password}")
-    private String DEFAUT_PASSWORD;
+    @Value("${avni.default.org.user.db.password}")
+    private String AVNI_DEFAULT_ORG_USER_DB_PASSWORD;
 
     @Autowired
     public TestOrganisationService(ImplementationRepository implementationRepository, OrganisationRepository organisationRepository, UserRepository userRepository, TestWebContextService testWebContextService, OrganisationService organisationService) {
@@ -33,7 +33,7 @@ public TestOrganisationService(ImplementationRepository implementationRepository
     public void createOrganisation(Organisation organisation, User adminUser) {
         organisationRepository.save(organisation);
         User orgUser = createUser(organisation, adminUser);
-        implementationRepository.createDBUser(organisation.getDbUser(),DEFAUT_PASSWORD);
+        implementationRepository.createDBUser(organisation.getDbUser(),AVNI_DEFAULT_ORG_USER_DB_PASSWORD);
         testWebContextService.setUser(orgUser);
         organisationService.setupBaseOrganisationMetadata(organisation);
     }

diff --git a/avni-server-api/src/test/resources/application.properties b/avni-server-api/src/test/resources/application.properties
@@ -130,4 +130,4 @@ metabase.api.key=${METABASE_API_KEY:mb_hwsYP2sFN7fvwM5LTS4d/tnIqA5SeHUxwUhm2KAI1
 avni.endpoints.endOfLife.1=2024-09-09
 
 #default org configuration
-avni.org.password=${AVNI_ORG_PASSWORD:password}
+avni.default.org.user.db.password=${AVNI_DEFAULT_ORG_USER_DB_PASSWORD:password}