clean(ZMSKVR): refactor citizenapi schemas and remove unused model

it-at-m · Feb 21, 2025 · e10c7d7 · e10c7d7
1 parent c82eeda
commit e10c7d7
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 872 deletions.
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/ProcessFreeSlots.php b/zmscitizenapi/src/Zmscitizenapi/Models/ProcessFreeSlots.php
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiFacadeService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiFacadeService.php
@@ -10,8 +10,6 @@
 use BO\Zmscitizenapi\Models\AvailableDays;
 use BO\Zmscitizenapi\Models\AvailableAppointments;
 use BO\Zmscitizenapi\Models\Office;
-use BO\Zmscitizenapi\Models\ProcessFreeSlots;
-use BO\Zmscitizenapi\Models\ProcessFreeSlotsGroupByOffice;
 use BO\Zmscitizenapi\Models\Service;
 use BO\Zmscitizenapi\Models\ThinnedProcess;
 use BO\Zmscitizenapi\Models\ThinnedScope;

diff --git a/zmsentities/schema/citizenapi/availableAppointmentsByOffice.json b/zmsentities/schema/citizenapi/availableAppointmentsByOffice.json
@@ -13,15 +13,7 @@
             "description": "Office ID"
           },
           "appointmentTimestamps": {
-            "type": "array",
-            "description": "Array of available appointment timestamps in seconds since epoch",
-            "items": {
-              "type": "integer",
-              "description": "Timestamp in seconds since epoch",
-              "minimum": 0
-            },
-            "uniqueItems": true,
-            "minItems": 0
+            "$ref": "./appointmentTimestamps.json"
           }
         },
         "required": ["offices"]

diff --git a/zmsentities/schema/citizenapi/collections/officeList.json b/zmsentities/schema/citizenapi/collections/officeList.json
@@ -8,123 +8,7 @@
     "offices": {
       "type": "array",
       "items": {
-        "title": "Office",
-        "type": [
-          "array",
-          "object"
-        ],
-        "properties": {
-          "id": {
-            "type": "integer",
-            "description": "Unique identifier for the office"
-          },
-          "name": {
-            "type": [
-              "string",
-              "null"
-            ],
-            "description": "The name of the office"
-          },
-          "showAlternativeLocations": {
-            "type": [
-              "boolean",
-              "null"
-            ],
-            "description": "Show alternative office locations in the citizen calendar"
-          },
-          "address": {
-            "type": [
-              "array",
-              "object",
-              "null"
-            ],
-            "description": "The address of the office",
-            "items": {
-              "type": [
-                "array",
-                "object",
-                "null"
-              ],
-              "properties": {
-                "house_number": {
-                  "type": "string",
-                  "description": "House number of the address"
-                },
-                "city": {
-                  "type": "string",
-                  "description": "City of the address"
-                },
-                "postal_code": {
-                  "type": "string",
-                  "description": "Postal code of the address"
-                },
-                "street": {
-                  "type": "string",
-                  "description": "Street name of the address"
-                },
-                "hint": {
-                  "type": "boolean",
-                  "description": "Additional hint about the address"
-                }
-              }
-            }
-          },
-          "displayNameAlternatives": {
-            "type": [
-              "array",
-              "null"
-            ],
-            "description": "Alternative names of the office"
-          },
-          "organization": {
-            "type": [
-              "string",
-              "null"
-            ],
-            "description": "The name of the Organization"
-          },
-          "organizationUnit": {
-            "type": [
-              "string",
-              "null"
-            ],
-            "description": "The name of the organization"
-          },
-          "slotTimeInMinutes": {
-            "type": [
-              "integer",
-              "null"
-            ],
-            "description": "Slot time in minutes"
-          },
-          "geo": {
-            "type": [
-              "array",
-              "object",
-              "null"
-            ],
-            "description": "Geographical coordinates of the office",
-            "properties": {
-              "lat": {
-                "type": "number",
-                "description": "Latitude of a geo coordinate as wgs84 or etrs89",
-                "minimum": -90,
-                "maximum": 90
-              },
-              "lon": {
-                "type": "number",
-                "description": "Longitude of a geo coordinate as wgs84 or etrs89",
-                "minimum": -180,
-                "maximum": 180
-              }
-            }
-          },
-          "scope": {}
-        },
-        "required": [
-          "id"
-        ],
-        "description": "Schema definition for the Office entity"
+        "$ref": "../office.json"
       }
     }
   },