Big-Life-Lab · zargot · Nov 27, 2024 · Nov 14, 2024 · Nov 14, 2024 · Nov 14, 2024
diff --git a/assets/specs/module-functions/schema-1.yml b/assets/specs/module-functions/schema-1.yml
@@ -7,9 +7,11 @@ schema:
       schema:
         SiteID:
           required: true
-          allowed:
-          - Ottawa Site
-          - Montreal Site
+          anyof:
+          - allowed:
+            - Ottawa Site
+            - Montreal Site
+            empty: true
           meta:
           - ruleID: missing_mandatory_column
             meta:

diff --git a/assets/specs/module-functions/schema-2.yml b/assets/specs/module-functions/schema-2.yml
@@ -6,12 +6,14 @@ schema:
       type: dict
       schema:
         collection:
-          allowed:
-          - comp3h
-          - comp8h
-          - flowPr
-          - comp3
-          - comp3dep
+          anyof:
+          - allowed:
+            - comp3h
+            - comp8h
+            - flowPr
+            - comp3
+            - comp3dep
+            empty: true
           meta:
           - ruleID: invalid_category
             meta:

diff --git a/assets/specs/module-functions/schema-additions-1.json b/assets/specs/module-functions/schema-additions-1.json
@@ -1,7 +1,12 @@
 {
     "Site": {
         "SiteID": {
-            "allowed": ["Ottawa Site", "Montreal Site"]
+            "anyof": [
+                {
+                    "allowed": ["Ottawa Site", "Montreal Site"],
+                    "empty": true
+                }
+            ]
         }
     }
 }
diff --git a/assets/specs/module-functions/schema-additions-2.json b/assets/specs/module-functions/schema-additions-2.json
@@ -1,7 +1,11 @@
 {
     "samples": {
         "collection": {
-            "allowed": ["comp3", "comp3dep"]
+            "anyof": [
+                {
+                    "allowed": ["comp3", "comp3dep"]
+                }
+            ]
         }
     }
 }
diff --git a/assets/validation-rules/empty/dataset-allowed.csv b/assets/validation-rules/empty/dataset-allowed.csv
@@ -0,0 +1,6 @@
+siteID,allowedField
+1,
+2,""
+3,"   "
+4,NA
+5,a
diff --git a/assets/validation-rules/empty/dataset-minlength.csv b/assets/validation-rules/empty/dataset-minlength.csv
@@ -0,0 +1,7 @@
+siteID,minlengthField
+1,
+2,""
+3,"   "
+4,NA
+5,x
+6,xxxxx
diff --git a/assets/validation-rules/empty/error-report-allowed.json b/assets/validation-rules/empty/error-report-allowed.json
@@ -0,0 +1,66 @@
+{
+    "warnings": [
+        {
+            "columnName": "allowedField",
+            "invalidValue": "",
+            "message": "missing_values_found rule triggered in table sites, column allowedField, row(s) 1: Empty string found",
+            "row": {"allowedField": "", "siteID": "1"},
+            "rowNumber": 1,
+            "tableName": "sites",
+            "validationRuleFields": [],
+            "warningType": "missing_values_found"
+        },
+        {
+            "columnName": "allowedField",
+            "invalidValue": "",
+            "message": "missing_values_found rule triggered in table sites, column allowedField, row(s) 2: Empty string found",
+            "row": {"allowedField": "", "siteID": "2"},
+            "rowNumber": 2,
+            "tableName": "sites",
+            "validationRuleFields": [],
+            "warningType": "missing_values_found"
+        },
+        {
+            "columnName": "allowedField",
+            "invalidValue": "   ",
+            "message": "missing_values_found rule triggered in table sites, column allowedField, row(s) 3: Missing value \"   \"",
+            "row": {"allowedField": "   ", "siteID": "3"},
+            "rowNumber": 3,
+            "tableName": "sites",
+            "validationRuleFields": [],
+            "warningType": "missing_values_found"
+        },
+        {
+            "columnName": "allowedField",
+            "invalidValue": "NA",
+            "message": "missing_values_found rule triggered in table sites, column allowedField, row(s) 4: Missing value \"NA\"",
+            "row": {"allowedField": "NA", "siteID": "4"},
+            "rowNumber": 4,
+            "tableName": "sites",
+            "validationRuleFields": [],
+            "warningType": "missing_values_found"
+        }
+    ],
+    "errors": [
+        {
+            "columnName": "allowedField",
+            "errorType": "invalid_category",
+            "invalidValue": "   ",
+            "message": "invalid_category rule violated in table sites, column allowedField, row(s) 3: Invalid category \"   \"",
+            "row": {"allowedField": "   ", "siteID": "3"},
+            "rowNumber": 3,
+            "tableName": "sites",
+            "validationRuleFields": []
+        },
+        {
+            "columnName": "allowedField",
+            "errorType": "invalid_category",
+            "invalidValue": "NA",
+            "message": "invalid_category rule violated in table sites, column allowedField, row(s) 4: Invalid category \"NA\"",
+            "row": {"allowedField": "NA", "siteID": "4"},
+            "rowNumber": 4,
+            "tableName": "sites",
+            "validationRuleFields": []
+        }
+    ]
+}
diff --git a/assets/validation-rules/empty/error-report-minlength.json b/assets/validation-rules/empty/error-report-minlength.json
@@ -0,0 +1,75 @@
+{
+    "warnings": [
+        {
+            "warningType": "missing_values_found",
+            "tableName": "sites",
+            "columnName": "minlengthField",
+            "validationRuleFields": [],
+            "message": "missing_values_found rule triggered in table sites, column minlengthField, row(s) 1: Empty string found",
+            "rowNumber": 1,
+            "row": {"siteID": "1", "minlengthField": ""},
+            "invalidValue": ""
+        },
+        {
+            "warningType": "missing_values_found",
+            "tableName": "sites",
+            "columnName": "minlengthField",
+            "validationRuleFields": [],
+            "message": "missing_values_found rule triggered in table sites, column minlengthField, row(s) 2: Empty string found",
+            "rowNumber": 2,
+            "row": {"siteID": "2", "minlengthField": ""}, "invalidValue": ""
+        },
+        {
+            "warningType": "missing_values_found",
+            "tableName": "sites",
+            "columnName": "minlengthField",
+            "validationRuleFields": [],
+            "message": "missing_values_found rule triggered in table sites, column minlengthField, row(s) 3: Missing value \"   \"",
+            "rowNumber": 3,
+            "row": {"siteID": "3", "minlengthField": "   "},
+            "invalidValue": "   "
+        },
+        {
+            "warningType": "missing_values_found",
+            "tableName": "sites",
+            "columnName": "minlengthField",
+            "validationRuleFields": [],
+            "message": "missing_values_found rule triggered in table sites, column minlengthField, row(s) 4: Missing value \"NA\"",
+            "rowNumber": 4,
+            "row": {"siteID": "4", "minlengthField": "NA"},
+            "invalidValue": "NA"
+        }
+    ],
+    "errors": [
+        {
+            "errorType": "less_than_min_length",
+            "tableName": "sites",
+            "columnName": "minlengthField",
+            "validationRuleFields": [],
+            "message": "less_than_min_length rule violated in table sites, column minlengthField, row(s) 3: Value \"   \" (of length 3) is less than the min length of \"5\"",
+            "rowNumber": 3,
+            "row": {"siteID": "3", "minlengthField": "   "},
+            "invalidValue": "   "
+        },
+        {
+            "errorType": "less_than_min_length",
+            "tableName": "sites",
+            "columnName": "minlengthField",
+            "validationRuleFields": [],
+            "message": "less_than_min_length rule violated in table sites, column minlengthField, row(s) 4: Value \"NA\" (of length 2) is less than the min length of \"5\"",
+            "rowNumber": 4,
+            "row": {"siteID": "4", "minlengthField": "NA"},
+            "invalidValue": "NA"
+        },
+        {
+            "errorType": "less_than_min_length",
+            "tableName": "sites",
+            "columnName": "minlengthField",
+            "validationRuleFields": [],
+            "message": "less_than_min_length rule violated in table sites, column minlengthField, row(s) 5: Value \"x\" (of length 1) is less than the min length of \"5\"",
+            "rowNumber" : 5,
+            "row": {"siteID": "5", "minlengthField": "x"},
+            "invalidValue": "x"
+        }
+    ]
+}
diff --git a/assets/validation-rules/empty/schema-v2-allowed.yml b/assets/validation-rules/empty/schema-v2-allowed.yml
@@ -0,0 +1,16 @@
+schemaVersion: 2.0.0
+schema:
+  sites:
+    type: list
+    schema:
+      type: dict
+      schema:
+        allowedField:
+          anyof:
+          - allowed:
+            - a
+            - b
+            empty: true
+          emptyTrimmed: false
+          forbidden:
+          - NA
diff --git a/assets/validation-rules/empty/schema-v2-minlength.yml b/assets/validation-rules/empty/schema-v2-minlength.yml
@@ -0,0 +1,14 @@
+schemaVersion: 2.0.0
+schema:
+  sites:
+    type: list
+    schema:
+      type: dict
+      schema:
+        minlengthField:
+          anyof:
+          - minlength: 5
+            empty: true
+          emptyTrimmed: false
+          forbidden:
+          - NA
diff --git a/assets/validation-rules/invalid-category/schema-v1.yml b/assets/validation-rules/invalid-category/schema-v1.yml
@@ -7,12 +7,14 @@ schema:
       type: dict
       schema:
         Collection:
-          allowed:
-          - Comp3h
-          - Comp8h
-          - FlowPr
-          - FlowRatePr
-          - other
+          anyof:
+          - allowed:
+            - Comp3h
+            - Comp8h
+            - FlowPr
+            - FlowRatePr
+            - other
+            empty: true
           meta:
           - ruleID: invalid_category
             meta:
@@ -47,11 +49,13 @@ schema:
       type: dict
       schema:
         type:
-          allowed:
+          anyof:
+          - allowed:
             - other
             - someOldCat1
             - wwtpMuC
             - wwtpMuS
+            empty: true
           meta:
           - ruleID: invalid_category
             meta:
@@ -86,10 +90,12 @@ schema:
       type: dict
       schema:
         type:
-          allowed:
-          - other
-          - wqCOD
-          - wwCOD
+          anyof:
+          - allowed:
+            - other
+            - wqCOD
+            - wwCOD
+            empty: true
           meta:
           - ruleID: invalid_category
             meta:

diff --git a/assets/validation-rules/invalid-category/schema-v2.yml b/assets/validation-rules/invalid-category/schema-v2.yml
@@ -6,10 +6,12 @@ schema:
       type: dict
       schema:
         coll:
-          allowed:
-          - comp3h
-          - comp8h
-          - flowPr
+          anyof:
+          - allowed:
+            - comp3h
+            - comp8h
+            - flowPr
+            empty: True
           meta:
           - ruleID: invalid_category
             meta:

diff --git a/assets/validation-rules/invalid-category/valid-dataset-2.csv b/assets/validation-rules/invalid-category/valid-dataset-2.csv
@@ -1,3 +1,4 @@
 coll
 NA
-""
+
+""
diff --git a/assets/validation-rules/less-than-min-length/schema-v1.yml b/assets/validation-rules/less-than-min-length/schema-v1.yml
@@ -6,7 +6,9 @@ schema:
       type: dict
       schema:
         phoneNumber:
-          minlength: 10
+          anyof:
+          - empty: True
+            minlength: 10
           meta:
           - ruleID: less_than_min_length
             meta:

diff --git a/assets/validation-rules/less-than-min-length/schema-v2.yml b/assets/validation-rules/less-than-min-length/schema-v2.yml
@@ -6,7 +6,9 @@ schema:
       type: dict
       schema:
         phone:
-          minlength: 10
+          anyof:
+          - empty: True
+            minlength: 10
           meta:
           - ruleID: less_than_min_length
             meta:
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     coll
     NA
-    ""
+    ""