Add 'service_id' field. Used to include the message senders hostname

schemas/data-ingress/mq-file-update.json

@@ -8,23 +8,27 @@
             "type": "string",
             "description": "Name of the service submitting the update"
         },
-        "update_type": {
+        "service_id": {
+            "type": "string",
+            "description": "ID of the service sending the message - usually a hostname"
+        },
+        "data_type": {
             "type": "string",
             "enum": ["file"],
-            "description": "The method of update application"
+            "description": "The type of data contained in this message object"
         },
         "sent_timestamp": {
             "type": "integer",
             "description": "Unix timestamp representing the time the message was sent"
         },
+        "data_kind": {
+            "type": "string",
+            "enum": ["pis", "timetable", "knowledgebase"],
+            "description": "The data type contained in the file.  Currently supported PIS: PIS Data, Timetable: CIF or VSTP Data, Knowledgebase: Station Data"
+        },
         "payload": {
             "type": "object",
             "properties": {
-                "kind": {
-                    "type": "string",
-                    "enum": ["pis"],
-                    "description": "The type of data provided in the update"
-                },
                 "version": {
                     "type": "string",
                     "description": "The version string from the package source"
@@ -34,9 +38,10 @@
                     "description": "The full path to the file, including protocol (eg. s3://) where appropriate"
                 }
             },
-            "required": ["kind", "version", "filepath"]
+            "required": ["version", "filepath"],
+            "additionalProperties": false
         }
     },
-    "required": ["service_name", "update_type", "payload"],
+    "required": ["service_name", "service_id", "data_type", "sent_timestamp", "data_kind", "payload"],
     "additionalProperties": false
 }

scripts/build.sh

@@ -18,7 +18,7 @@ for file in $FILES; do
     npx --yes json-schema-to-typescript "$file" > "gen/ts/${clean_name}.ts"
     
     # Generate Go
-    go-jsonschema -p backend_data_contracts "$file" > "gen/go/models/${clean_name}.go"
+    go-jsonschema -p contracts "$file" > "gen/go/models/${clean_name}.go"
 done
 
 echo "✅ Generated single TS package in gen/ts"