Fixed table names

pagopa · Jan 30, 2024 · d6519bb · d6519bb
1 parent c2b3f7e
commit d6519bb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/src/main/java/it/gov/pagopa/fdr/service/history/HistoryService.java b/src/main/java/it/gov/pagopa/fdr/service/history/HistoryService.java
@@ -9,6 +9,7 @@
 import com.azure.storage.blob.BlobContainerClient;
 import com.azure.storage.blob.BlobServiceClient;
 import com.azure.storage.blob.BlobServiceClientBuilder;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -117,8 +118,8 @@ public HistoryBlobBody saveJsonFile(
               fdrEntity.getFdr(), fdrEntity.getSender().getPspId(), fdrEntity.getRevision());
 
       try {
+        objMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         String fdrHistoryEntityJson = objMapper.writeValueAsString(fdrHistoryEntity);
-
         isJsonValid(fdrHistoryEntityJson, jsonSchema);
         BinaryData jsonFile = BinaryData.fromString(fdrHistoryEntityJson);
 

diff --git a/src/main/java/it/gov/pagopa/fdr/service/history/constants/HistoryConstants.java b/src/main/java/it/gov/pagopa/fdr/service/history/constants/HistoryConstants.java
@@ -12,22 +12,22 @@ private HistoryConstants() {
   public static final String FDR_PUBLISH_PUBLISHED = "published";
   public static final String FDR_PUBLISH_FDR = "fdr";
   public static final String FDR_PUBLISH_FDR_DATE = "fdr_date";
-  public static final String FDR_PUBLISH_FDR_REF_JSON_CONTAINER_NAME = "ref_json.container_name";
-  public static final String FDR_PUBLISH_FDR_REF_JSON_FILE_LENGTH = "ref_json.file_length";
-  public static final String FDR_PUBLISH_FDR_REF_JSON_FILE_NAME = "ref_json.file_name";
-  public static final String FDR_PUBLISH_FDR_REF_JSON_STORAGE_ACCOUNT = "ref_json.storage_account";
+  public static final String FDR_PUBLISH_FDR_REF_JSON_CONTAINER_NAME = "jsonref_container_name";
+  public static final String FDR_PUBLISH_FDR_REF_JSON_FILE_LENGTH = "jsonref_file_length";
+  public static final String FDR_PUBLISH_FDR_REF_JSON_FILE_NAME = "jsonref_file_name";
+  public static final String FDR_PUBLISH_FDR_REF_JSON_STORAGE_ACCOUNT = "jsonref_storage_account";
   public static final String FDR_PUBLISH_FDR_REF_JSON_JSON_SCHEMA_VERSION =
-      "ref_json.json_schema_version";
-  public static final String FDR_PUBLISH_SENDER_TYPE = "sender.type";
-  public static final String FDR_PUBLISH_SENDER_ID = "sender.id";
-  public static final String FDR_PUBLISH_SENDER_PSP_ID = "sender.psp_id";
-  public static final String FDR_PUBLISH_SENDER_PSP_NAME = "sender.psp_name";
-  public static final String FDR_PUBLISH_SENDER_PSP_BROKER_ID = "sender.psp_broker_id";
-  public static final String FDR_PUBLISH_SENDER_CHANNEL_ID = "sender.channel_id";
-  public static final String FDR_PUBLISH_SENDER_PASSWORD = "sender.password";
-  public static final String FDR_PUBLISH_RECEIVER_ID = "receiver.id";
-  public static final String FDR_PUBLISH_RECEIVER_ORGANIZATION_ID = "receiver.organization_id";
-  public static final String FDR_PUBLISH_RECEIVER_ORGANIZATION_NAME = "receiver.organization_name";
+      "jsonref_json_schema_version";
+  public static final String FDR_PUBLISH_SENDER_TYPE = "sender_type";
+  public static final String FDR_PUBLISH_SENDER_ID = "sender_id";
+  public static final String FDR_PUBLISH_SENDER_PSP_ID = "sender_psp_id";
+  public static final String FDR_PUBLISH_SENDER_PSP_NAME = "sender_psp_name";
+  public static final String FDR_PUBLISH_SENDER_PSP_BROKER_ID = "sender_psp_broker_id";
+  public static final String FDR_PUBLISH_SENDER_CHANNEL_ID = "sender_channel_id";
+  public static final String FDR_PUBLISH_SENDER_PASSWORD = "sender_password";
+  public static final String FDR_PUBLISH_RECEIVER_ID = "receiver_id";
+  public static final String FDR_PUBLISH_RECEIVER_ORGANIZATION_ID = "receiver_organization_id";
+  public static final String FDR_PUBLISH_RECEIVER_ORGANIZATION_NAME = "receiver_organization_name";
   public static final String FDR_PUBLISH_REGULATION = "regulation";
   public static final String FDR_PUBLISH_REGULATION_DATE = "regulation_date";
   public static final String FDR_PUBLISH_BIC_CODE_POURING_BANK = "bic_code_pouring_bank";