fix: Add entity graph at findByOrganizationIdAndNav (#511)

Author: ElisKina-dev

openapi/generated.openapi.json

@@ -161,6 +161,57 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/DebtPositionErrorDTO'
+  /debt-positions/by-nav/{organizationId}/{nav}:
+    get:
+      tags:
+        - debt-position
+      operationId: getDebtPositionsByOrganizationIdAndNav
+      parameters:
+        - name: organizationId
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+        - name: nav
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: debtPositionOrigin
+          in: query
+          required: false
+          schema:
+            type: array
+            items:
+              $ref: "#/components/schemas/DebtPositionOrigin"
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/DebtPositionDTO"
+        "400":
+          description: Invalid request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DebtPositionErrorDTO'
+        "404":
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DebtPositionErrorDTO'
+        '500':
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DebtPositionErrorDTO'
   /debt-positions/by-iuv/{organizationId}/{iuv}:
     get:
       tags:

openapi/p4pa-debt-position.openapi.yaml

@@ -130,6 +130,12 @@ public ResponseEntity<List<DebtPositionDTO>> getDebtPositionsByOrganizationIdAnd
     return ResponseEntity.ok(debtPositionService.getDebtPositionsByOrganizationIdAndIud(organizationId, iud, debtPositionOrigin));
   }
 
+  @Override
+  public ResponseEntity<List<DebtPositionDTO>> getDebtPositionsByOrganizationIdAndNav(Long organizationId, String nav, List<DebtPositionOrigin> debtPositionOrigin) {
+    log.info("Retrieving DebtPositions by organizationId {} and nav {}", organizationId, nav);
+    return ResponseEntity.ok(debtPositionService.getDebtPositionsByOrganizationIdAndNav(organizationId, nav, debtPositionOrigin));
+  }
+
   @Override
   public ResponseEntity<List<DebtPositionDTO>> getDebtPositionsByOrganizationIdAndIuv(Long organizationId, String iuv, List<DebtPositionOrigin> debtPositionOrigin) {
     log.info("Retrieving DebtPosition by orgId[{}] and iuv [{}]", organizationId, iuv);

src/main/java/it/gov/pagopa/pu/debtpositions/controller/DebtPositionControllerImpl.java

@@ -96,16 +96,22 @@ Page<DebtPosition> findEntityGraphByIngestionFlowFileIdAndStatusToExclude(Long i
                                                                             List<InstallmentStatus> statusToExclude,
                                                                             Pageable pageable);
 
+  @RestResource(exported = false)
   @Query("""
    SELECT d
-   FROM DebtPosition d
-      JOIN d.paymentOptions p
-      JOIN p.installments i
-   WHERE d.organizationId = :organizationId
+     FROM DebtPosition d
+    WHERE d.organizationId = :organizationId
       AND (:debtPositionOrigins IS NULL OR d.debtPositionOrigin IN :debtPositionOrigins)
-      AND i.nav = :nav
-   """)
-  List<DebtPosition> findByOrganizationIdAndInstallmentNav(Long organizationId, String nav, List<DebtPositionOrigin> debtPositionOrigins);
+      AND EXISTS (
+        SELECT 1
+          FROM PaymentOption p
+          JOIN p.installments i
+         WHERE p.debtPositionId = d.debtPositionId
+           AND i.nav = :nav
+      )
+  """)
+  @EntityGraph(value = "completeDebtPosition")
+  List<DebtPosition> findByOrganizationIdAndNav(Long organizationId, String nav, List<DebtPositionOrigin> debtPositionOrigins);
 
   @RestResource(exported = false)
   @Query("""

src/main/java/it/gov/pagopa/pu/debtpositions/repository/DebtPositionRepository.java

@@ -20,6 +20,7 @@ public interface DebtPositionService {
 
   PagedDebtPositions getPagedDebtPositionsByIngestionFlowFileId(Long ingestionFlowFileId, List<InstallmentStatus> statusToExclude, Pageable pageable);
   DebtPositionDTO getDebtPositionByInstallmentId(Long installmentId);
+  List<DebtPositionDTO> getDebtPositionsByOrganizationIdAndNav(Long organizationId, String nav, List<DebtPositionOrigin> debtPositionOrigins);
   List<DebtPositionDTO> getDebtPositionsByOrganizationIdAndIuv(Long organizationId, String iuv, List<DebtPositionOrigin> debtPositionOrigin);
   List<DebtPositionDTO> getDebtPositionsByOrganizationIdAndIud(Long organizationId, String iud, List<DebtPositionOrigin> debtPositionOrigin);
   List<DebtPositionDTO> getDebtPositionsByDebtorFiscalCodeAndDebtorEntityType(String debtorFiscalCode, PersonEntityType debtorEntityType, List<InstallmentStatus> status, List<DebtPositionOrigin> debtPositionOrigin, List<String> debtPositionTypeOrgCodesToExclude, List<Long> organizationIds, LocalDateTimeIntervalFilter dateTimeIntervalFilter);

src/main/java/it/gov/pagopa/pu/debtpositions/service/DebtPositionService.java

@@ -77,6 +77,12 @@ public DebtPositionDTO getDebtPositionByInstallmentId(Long installmentId) {
     return mapDebtPosition(debtPosition);
   }
 
+  @Override
+  public List<DebtPositionDTO> getDebtPositionsByOrganizationIdAndNav(Long organizationId, String nav, List<DebtPositionOrigin> debtPositionOrigins) {
+    List<DebtPosition> debtPositions = debtPositionRepository.findByOrganizationIdAndNav(organizationId, nav, debtPositionOrigins);
+    return debtPositions.stream().map(this::mapDebtPosition).toList();
+  }
+
   @Override
   public List<DebtPositionDTO> getDebtPositionsByOrganizationIdAndIuv(Long organizationId, String iuv, List<DebtPositionOrigin> debtPositionOrigin) {
     List<DebtPosition> debtPositions = debtPositionRepository.findEntityGraphByOrganizationIdAndInstallmentIuv(organizationId, iuv, debtPositionOrigin);

src/main/java/it/gov/pagopa/pu/debtpositions/service/DebtPositionServiceImpl.java

@@ -280,6 +280,24 @@ void whenGetDebtPositionByInstallmentIdThenOk() throws Exception {
     assertEquals(expectedResult, resultResponse);
   }
 
+  @Test
+  void whenGetDebtPositionsByOrganizationIdAndNavThenOk() throws Exception {
+    Long organizationId = 1L;
+    String nav = "301000000000000245";
+
+    List<DebtPositionDTO> expectedResult = List.of(new DebtPositionDTO());
+    Mockito.when(debtPositionService.getDebtPositionsByOrganizationIdAndNav(organizationId, nav, null)).thenReturn(expectedResult);
+
+    MvcResult result = mockMvc.perform(
+        get("/debt-positions/by-nav/" + organizationId + "/" + nav)
+          .contentType(MediaType.APPLICATION_JSON_VALUE))
+      .andExpect(status().isOk())
+      .andReturn();
+
+    List<DebtPositionDTO> resultResponse = jsonMapper.readValue(result.getResponse().getContentAsString(), new TypeReference<ArrayList<DebtPositionDTO>>(){});
+    assertEquals(expectedResult, resultResponse);
+  }
+
   @Test
   void whenGetDebtPositionsByOrganizationIdAndIuvThenOk() throws Exception {
     Long organizationId = 1L;

src/test/java/it/gov/pagopa/pu/debtpositions/controller/DebtPositionControllerTest.java

@@ -181,6 +181,27 @@ void givenNonExistingDebtPositionDetailWhenGetDebtPositionByInstallmentIdThenThr
     Mockito.verifyNoInteractions(debtPositionMapperMock);
   }
 
+  @Test
+  void givenExistingDebtPositionWhenGetDebtPositionsByOrganizationIdAndNavThenOk() {
+    // Given
+    Long organizationId = 1L;
+    String nav = "301000000000000245";
+    List<DebtPositionDTO> expectedResult = List.of(podamFactory.manufacturePojo(DebtPositionDTO.class));
+    List<DebtPosition> debtPositions = List.of(podamFactory.manufacturePojo(DebtPosition.class));
+
+    Mockito.when(debtPositionRepositoryMock.findByOrganizationIdAndNav(organizationId, nav, null)).thenReturn(debtPositions);
+    Mockito.when(debtPositionMapperMock.mapToDto(debtPositions.getFirst())).thenReturn(expectedResult.getFirst());
+
+    // When
+    List<DebtPositionDTO> result = debtPositionService.getDebtPositionsByOrganizationIdAndNav(
+      organizationId, nav, null);
+
+    // Then
+    Assertions.assertNotNull(result);
+    Assertions.assertIterableEquals(expectedResult, result);
+    Mockito.verifyNoMoreInteractions(debtPositionRepositoryMock, debtPositionMapperMock);
+  }
+
   @Test
   void givenExistingDebtPositionWhenGetDebtPositionsByOrganizationIdAndIuvThenOk() {
     // Given