Dtsrd 2140

src/functionalTest/java/uk/gov/hmcts/reform/professionalapi/ProfessionalInternalUserFunctionalTest.java

@@ -622,7 +622,7 @@ void updateOrgMfaShouldReturn403WhenToggledOff() {
         log.info("updateOrgMFAShouldReturn403 :: END");
     }
 
-    public void  updateOrgStatusScenarios() {
+    public void updateOrgStatusScenarios() {
         updateOrgStatusShouldBeSuccess();
     }
 
@@ -785,7 +785,7 @@ void findOrganisationsWithPaginationShouldReturnSuccess() {
         log.info("findOrganisationsWithPaginationShouldReturnSuccess :: STARTED");
         professionalApiClient.createOrganisation();
         Map<String, Object> organisations = professionalApiClient
-            .retrieveAllOrganisationsWithPagination(hmctsAdmin, "1", "2");
+                .retrieveAllOrganisationsWithPagination(hmctsAdmin, "1", "2");
 
         assertThat(organisations).isNotNull().hasSize(2);
 
@@ -1231,4 +1231,59 @@ private static List<Map<String, Object>> sortByValue(final List<Map<String, Obje
                 .sorted(Comparator.comparing(map -> (String) map.get(key)))
                 .collect(Collectors.toList());
     }
+
+    @Test
+    @ToggleEnable(mapKey = "OrganisationExternalController.deletePaymentAccountsOfOrganisation", withFeature = true)
+    @ExtendWith(FeatureToggleConditionExtension.class)
+    @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
+    void deletePbaOfExistingOrganisationShouldBeForbiddenWhenLDOff() {
+        log.info("deletePbaOfExistingOrganisationShouldBeForbiddenWhenLDOff :: STARTED");
+
+        Set<String> paymentAccounts = new HashSet<>();
+        paymentAccounts.add("PBA0000021");
+        paymentAccounts.add("PBA0000022");
+        paymentAccounts.add("PBA0000023");
+
+        setUpTestData();
+        setUpUserBearerTokens(List.of(puiFinanceManager));
+
+        PbaRequest deletePbaRequest = new PbaRequest();
+        deletePbaRequest.setPaymentAccounts(Set.of("PBA0000021", "PBA0000022", "PBA0000023"));
+
+        String pfmBearerTokens = null;
+        professionalApiClient.deletePaymentAccountsOfOrganisation(deletePbaRequest,
+                professionalApiClient.getMultipleAuthHeaders(null), FORBIDDEN);
+
+        log.info("deletePbaOfExistingOrganisationShouldBeForbiddenWhenLDOff :: END");
+    }
+
+    private void setUpUserBearerTokens(List<String> puiFinanceManager) {
+    }
+
+    @Test
+    //@ToggleEnable(mapKey = "OrganisationExternalController.deletePaymentAccountsOfOrganisation", withFeature = true)
+    //@ExtendWith(FeatureToggleConditionExtension.class)
+    void deletePbaOfExistingOrganisationShouldBeSuccess() {
+        log.info("deletePbaOfExistingOrganisationShouldBeSuccess :: STARTED");
+
+
+
+        setUpTestData();
+        setUpUserBearerTokens(List.of(puiFinanceManager));
+
+        PbaRequest deletePbaRequest = new PbaRequest();
+        deletePbaRequest.setPaymentAccounts(organisationCreationRequest.getPaymentAccount());
+
+        String pfmBearerToken = null;
+        professionalApiClient.deletePaymentAccountsOfOrganisation(deletePbaRequest,
+                professionalApiClient.getMultipleAuthHeaders(null), NO_CONTENT);
+
+        Map<String, Object> response = professionalApiClient.retrieveOrganisationByOrgIdExternal(OK,
+                professionalApiClient.getMultipleAuthHeaders(null));
+
+        var paymentAccounts = (List<String>) response.get("paymentAccount");
+        assertThat(paymentAccounts).isEmpty();
+        log.info("deletePbaOfExistingOrganisationShouldBeSuccess :: END");
+    }
 }
+

src/integrationTest/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   flyway:
     schemas: DBREFDATA
     locations: classpath:db/testmigration
-
+    
   jpa:
     show-sql: true
     properties:

src/main/java/uk/gov/hmcts/reform/professionalapi/controller/SuperController.java

@@ -430,8 +430,7 @@ protected ResponseEntity<List<OrganisationMinimalInfoResponse>> retrieveAllOrgan
 
         var organisationMinimalInfoResponses =
                 organisations.stream()
-                        .map(organisation -> new OrganisationMinimalInfoResponse(organisation, address))
-                        .collect(Collectors.toList());
+                        .map(organisation -> new OrganisationMinimalInfoResponse(organisation, address)).toList();
 
         return ResponseEntity.status(200).body(organisationMinimalInfoResponses);
     }

src/main/java/uk/gov/hmcts/reform/professionalapi/controller/internal/OrganisationInternalController.java

@@ -58,6 +58,11 @@
 
 import static org.apache.commons.lang3.BooleanUtils.isNotTrue;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.DEL_ORG_PBA_NOTES_1;
+import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.DEL_ORG_PBA_NOTES_2;
+import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.DEL_ORG_PBA_NOTES_3;
+import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.DEL_ORG_PBA_NOTES_4;
+import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.DEL_ORG_PBA_NOTES_5;
 import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.ORGANISATION_IDENTIFIER_FORMAT_REGEX;
 import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.ORG_ID_VALIDATION_ERROR_MESSAGE;
 import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.ORG_NOT_ACTIVE;
@@ -697,6 +702,65 @@ public ResponseEntity<OrganisationEntityResponse> retrieveOrganisationByUserId(
         return organisationService.retrieveOrganisationByUserId(userId);
     }
 
+
+
+    @Operation(
+        summary = "Deletes the provided list of payment accounts from the organisation.",
+        description = "**IDAM Roles to access API** : <br> - pui-finance-manager",
+        security = {
+            @SecurityRequirement(name = "ServiceAuthorization"),
+            @SecurityRequirement(name = "Authorization")
+        }
+    )
+    @ApiResponse(
+        responseCode = "204",
+        description = "Successfully deleted the list of provided payment accounts from the organisation.",
+        content = @Content
+    )
+    @ApiResponse(
+        responseCode = "400",
+        description = DEL_ORG_PBA_NOTES_1 + DEL_ORG_PBA_NOTES_2 + DEL_ORG_PBA_NOTES_3
+            + DEL_ORG_PBA_NOTES_4 + DEL_ORG_PBA_NOTES_5,
+        content = @Content
+    )
+    @ApiResponse(
+        responseCode = "401",
+        description = "Unauthorized Error : "
+            + "The requested resource is restricted and requires authentication",
+        content = @Content
+    )
+    @ApiResponse(
+        responseCode = "403",
+        description = "Forbidden Error: "
+            + "Access denied for either invalid permissions or user is pending",
+        content = @Content
+    )
+    @ApiResponse(
+        responseCode = "404",
+        description = "Resource Not Found Error: The Organisation does not exist"
+            + " to delete Payment Accounts from",
+        content = @Content
+    )
+    @ApiResponse(
+        responseCode = "500",
+        description = "Internal Server Error",
+        content = @Content
+    )
+
+    @DeleteMapping(path = "/pba/{orgId}")
+    @ResponseStatus(value = HttpStatus.NO_CONTENT)
+    @Secured({"prd-admin"})
+    public void deletePaymentAccountsOfOrganisation(
+        @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "deletePbaRequest")
+        @Valid @NotNull @RequestBody PbaRequest deletePbaRequest,
+        @PathVariable("orgId") @NotBlank String organisationIdentifier,
+        @Parameter(hidden = true) @UserId String userId) {
+
+        deletePaymentAccountsOfGivenOrganisation(deletePbaRequest, organisationIdentifier, userId);
+
+    }
+
+
     @Operation(
             summary = "Retrieves Organisations by Organisation Profile IDs",
             description = "**Bearer token not required to access API. Only a valid s2s token**",
@@ -745,4 +809,5 @@ public ResponseEntity<Object> retrieveOrganisationsByProfileIds(
                 .status(HttpStatus.OK)
                 .body(response);
     }
+
 }

src/test/java/uk/gov/hmcts/reform/professionalapi/controller/internal/OrganisationInternalControllerTest.java

@@ -77,6 +77,7 @@
 import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.ORG_NAME;
 import static uk.gov.hmcts.reform.professionalapi.controller.constants.ProfessionalApiConstants.ORG_STATUS;
 
+
 @ExtendWith(MockitoExtension.class)
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
 class OrganisationInternalControllerTest {
@@ -109,8 +110,14 @@ class OrganisationInternalControllerTest {
     private List<PrdEnum> prdEnumList;
 
     private ProfessionalUser professionalUser;
+    private OrganisationIdentifierValidatorImpl organisationIdentifierValidatorImplMock;
+
+
     private NewUserCreationRequest newUserCreationRequest;
     private UserProfileFeignClient userProfileFeignClient;
+
+
+
     private DeleteOrganisationResponse deleteOrganisationResponse;
     HttpServletRequest httpRequest = mock(HttpServletRequest.class);
 
@@ -120,6 +127,8 @@ class OrganisationInternalControllerTest {
     @InjectMocks
     private OrganisationInternalControllerV2 organisationInternalControllerV2;
 
+
+
     @BeforeEach
     void setUp() throws Exception {
         organisation = new Organisation("Org-Name", OrganisationStatus.PENDING, "sra-id",
@@ -137,6 +146,7 @@ void setUp() throws Exception {
                 new OrganisationEntityResponse(organisation, false, true, true);
 
         organisationServiceMock = mock(OrganisationService.class);
+        //organisationIdentifierValidatorImplMock = mock(OrganisationIdentifierValidatorImpl.class);
         professionalUserServiceMock = mock(ProfessionalUserService.class);
         paymentAccountServiceMock = mock(PaymentAccountService.class);
         organisationCreationRequestValidatorMock = mock(OrganisationCreationRequestValidator.class);
@@ -572,4 +582,46 @@ void testRetrieveOrgByPbaStatus() {
                 .getOrganisationsByPbaStatus(pbaStatus.toString());
     }
 
+
+
+
+
+    @Test
+    void testDeletePaymentAccounts() {
+        PbaRequest deletePbaRequest = new PbaRequest();
+        var accountsToDelete = new HashSet<String>();
+        accountsToDelete.add("PBA1234567");
+        deletePbaRequest.setPaymentAccounts(accountsToDelete);
+        final List<PaymentAccount> paymentAccounts = new ArrayList<>();
+        paymentAccounts.add(new PaymentAccount());
+        organisation.setPaymentAccounts(paymentAccounts);
+        when(organisationServiceMock.getOrganisationByOrgIdentifier(anyString())).thenReturn(organisation);
+
+        String orgId = UUID.randomUUID().toString().substring(0, 7);
+        String userId = UUID.randomUUID().toString();
+        organisationInternalController
+                .deletePaymentAccountsOfOrganisation(deletePbaRequest, orgId, userId);
+
+        verify(professionalUserServiceMock, times(1))
+                .checkUserStatusIsActiveByUserId(anyString());
+        verify(orgIdValidatorMock, times(1))
+                .validateOrganisationIsActive(any(Organisation.class), any(HttpStatus.class));
+        verify(paymentAccountServiceMock, times(1))
+                .deletePaymentsOfOrganisation(any(PbaRequest.class), any(Organisation.class));
+
+    }
+
+
+    @Test
+    void test_deletePaymentAccounts_NoPaymentAccountsPassed() {
+        PbaRequest deletePbaRequest = new PbaRequest();
+        var accountsToDelete = new HashSet<String>();
+        deletePbaRequest.setPaymentAccounts(accountsToDelete);
+        String orgId = UUID.randomUUID().toString().substring(0, 7);
+        String userId = UUID.randomUUID().toString();
+        assertThrows(InvalidRequest.class,() ->
+                organisationInternalController
+                        .deletePaymentAccountsOfOrganisation(deletePbaRequest, orgId, userId));
+
+    }
 }