Fix Json Schema Generation; Re-generate all Schemas (#395)

Hochfrequenz · Jan 2, 2024 · efe49e5 · efe49e5
1 parent 60c60bb
commit efe49e5
Show file tree

Hide file tree

Showing 12 changed files with 3,263 additions and 727 deletions.
diff --git a/BO4ETestProject/TestJsonSchemaGeneration.cs b/BO4ETestProject/TestJsonSchemaGeneration.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using BO4E.BO;
+using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json.Schema;
 
@@ -32,20 +33,23 @@ public void NegativeTest()
         }
 
 
-
+        private const int LastDataRowOffset = 40;
+        private const int MaxSchemasPerHour = 10;
         [TestMethod]
         [DataRow(0)]
         [DataRow(10)]
         [DataRow(20)]
         [DataRow(30)]
-        [DataRow(40)] // using these different data rows you to workaround the 10schema per hour limitation
+        [DataRow(LastDataRowOffset)] // using these different data rows you to workaround the 10schema per hour limitation (MaxSchemasPerHour)
 
         public void TestJSchemaFileGenerationBo(int offset)
         {
+            var relevantBusinessObjectTypes = typeof(BusinessObject).Assembly.GetTypes()
+                .Where(t => t.IsSubclassOf(typeof(BusinessObject)));
+            relevantBusinessObjectTypes.Count().Should().BeLessThan(LastDataRowOffset + MaxSchemasPerHour); // if this fails, add another data row to this test method
             try
             {
-                foreach (var type in typeof(BusinessObject).Assembly.GetTypes()
-                    .Where(t => t.IsSubclassOf(typeof(BusinessObject))).Skip(offset).Take(10))
+                foreach (var type in relevantBusinessObjectTypes.Skip(offset).Take(MaxSchemasPerHour))
                 {
                     var schema = BusinessObject.GetJsonSchema(type);
                     Assert.IsNotNull(schema);

diff --git a/json-schema-files/BO4E.BO.Anfrage.json b/json-schema-files/BO4E.BO.Anfrage.json
@@ -2,28 +2,49 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "ExterneReferenz": {
-      "type": ["object", "null"],
+      "type": [
+        "object",
+        "null"
+      ],
       "properties": {
         "exRefName": {
-          "type": ["string", "null"]
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "exRefWert": {
-          "type": ["string", "null"]
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "timestamp": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "format": "date-time"
         },
         "guid": {
-          "type": ["string", "null"]
+          "type": [
+            "string",
+            "null"
+          ]
         }
       }
     },
     "Zeitraum": {
-      "type": ["object", "null"],
+      "type": [
+        "object",
+        "null"
+      ],
       "properties": {
         "einheit": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "enum": [
             null,
             "SEKUNDE",
@@ -39,65 +60,110 @@
           ]
         },
         "dauer": {
-          "type": ["number", "null"]
+          "type": [
+            "number",
+            "null"
+          ]
         },
         "startdatum": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "format": "date-time"
         },
         "enddatum": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "format": "date-time"
         },
         "startzeitpunkt": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "format": "date-time"
         },
         "endzeitpunkt": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "format": "date-time"
         },
         "timestamp": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "format": "date-time"
         },
         "guid": {
-          "type": ["string", "null"]
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
-      "required": ["startzeitpunkt", "endzeitpunkt"]
+      "required": [
+        "startzeitpunkt",
+        "endzeitpunkt"
+      ]
     }
   },
   "type": "object",
   "properties": {
     "boTyp": {
-      "type": ["string", "null"]
+      "type": [
+        "string",
+        "null"
+      ]
     },
     "versionStruktur": {
-      "type": ["string", "null"]
+      "type": [
+        "string",
+        "null"
+      ]
     },
     "timestamp": {
-      "type": ["string", "null"],
+      "type": [
+        "string",
+        "null"
+      ],
       "format": "date-time"
     },
     "externeReferenzen": {
-      "type": ["array", "null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
         "$ref": "#/definitions/ExterneReferenz"
       }
     },
     "guid": {
-      "type": ["string", "null"]
+      "type": [
+        "string",
+        "null"
+      ]
     },
     "lokationsId": {
       "type": "string"
     },
     "lokationsTyp": {
       "type": "string",
-      "enum": ["MALO", "MELO"]
+      "enum": [
+        "MALO",
+        "MELO"
+      ]
     },
     "obiskennzahl": {
-      "type": ["string", "null"]
+      "type": [
+        "string",
+        "null"
+      ]
     },
     "ZeitraumMesswertanfrage": {
       "$ref": "#/definitions/Zeitraum"
@@ -123,7 +189,10 @@
       ]
     },
     "anfragetyp": {
-      "type": ["string", "null"],
+      "type": [
+        "string",
+        "null"
+      ],
       "enum": [
         null,
         "START_ABO",
@@ -142,5 +211,9 @@
       ]
     }
   },
-  "required": ["lokationsId", "lokationsTyp", "anfragekategorie"]
-}
+  "required": [
+    "lokationsId",
+    "lokationsTyp",
+    "anfragekategorie"
+  ]
+}