From 41e29994c7be1d00af83c63ae36f1fd59fca5f04 Mon Sep 17 00:00:00 2001
From: maxsca <130107847+maxsca@users.noreply.github.com>
Date: Thu, 1 Feb 2024 10:37:51 +0100
Subject: [PATCH] NOD-642 fix conversion

---
 .../BaseOrganizationsResource.java            | 30 +++++++++----------
 .../conversion/message/FdrMessage.java        |  2 ++
 .../pagopa/fdr/service/psps/PspsService.java  |  1 +
 3 files changed, 18 insertions(+), 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
index 3ce42341..52d1d114 100644
--- 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
index 6fba4ffe..452b1f54 100644
--- 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
index f31a33e1..345806d9 100644
--- 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());