From 7486d6920f2298a6ab8a4eb227f1501a4f7b51c7 Mon Sep 17 00:00:00 2001 From: Kwo Ding Date: Tue, 6 Feb 2018 09:20:26 +0100 Subject: [PATCH] Add privileges for all data groups for default business functions --- .../dataloader/configurators/AccessGroupsConfigurator.java | 6 +++--- .../com/backbase/testing/dataloader/setup/UsersSetup.java | 7 ++++--- 2 files changed, 7 insertions(+), 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 index 78d39cbe..4f3daa32 100644 --- 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 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 index 1c946656..30c50db6 100644 --- 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())); } }); }