Add privileges for all data groups for default business functions

Backbase · Feb 6, 2018 · 7486d69 · 7486d69
1 parent f7be5d8
commit 7486d69
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/backbase/testing/dataloader/configurators/AccessGroupsConfigurator.java b/src/main/java/com/backbase/testing/dataloader/configurators/AccessGroupsConfigurator.java
@@ -31,7 +31,7 @@ public class AccessGroupsConfigurator {
     private AccessGroupPresentationRestClient accessGroupPresentationRestClient = new AccessGroupPresentationRestClient();
     private AccessGroupIntegrationRestClient accessGroupIntegrationRestClient = new AccessGroupIntegrationRestClient();
 
-    public void setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterServiceAgreement(LegalEntityByUserGetResponseBody legalEntity, String externalUserId, String functionName, String dataGroupId) {
+    public void setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterServiceAgreement(LegalEntityByUserGetResponseBody legalEntity, String externalUserId, String functionName, List<String> dataGroupIds) {
         String functionGroupId = accessGroupPresentationRestClient.getFunctionGroupIdByLegalEntityIdAndFunctionName(legalEntity.getId(), functionName);
 
         if (functionGroupId == null) {
@@ -43,11 +43,11 @@ public void setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterService
                 .withExternalUserId(externalUserId)
                 .withServiceAgreementId(null)
                 .withFunctionGroupId(functionGroupId)
-                .withDataGroupIds(Collections.singletonList(dataGroupId)))
+                .withDataGroupIds(dataGroupIds))
                 .then()
                 .statusCode(SC_OK);
 
-        LOGGER.info(String.format("Permission assigned for legal entity [%s], user [%s], service agreement [master], function group [%s], data group [%s]", legalEntity.getExternalId(), externalUserId, functionGroupId, dataGroupId));
+        LOGGER.info(String.format("Permission assigned for legal entity [%s], user [%s], service agreement [master], function group [%s], data groups %s", legalEntity.getExternalId(), externalUserId, functionGroupId, dataGroupIds));
     }
 
     public void ingestFunctionGroupsWithAllPrivilegesForAllFunctions(String externalLegalEntityId) {

diff --git a/src/main/java/com/backbase/testing/dataloader/setup/UsersSetup.java b/src/main/java/com/backbase/testing/dataloader/setup/UsersSetup.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -160,14 +161,14 @@ private void setupFunctionDataGroupAndPrivilegesUnderLegalEntity(LegalEntityByUs
 
             switch (functionName) {
                 case SEPA_CT_FUNCTION_NAME:
-                    accessGroupsConfigurator.setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterServiceAgreement(legalEntity, externalUserId, functionName, currencyDataGroup.getInternalEurCurrencyDataGroupId());
+                    accessGroupsConfigurator.setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterServiceAgreement(legalEntity, externalUserId, functionName, Collections.singletonList(currencyDataGroup.getInternalEurCurrencyDataGroupId()));
                     break;
                 case US_DOMESTIC_WIRE_FUNCTION_NAME:
                 case US_FOREIGN_WIRE_FUNCTION_NAME:
-                    accessGroupsConfigurator.setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterServiceAgreement(legalEntity, externalUserId, functionName, currencyDataGroup.getInternalUsdCurrencyDataGroupId());
+                    accessGroupsConfigurator.setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterServiceAgreement(legalEntity, externalUserId, functionName, Collections.singletonList(currencyDataGroup.getInternalUsdCurrencyDataGroupId()));
                     break;
                 default:
-                    accessGroupsConfigurator.setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterServiceAgreement(legalEntity, externalUserId, functionName, currencyDataGroup.getInternalRandomCurrencyDataGroupId());
+                    accessGroupsConfigurator.setupFunctionDataGroupAndAllPrivilegesAssignedToUserAndMasterServiceAgreement(legalEntity, externalUserId, functionName, Arrays.asList(currencyDataGroup.getInternalRandomCurrencyDataGroupId(), currencyDataGroup.getInternalEurCurrencyDataGroupId(), currencyDataGroup.getInternalUsdCurrencyDataGroupId()));
             }
         });
     }