Feat/Ajout des champ de nack dans RC-REF

.github/workflows/generate-model.yaml

@@ -31,10 +31,12 @@ jobs:
               - '**.csv'
 
       - name: Install Graphviz
+        if: steps.filter.outputs.parsing_required == 'true'
         uses: ts-graphviz/setup-graphviz@v1
 
       - name: Install python requirements
         working-directory: ./csv_parser
+        if: steps.filter.outputs.parsing_required == 'true'
         run: pip install -r ./requirements.txt
 
       - name: Run csv_parser and collect OpenAPI & JSON Schemas
@@ -44,21 +46,25 @@ jobs:
 
       - name: Install JDK 11
         uses: actions/setup-java@v4
+        if: steps.filter.outputs.parsing_required == 'true'
         with:
           java-version: '11'
           distribution: 'temurin'
 
       - name: Generate XSDs
         working-directory: ./csv_parser/json_schema2xsd
+        if: steps.filter.outputs.parsing_required == 'true'
         run: gradle run
 
       - name: Move XSDs to src
         working-directory: ./csv_parser/json_schema2xsd
+        if: steps.filter.outputs.parsing_required == 'true'
         run: |
           mv out/*.xsd ../../src/main/resources/xsd/
 
       - name: Remove input JSON Schemas
         working-directory: ./csv_parser/json_schema2xsd
+        if: steps.filter.outputs.parsing_required == 'true'
         run: |
           rm src/main/resources/*.json
 

generator/input/common.openapi.yaml

@@ -70,5 +70,9 @@ components:
       properties:
         distributionID:
           type: string
+        refused:
+          type: boolean
+        infoDistributionID:
+          type: string
       required:
         - distributionID

src/main/java/com/hubsante/model/builders/ReferenceWrapperBuilder.java

@@ -29,6 +29,16 @@ public ReferenceWrapperBuilder(DistributionElement distributionElement, String r
         this.reference = new Reference().distributionID(referencedDistributionId);
     }
 
+    public ReferenceWrapperBuilder refused(boolean refused) {
+        this.reference.setRefused(refused);
+        return this;
+    }
+
+    public ReferenceWrapperBuilder infoDistributionID(String infoDistributionID) {
+        this.reference.setInfoDistributionID(infoDistributionID);
+        return this;
+    }
+
     public ReferenceWrapper build() {
         ReferenceWrapper referenceMessage = new ReferenceWrapper();
         referenceMessage.setMessageId(distributionElement.getMessageId());
@@ -40,6 +50,12 @@ public ReferenceWrapper build() {
         referenceMessage.setKind(distributionElement.getKind());
         referenceMessage.setStatus(distributionElement.getStatus());
         referenceMessage.setRecipient(distributionElement.getRecipient());
+        // Check if reference.refused is not null and set to true, if it is check if reference.infoDistributionID
+        // is set, otherwise throw an IllegalArgumentException
+        if (this.reference.getRefused() != null && this.reference.getRefused() && this.reference.getInfoDistributionID() == null) {
+            throw new IllegalArgumentException("ReferenceWrapper must have infoDistributionID set when refused is true");
+        }
+
         referenceMessage.setReference(reference);
         return referenceMessage;
     }

src/main/java/com/hubsante/model/common/Reference.java

@@ -41,7 +41,9 @@
 /**
  * Reference
  */
-@JsonPropertyOrder({Reference.JSON_PROPERTY_DISTRIBUTION_I_D})
+@JsonPropertyOrder({Reference.JSON_PROPERTY_DISTRIBUTION_I_D,
+                    Reference.JSON_PROPERTY_REFUSED,
+                    Reference.JSON_PROPERTY_INFO_DISTRIBUTION_I_D})
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 
 public class Reference {
@@ -50,6 +52,13 @@ public class Reference {
   public static final String JSON_PROPERTY_DISTRIBUTION_I_D = "distributionID";
   private String distributionID;
 
+  public static final String JSON_PROPERTY_REFUSED = "refused";
+  private Boolean refused;
+
+  public static final String JSON_PROPERTY_INFO_DISTRIBUTION_I_D =
+      "infoDistributionID";
+  private String infoDistributionID;
+
   public Reference() {}
 
   public Reference distributionID(String distributionID) {
@@ -75,6 +84,52 @@ public void setDistributionID(String distributionID) {
     this.distributionID = distributionID;
   }
 
+  public Reference refused(Boolean refused) {
+
+    this.refused = refused;
+    return this;
+  }
+
+  /**
+   * Get refused
+   * @return refused
+   **/
+  @JsonProperty(JSON_PROPERTY_REFUSED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean getRefused() {
+    return refused;
+  }
+
+  @JsonProperty(JSON_PROPERTY_REFUSED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setRefused(Boolean refused) {
+    this.refused = refused;
+  }
+
+  public Reference infoDistributionID(String infoDistributionID) {
+
+    this.infoDistributionID = infoDistributionID;
+    return this;
+  }
+
+  /**
+   * Get infoDistributionID
+   * @return infoDistributionID
+   **/
+  @JsonProperty(JSON_PROPERTY_INFO_DISTRIBUTION_I_D)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getInfoDistributionID() {
+    return infoDistributionID;
+  }
+
+  @JsonProperty(JSON_PROPERTY_INFO_DISTRIBUTION_I_D)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setInfoDistributionID(String infoDistributionID) {
+    this.infoDistributionID = infoDistributionID;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -84,12 +139,14 @@ public boolean equals(Object o) {
       return false;
     }
     Reference reference = (Reference)o;
-    return Objects.equals(this.distributionID, reference.distributionID);
+    return Objects.equals(this.distributionID, reference.distributionID) &&
+        Objects.equals(this.refused, reference.refused) &&
+        Objects.equals(this.infoDistributionID, reference.infoDistributionID);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(distributionID);
+    return Objects.hash(distributionID, refused, infoDistributionID);
   }
 
   @Override
@@ -99,6 +156,10 @@ public String toString() {
     sb.append("    distributionID: ")
         .append(toIndentedString(distributionID))
         .append("\n");
+    sb.append("    refused: ").append(toIndentedString(refused)).append("\n");
+    sb.append("    infoDistributionID: ")
+        .append(toIndentedString(infoDistributionID))
+        .append("\n");
     sb.append("}");
     return sb.toString();
   }