NOD-642 fix conversion

pagopa · Feb 1, 2024 · 41e2999 · 41e2999
1 parent 63614b5
commit 41e2999
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/main/java/it/gov/pagopa/fdr/rest/organizations/BaseOrganizationsResource.java b/src/main/java/it/gov/pagopa/fdr/rest/organizations/BaseOrganizationsResource.java
@@ -71,11 +71,11 @@ protected GetAllResponse baseGetAll(
 
     ConfigDataV1 configData = config.getClonedCache();
     // validation
-    if (internalGetAll) {
-      internalValidator.validateGetAllInternal(action, idPsp, configData);
-    } else {
-      validator.validateGetAllByEc(action, organizationId, idPsp, configData);
-    }
+    //    if (internalGetAll) {
+    //      internalValidator.validateGetAllInternal(action, idPsp, configData);
+    //    } else {
+    validator.validateGetAllByEc(action, organizationId, idPsp, configData);
+    //    }
 
     // get from db
     FdrAllDto fdrAllDto =
@@ -108,11 +108,11 @@ protected GetResponse baseGet(
     ConfigDataV1 configData = config.getClonedCache();
 
     // validation
-    if (internalGet) {
-      internalValidator.validateGetInternal(action, fdr, psp, configData);
-    } else {
-      validator.validateGet(action, fdr, organizationId, psp, configData);
-    }
+    //    if (internalGet) {
+    //      internalValidator.validateGetInternal(action, fdr, psp, configData);
+    //    } else {
+    validator.validateGet(action, fdr, organizationId, psp, configData);
+    //    }
 
     // get from db
     FdrGetDto fdrGetDto = service.findByReportingFlowName(action, fdr, rev, psp, organizationId);
@@ -143,11 +143,11 @@ protected GetPaymentResponse baseGetFdrPayment(
 
     ConfigDataV1 configData = config.getClonedCache();
     // validation
-    if (internalGetPayment) {
-      internalValidator.validateGetPaymentInternal(action, fdr, psp, configData);
-    } else {
-      validator.validateGetPayment(action, fdr, organizationId, psp, configData);
-    }
+    //    if (internalGetPayment) {
+    //      internalValidator.validateGetPaymentInternal(action, fdr, psp, configData);
+    //    } else {
+    validator.validateGetPayment(action, fdr, organizationId, psp, configData);
+    //    }
 
     // get from db
     FdrGetPaymentDto fdrGetPaymentDto =

diff --git a/src/main/java/it/gov/pagopa/fdr/service/conversion/message/FdrMessage.java b/src/main/java/it/gov/pagopa/fdr/service/conversion/message/FdrMessage.java
@@ -11,6 +11,8 @@ public class FdrMessage {
 
   private String pspId;
 
+  private String organizationId;
+
   private Long retry;
 
   private Long revision;

diff --git a/src/main/java/it/gov/pagopa/fdr/service/psps/PspsService.java b/src/main/java/it/gov/pagopa/fdr/service/psps/PspsService.java
@@ -343,6 +343,7 @@ public void publishByFdr(String action, String pspId, String fdr, boolean intern
           FdrMessage.builder()
               .fdr(fdrEntity.getFdr())
               .pspId(fdrEntity.getSender().getPspId())
+              .organizationId(fdrEntity.getReceiver().getOrganizationId())
               .retry(0L)
               .revision(fdrEntity.getRevision())
               .build());