fix: report validation second solution

cardano-foundation · Mar 3, 2025 · 82b909a · 82b909a
1 parent 342a750
commit 82b909a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/...ardanofoundation/lob/app/accounting_reporting_core/domain/entity/report/ReportEntity.java b/...ardanofoundation/lob/app/accounting_reporting_core/domain/entity/report/ReportEntity.java
@@ -255,10 +255,6 @@ public boolean isValid() {
     }
 
     public void setPeriod(Optional<@Min(1) @Max(12) Short> period) {
-        if (this.intervalType.equals(IntervalType.YEAR)) {
-            this.period = null;
-            return;
-        }
         this.period = period.orElse(null);
     }
 

diff --git a/blockchain_common/src/main/resources/api3_lob_blockchain_transaction_metadata_schema.json b/blockchain_common/src/main/resources/api3_lob_blockchain_transaction_metadata_schema.json
@@ -71,7 +71,7 @@
       "enum": ["YEAR", "MONTH", "QUARTER"]
     },
     "period": {
-      "type": ["integer", "null"],
+      "type": ["integer"],
       "minimum": 1,
       "maximum": 12
     },
@@ -98,21 +98,38 @@
         }
       },
       "then": {
-        "not": {
-          "required": ["period"]
+        "required": ["period"],
+        "properties": {
+          "period": {"const": 1}
         }
       }
     },
     {
       "if": {
         "properties": {
           "interval": {
-            "enum": ["MONTH", "QUARTER"]
+            "const": "QUARTER"
           }
         }
       },
       "then": {
-        "required": ["period"]
+        "required": ["period"],
+        "properties": {
+          "period": {
+            "type": ["integer"],
+            "minimum": 1,
+            "maximum": 4
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "interval": {
+            "enum": ["MONTH", "QUARTER"]
+          }
+        }
       }
     },
     {

diff --git a/blockchain_common/src/test/resources/api3_test_transactions_valid_bs.json b/blockchain_common/src/test/resources/api3_test_transactions_valid_bs.json
@@ -42,6 +42,7 @@
       "results_carried_forward": "300000.00"
     }
   },
+  "period": 1,
   "type": "REPORT",
   "subType": "BALANCE_SHEET",
   "interval": "YEAR",

diff --git a/blockchain_common/src/test/resources/api3_test_transactions_valid_is.json b/blockchain_common/src/test/resources/api3_test_transactions_valid_is.json
@@ -41,6 +41,7 @@
     },
     "profit_for_the_year": "3000000.00"
   },
+  "period": 1,
   "type": "REPORT",
   "subType": "INCOME_STATEMENT",
   "interval": "YEAR",