From 559b3e0439f7a2d8017cac5e597e88804d9786ce Mon Sep 17 00:00:00 2001
From: Vitolo-Andrea <andrea.vitolo@emeal.nttdata.com>
Date: Tue, 14 Jan 2025 10:55:10 +0100
Subject: [PATCH] delete document api imp

---
 .../onboarding/citizen/service/CitizenServiceImpl.java    | 8 ++++----
 .../onboarding/citizen/service/CitizenServiceTest.java    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceImpl.java b/src/main/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceImpl.java
index 6c968ad..aebd6ed 100644
--- a/src/main/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceImpl.java
+++ b/src/main/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceImpl.java
@@ -196,9 +196,9 @@ public Mono<CitizenConsentDTO> deleteCitizenConsent(String fiscalCode) {
         return citizenRepository.findByFiscalCode(fiscalCode)
                 .switchIfEmpty(Mono.error(exceptionMap.throwException
                         (ExceptionName.CITIZEN_NOT_ONBOARDED, "Citizen consent not founded during delete process ")))
-                .map(citizenConsent -> {
-                    citizenRepository.deleteById(citizenConsent.getId());
-                    return mapperToDTO.map(citizenConsent);
-                });
+                .flatMap(citizenConsent ->
+                        citizenRepository.deleteById(citizenConsent.getId())
+                                .then(Mono.just(mapperToDTO.map(citizenConsent)))
+                );
     }
 }
diff --git a/src/test/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceTest.java b/src/test/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceTest.java
index 5fd23e1..75a8ab3 100644
--- a/src/test/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceTest.java
+++ b/src/test/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceTest.java
@@ -342,12 +342,13 @@ void getCitizenEnabled_Empty() {
     @Test
     void deleteCitizenConsent_OK() {
         CitizenConsent citizenConsent = CitizenConsent.builder()
+                .id(FISCAL_CODE)
                 .fiscalCode(FISCAL_CODE)
                 .consents(new HashMap<>())
                 .build();
 
         when(citizenRepository.findByFiscalCode(FISCAL_CODE)).thenReturn(Mono.just(citizenConsent));
-
+        when(citizenRepository.deleteById(FISCAL_CODE)).thenReturn(Mono.empty());
         StepVerifier.create(citizenService.deleteCitizenConsent(FISCAL_CODE))
                 .assertNext(response -> {
                     assertNotNull(response);