[SELC-6580] Disabled deletion on PecNotification. Removed PecNotification from institution-ms (#66)

Author: gaetano-miglionico

apps/institution-ms/app/src/test/java/it/pagopa/selfcare/mscore/integration_test/steps/InstitutionSteps.java

@@ -5,10 +5,8 @@
 import io.cucumber.java.en.And;
 import it.pagopa.selfcare.mscore.connector.dao.InstitutionRepository;
 import it.pagopa.selfcare.mscore.connector.dao.MailNotificationRepository;
-import it.pagopa.selfcare.mscore.connector.dao.PecNotificationRepository;
 import it.pagopa.selfcare.mscore.connector.dao.model.InstitutionEntity;
 import it.pagopa.selfcare.mscore.connector.dao.model.MailNotificationEntity;
-import it.pagopa.selfcare.mscore.connector.dao.model.PecNotificationEntity;
 import it.pagopa.selfcare.mscore.connector.dao.model.inner.OnboardingEntity;
 import it.pagopa.selfcare.mscore.constant.Origin;
 import it.pagopa.selfcare.mscore.constant.RelationshipState;
@@ -29,20 +27,17 @@ public class InstitutionSteps {
 
     private final SharedStepData sharedStepData;
     private final InstitutionRepository institutionRepository;
-    private final PecNotificationRepository pecNotificationRepository;
     private final MailNotificationRepository mailNotificationRepository;
     private final MongoTemplate mongoTemplate;
 
     private String mockInstitutionId;
 
     public InstitutionSteps(SharedStepData sharedStepData,
                             InstitutionRepository institutionRepository,
-                            PecNotificationRepository pecNotificationRepository,
                             MailNotificationRepository mailNotificationRepository,
                             MongoTemplate mongoTemplate) {
         this.sharedStepData = sharedStepData;
         this.institutionRepository = institutionRepository;
-        this.pecNotificationRepository = pecNotificationRepository;
         this.mailNotificationRepository = mailNotificationRepository;
         this.mongoTemplate = mongoTemplate;
     }
@@ -65,7 +60,6 @@ public void removeSubunitAndParentInstitutionAfterScenario(Scenario scenario) {
     public void removeMockInstitution() {
         Optional.ofNullable(mockInstitutionId).ifPresent(id -> {
             institutionRepository.deleteById(id);
-            mongoTemplate.remove(new Query(Criteria.where("institutionId").is(id)), PecNotificationEntity.class);
             mongoTemplate.remove(new Query(Criteria.where("institutionId").is(id)), MailNotificationEntity.class);
         });
     }
@@ -87,19 +81,6 @@ public void createMockInstitutionWithId(String id) {
         final InstitutionEntity savedEntity = institutionRepository.save(entity);
         mockInstitutionId = savedEntity.getId();
 
-        final PecNotificationEntity pecNotificationEntityIO = new PecNotificationEntity();
-        pecNotificationEntityIO.setInstitutionId(mockInstitutionId);
-        pecNotificationEntityIO.setProductId("prod-io");
-        pecNotificationEntityIO.setModuleDayOfTheEpoch(10);
-        pecNotificationEntityIO.setDigitalAddress("digital.address@test.com");
-        pecNotificationRepository.save(pecNotificationEntityIO);
-        final PecNotificationEntity pecNotificationEntityPA = new PecNotificationEntity();
-        pecNotificationEntityPA.setInstitutionId(mockInstitutionId);
-        pecNotificationEntityPA.setProductId("prod-pagopa");
-        pecNotificationEntityPA.setModuleDayOfTheEpoch(20);
-        pecNotificationEntityPA.setDigitalAddress("digital.address@test.com");
-        pecNotificationRepository.save(pecNotificationEntityPA);
-
         final MailNotificationEntity mailNotificationEntity = new MailNotificationEntity();
         mailNotificationEntity.setInstitutionId(mockInstitutionId);
         mailNotificationEntity.setProductIds(Set.of("prod-io", "prod-pagopa"));
@@ -150,12 +131,6 @@ public void checkOnboardingsStates(String institutionId, Map<String, String> exp
         entity.getOnboarding().forEach(e -> Assertions.assertEquals(expectedProductState.get(e.getProductId()), e.getStatus().name()));
     }
 
-    @And("Count of PecNotification with institutionId {string} is {long}")
-    public void checkPecNotificationCount(String institutionId, long expectedCount) {
-        long count = mongoTemplate.count(new Query(Criteria.where("institutionId").is(institutionId)), PecNotificationEntity.class);
-        Assertions.assertEquals(expectedCount, count);
-    }
-
     @And("Count of MailNotification with institutionId {string} is {long}")
     public void checkMailNotificationCount(String institutionId, long expectedCount) {
         long count = mongoTemplate.count(new Query(Criteria.where("institutionId").is(institutionId)), MailNotificationEntity.class);

apps/institution-ms/app/src/test/resources/features/institution.feature

@@ -1107,7 +1107,6 @@ Feature: Institution
       | prod-idpay      | DELETED   |
       | prod-pn         | SUSPENDED |
       | prod-io-premium | ACTIVE    |
-    And Count of PecNotification with institutionId "123" is 2
     And Count of MailNotification with institutionId "123" is 1
     And Onboarding for institutionId "123" and productId "prod-io-premium" was saved to db successfully with token "123456789" contract "testContractPath" and a module of 10
 
@@ -1136,7 +1135,6 @@ Feature: Institution
     And Onboardings of institution with id "123" have following states:
       | prod-io    | ACTIVE  |
       | prod-idpay | DELETED |
-    And Count of PecNotification with institutionId "123" is 0
     And Count of MailNotification with institutionId "123" is 1
     And Onboarding for institutionId "123" and productId "prod-io" was saved to db successfully with token "123456789" contract "testContractPath" and a module of 4
 
@@ -1169,7 +1167,6 @@ Feature: Institution
       | prod-pagopa | ACTIVE    |
       | prod-idpay  | DELETED   |
       | prod-pn     | SUSPENDED |
-    And Count of PecNotification with institutionId "123" is 2
     And Onboarding for institutionId "123" and productId "prod-pn" was saved to db successfully with token "MOCK_TOKEN" contract "MOCK_CONTRACT" and a module of 10
 
   Scenario: Do not persist PecNotification with PT institution type
@@ -1190,7 +1187,6 @@ Feature: Institution
       | prod-pagopa  |
       | prod-interop |
     And The response body contains field "id"
-    And Count of PecNotification with institutionId "067327d3-bdd6-408d-8655-87e8f1960046" is 0
     And Count of MailNotification with institutionId "067327d3-bdd6-408d-8655-87e8f1960046" is 0
 
   Scenario: Not found institution while persistOnboarding
@@ -1248,7 +1244,6 @@ Feature: Institution
       | prod-pagopa | DELETED   |
       | prod-idpay  | DELETED   |
       | prod-pn     | SUSPENDED |
-    And Count of PecNotification with institutionId "123" is 1
     And Count of MailNotification with institutionId "123" is 1
     And MailNotification for institutionId "123" and productId "prod-pagopa" was removed from db successfully
     # No more products left in MailNotification
@@ -1263,7 +1258,6 @@ Feature: Institution
       | prod-pagopa | DELETED   |
       | prod-idpay  | DELETED   |
       | prod-pn     | SUSPENDED |
-    And Count of PecNotification with institutionId "123" is 0
     And Count of MailNotification with institutionId "123" is 0
     And MailNotification for institutionId "123" was deleted from db successfully
 
@@ -1281,7 +1275,6 @@ Feature: Institution
       | prod-pagopa | ACTIVE    |
       | prod-idpay  | DELETED   |
       | prod-pn     | SUSPENDED |
-    And Count of PecNotification with institutionId "123" is 2
     And Count of MailNotification with institutionId "123" is 1
 
 # GET /institutions/{id}/geotaxonomies

apps/institution-ms/connector-api/src/main/java/it/pagopa/selfcare/mscore/api/PecNotificationConnector.java

@@ -2,7 +2,6 @@
 
 import it.pagopa.selfcare.mscore.api.InstitutionConnector;
 import it.pagopa.selfcare.mscore.api.MailNotificationConnector;
-import it.pagopa.selfcare.mscore.api.PecNotificationConnector;
 import it.pagopa.selfcare.mscore.config.InstitutionSendMailConfig;
 import it.pagopa.selfcare.mscore.constant.CustomError;
 import it.pagopa.selfcare.mscore.constant.RelationshipState;
@@ -32,22 +31,19 @@ public class OnboardingServiceImpl implements OnboardingService {
     private final OnboardingDao onboardingDao;
     private final InstitutionService institutionService;
     private final InstitutionConnector institutionConnector;
-    private final PecNotificationConnector pecNotificationConnector;
     private final MailNotificationConnector mailNotificationConnector;
 
     private final InstitutionSendMailConfig institutionSendMailConfig;
 
     public OnboardingServiceImpl(OnboardingDao onboardingDao,
                                  InstitutionService institutionService,
                                  InstitutionConnector institutionConnector,
-                                 PecNotificationConnector pecNotificationConnector,
                                  MailNotificationConnector mailNotificationConnector,
                                  InstitutionSendMailConfig institutionSendMailConfig) {
 
         this.onboardingDao = onboardingDao;
         this.institutionService = institutionService;
         this.institutionConnector = institutionConnector;
-        this.pecNotificationConnector = pecNotificationConnector;
         this.mailNotificationConnector = mailNotificationConnector;
         this.institutionSendMailConfig = institutionSendMailConfig;
     }
@@ -148,7 +144,6 @@ private boolean isMailNotificationEnabled(Institution institution) {
     public void deleteOnboardedInstitution(String institutionId, String productId) {
         institutionConnector.findAndDeleteOnboarding(institutionId, productId);
         mailNotificationConnector.removeMailNotification(institutionId, productId);
-        pecNotificationConnector.findAndDeletePecNotification(institutionId, productId);
     }
 
 }