fix: [PQ-151] - email field name (#89)

* fix - email field name * getOrgReceipt - psp channel description not required * getOrgReceipt openapi - psp channel description not required --------- Co-authored-by: Andrea Ferracci <[email protected]> Co-authored-by: pasqualespica <[email protected]>
pagopa · Sep 13, 2024 · 058e759 · 058e759
1 parent c3790a9
commit 058e759
Show file tree

Hide file tree

Showing 12 changed files with 3,822 additions and 4,259 deletions.
diff --git a/openapi/openapi.json b/openapi/openapi.json
diff --git a/openapi/openapi_ec.json b/openapi/openapi_ec.json
diff --git a/openapi/openapi_helpdesk.json b/openapi/openapi_helpdesk.json
diff --git a/openapi/openapi_io.json b/openapi/openapi_io.json
diff --git a/src/main/java/it/gov/pagopa/bizeventsservice/entity/Debtor.java b/src/main/java/it/gov/pagopa/bizeventsservice/entity/Debtor.java
@@ -18,6 +18,6 @@ public class Debtor {
  private String city;
  private String stateProvinceRegion;
  private String country;
- @JsonProperty(value = "eMail")
+ @JsonProperty(value = "email")
  private String eMail;
 }
diff --git a/src/main/java/it/gov/pagopa/bizeventsservice/entity/Payer.java b/src/main/java/it/gov/pagopa/bizeventsservice/entity/Payer.java
@@ -18,6 +18,6 @@ public class Payer {
  private String city;
  private String stateProvinceRegion;
  private String country;
- @JsonProperty(value = "eMail")
+ @JsonProperty(value = "email")
  private String eMail;
 }
diff --git a/src/main/java/it/gov/pagopa/bizeventsservice/model/response/CtReceiptModelResponse.java b/src/main/java/it/gov/pagopa/bizeventsservice/model/response/CtReceiptModelResponse.java
@@ -56,7 +56,7 @@ public class CtReceiptModelResponse implements Serializable {
  private String pspCompanyName;
  @NotBlank(message = "idChannel is required")
  private String idChannel;
- @NotBlank(message = "channelDescription is required")
+
  private String channelDescription;
 
  private Payer payer;

diff --git a/src/main/java/it/gov/pagopa/bizeventsservice/model/response/Debtor.java b/src/main/java/it/gov/pagopa/bizeventsservice/model/response/Debtor.java
@@ -35,6 +35,6 @@ public class Debtor implements Serializable {
  private String city;
  private String stateProvinceRegion;
  private String country;
- @JsonProperty(value = "eMail")
+ @JsonProperty(value = "email")
  private String eMail;
 }
diff --git a/src/main/java/it/gov/pagopa/bizeventsservice/model/response/Payer.java b/src/main/java/it/gov/pagopa/bizeventsservice/model/response/Payer.java
@@ -33,6 +33,6 @@ public class Payer implements Serializable {
  private String city;
  private String stateProvinceRegion;
  private String country;
- @JsonProperty(value = "eMail")
+ @JsonProperty(value = "email")
  private String eMail;
 }
diff --git a/src/test/resources/biz-events/bizEvent.json b/src/test/resources/biz-events/bizEvent.json
@@ -40,7 +40,7 @@
  "city": "city",
  "stateProvinceRegion": "stateProvinceRegion",
  "country": "IT",
- "eMail": "[email protected]"
+ "email": "[email protected]"
  },
  "payer": {
  "fullName": "fullName",
@@ -52,7 +52,7 @@
  "city": "city",
  "stateProvinceRegion": "stateProvinceRegion",
  "country": "IT",
- "eMail": "[email protected]"
+ "email": "[email protected]"
  },
  "paymentInfo": {
  "paymentDateTime": "2022-12-06T17:54:08.017744",

diff --git a/src/test/resources/biz-events/bizEvent_duplicate.json b/src/test/resources/biz-events/bizEvent_duplicate.json
@@ -40,7 +40,7 @@
  "city": "city",
  "stateProvinceRegion": "stateProvinceRegion",
  "country": "IT",
- "eMail": "[email protected]"
+ "email": "[email protected]"
  },
  "payer": {
  "fullName": "fullName",
@@ -52,7 +52,7 @@
  "city": "city",
  "stateProvinceRegion": "stateProvinceRegion",
  "country": "IT",
- "eMail": "[email protected]"
+ "email": "[email protected]"
  },
  "paymentInfo": {
  "paymentDateTime": "2022-12-06T17:54:08.017744",

diff --git a/src/test/resources/receipts/getOrganizationReceipt.json b/src/test/resources/receipts/getOrganizationReceipt.json
@@ -18,7 +18,7 @@
  "city": null,
  "stateProvinceRegion": null,
  "country": null,
- "eMail": null
+ "email": null
  },
  "transferList": [
  {