Skip to content

Commit 73132d3

Browse files
committed
Revert "chore(ZMS-3235): Fixed some schema tests"
This reverts commit d50a84b.
1 parent 2682444 commit 73132d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+553
-553
lines changed

zmsentities/schema/apiclient.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "An apiclient is required on requesting an apikey.",
44
"example": {
55
"clientKey": "wMdVa5Nu1seuCRSJxhKl2M3yw8zqaAilPH2Xc2IZs",

zmsentities/schema/apikey.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "Representation of an Apikey. It usually stores temporary api quota data while appointment scheduling in service app",
44
"example": {
55
"key": "wMdVa5Nu1seuCRSJxhKl2M3yw8zqaAilPH2Xc2IZs",
@@ -39,9 +39,9 @@
3939
"$ref": "mimepart.json"
4040
},
4141
"quota": {
42-
"type": ["array", "object"],
42+
"type": "array",
4343
"items": {
44-
"type": ["array", "object"],
44+
"type": "object",
4545
"properties": {
4646
"route": {
4747
"type": "string",

zmsentities/schema/appointment.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "An appointment represents a given time on a scope for defining appointments in a calendar.",
44
"example": {
55
"date": 1447869172,

zmsentities/schema/availability.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "An Availability is a representation of opening hours for a scope. It defines the time a scope offers appointments and a ticket printer is able to serve process numbers.",
44
"example": {
55
"bookable": {
@@ -40,7 +40,7 @@
4040
"additionalProperties": false,
4141
"properties": {
4242
"bookable": {
43-
"type": ["array", "object"],
43+
"type": "object",
4444
"properties": {
4545
"startInDays": {
4646
"type": ["string", "number", "null"],
@@ -84,14 +84,14 @@
8484
"description": "an appointment is allowed to take more than one time slot"
8585
},
8686
"processingNote": {
87-
"type": ["array", "object"],
87+
"type": "array",
8888
"items": {
8989
"type": "string",
9090
"description": "Non persistent note usable for processing or logging calculation results, usually used for debugging"
9191
}
9292
},
9393
"repeat": {
94-
"type": ["array", "object"],
94+
"type": "object",
9595
"properties": {
9696
"afterWeeks": {
9797
"type": "number",
@@ -129,7 +129,7 @@
129129
"description": "The following type are available\n* appointment - defines times for appointments\n* openinghours - defines times where a scope is opened\n* break - defines times for a break (not implemented yet)\n"
130130
},
131131
"weekday": {
132-
"type": ["array", "object"],
132+
"type": "object",
133133
"properties": {
134134
"monday": {
135135
"default": false,
@@ -183,7 +183,7 @@
183183
}
184184
},
185185
"workstationCount": {
186-
"type": ["array", "object"],
186+
"type": "object",
187187
"properties": {
188188
"callcenter": {
189189
"type": "number",

zmsentities/schema/calendar.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "Represents a calendar showing free days for appointments using a list of clusters, providers and scopes. Usually the list of clusters, providers are converted to a list of scopes. If all these lists are empty, the list of scopes is generated by available scopes for the given requests.",
44
"example": {
55
"days": [
@@ -99,13 +99,13 @@
9999
"description": "unix timestamp of a day representing the end of the bookable time. Paging after thise date should reveal no new appointments."
100100
},
101101
"clusters": {
102-
"type": ["array", "object"],
102+
"type": "array",
103103
"items": {
104104
"$ref": "cluster.json"
105105
}
106106
},
107107
"days": {
108-
"type": ["array", "object"],
108+
"type": "array",
109109
"description": "list of days containing appointments",
110110
"items": {
111111
"$ref": "day.json"
@@ -118,25 +118,25 @@
118118
"$ref": "day.json"
119119
},
120120
"providers": {
121-
"type": ["array", "object"],
121+
"type": "array",
122122
"items": {
123123
"$ref": "provider.json"
124124
}
125125
},
126126
"requests": {
127-
"type": ["array", "object"],
127+
"type": "array",
128128
"items": {
129129
"$ref": "request.json"
130130
}
131131
},
132132
"freeProcesses": {
133-
"type": ["array", "object"],
133+
"type": "array",
134134
"items": {
135135
"$ref": "process.json"
136136
}
137137
},
138138
"scopes": {
139-
"type": ["array", "object"],
139+
"type": "array",
140140
"items": {
141141
"$ref": "scope.json"
142142
}

zmsentities/schema/calldisplay.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "A calldisplay is a device to call people in a waiting room to a workstation. Usually it is a display on wall showing process ids together with a room number.\nThe clusters are resolved to fill the list of scopes. The text displayed on the calldisplay depends on the given scopes. If only one scope is present, a text can be displayed on the display. On multiple scopes, no text and no image is displayed.",
44
"example": {
55
"scopes": [
@@ -21,7 +21,7 @@
2121
"additionalProperties": false,
2222
"properties": {
2323
"image": {
24-
"type": ["array", "object"],
24+
"type": "object",
2525
"description": "A symbolic image for the scope",
2626
"properties": {
2727
"data": {
@@ -43,13 +43,13 @@
4343
"description": "unix timestamp of the server time to adjust the clock on the call display"
4444
},
4545
"clusters": {
46-
"type": ["array", "object"],
46+
"type": "array",
4747
"items": {
4848
"$ref": "cluster.json"
4949
}
5050
},
5151
"scopes": {
52-
"type": ["array", "object"],
52+
"type": "array",
5353
"items": {
5454
"$ref": "scope.json"
5555
}

zmsentities/schema/citizenapi/appointmentCancel.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "Includes a message indicating the result of a canceled appointment request.",
44
"properties": {
55
"message": {

zmsentities/schema/citizenapi/appointmentConfirm.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "Contains a message confirming the successful confirmation of an appointment.",
44
"properties": {
55
"message": {

zmsentities/schema/citizenapi/appointmentPreconfirm.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "Provides a message indicating the successful pre-confirmation of an appointment.",
44
"properties": {
55
"message": {

zmsentities/schema/citizenapi/appointmentReserve.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "Includes a message confirming that an appointment has been successfully reserved.",
44
"properties": {
55
"message": {

zmsentities/schema/citizenapi/appointmentUpdate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "Provides a message indicating the result of an appointment update operation.",
44
"properties": {
55
"message": {

zmsentities/schema/citizenapi/collections/officeList.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"type": ["array", "object", "null"],
33
"properties": {
44
"offices": {
5-
"type": ["array", "object"],
5+
"type": "array",
66
"items": {
77
"title": "Office",
88
"type": [

zmsentities/schema/citizenapi/collections/officeServiceAndRelationList.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"description": "Contains information about offices, services, and their relations. Includes details about each office, available services, and how they are related.",
88
"properties": {
99
"offices": {
10-
"type": ["array", "object"],
10+
"type": "array",
1111
"items": {
1212
"title": "Office",
1313
"type": [
@@ -110,7 +110,7 @@
110110
}
111111
},
112112
"services": {
113-
"type": ["array", "object"],
113+
"type": "array",
114114
"items": {
115115
"type": [
116116
"array",
@@ -119,7 +119,7 @@
119119
],
120120
"properties": {
121121
"services": {
122-
"type": ["array", "object"],
122+
"type": "array",
123123
"items": {
124124
"title": "Service",
125125
"type": [
@@ -190,7 +190,7 @@
190190
}
191191
},
192192
"relations": {
193-
"type": ["array", "object"],
193+
"type": "array",
194194
"items": {
195195
"title": "OfficeServiceRelation",
196196
"type": [

zmsentities/schema/citizenapi/collections/officeServiceRelationList.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"type": ["array", "object", "null"],
33
"properties": {
44
"relations": {
5-
"type": ["array", "object"],
5+
"type": "array",
66
"items": {
77
"title": "OfficeServiceRelation",
88
"type": ["array", "object", "null"],

zmsentities/schema/citizenapi/collections/serviceList.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"type": ["array", "object", "null"],
33
"properties": {
44
"services": {
5-
"type": ["array", "object"],
5+
"type": "array",
66
"items": {
77
"title": "Service",
88
"type": [

zmsentities/schema/citizenapi/collections/thinnedScopeList.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"type": ["array", "object", "null"],
33
"properties": {
44
"scopes": {
5-
"type": ["array", "object"],
5+
"type": "array",
66
"items": {
7-
"type": ["array", "object"],
7+
"type": "object",
88
"properties": {
99
"id": {
1010
"type": "number"
1111
},
1212
"provider": {
13-
"type": ["array", "object"],
13+
"type": "object",
1414
"properties": {
1515
"id": {
1616
"type": "number"

zmsentities/schema/citizenapi/office.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title": "Office",
3-
"type": ["array", "object"],,
3+
"type": ["array", "object"],
44
"properties": {
55
"id": {
66
"type": "integer",

zmsentities/schema/citizenapi/processFreeSlots.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "ProcessFreeSlots",
33
"description": "Defines a list of free appointment timestamps returned by processFreeSlots method.",
4-
"type": ["array", "object"],,
4+
"type": ["array", "object"],
55
"properties": {
66
"appointmentTimestamps": {
77
"type": ["array", "null"],

zmsentities/schema/client.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "A client is usually a customer in a scope who intends to get his request solved. Usually the client has an appointment, if not he got a process number from a ticket printer and his familyName is set to 'Spontankunde'.",
44
"example": {
55
"familyName": "Max Mustermann",

zmsentities/schema/cluster.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "A cluster is a way to group different scopes.",
44
"example": {
55
"callDisplayText": "Herzlich Willkommen,\nDie aufgerufenen Plätze finden Sie den im Gang rechts.",
@@ -35,7 +35,7 @@
3535
"description": "name for internal usage"
3636
},
3737
"scopes": {
38-
"type": ["array", "object"],
38+
"type": "array",
3939
"items": {
4040
"$ref": "scope.json"
4141
}

zmsentities/schema/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "main config data",
44
"example": {
55
"appointments": {
@@ -20,7 +20,7 @@
2020
}
2121
},
2222
"emergency": {
23-
"type": ["array", "object"],
23+
"type": "object",
2424
"description": "Depending on scope settings, a workstation might have an emergency-button to call for help",
2525
"properties": {
2626
"refreshInterval": {

zmsentities/schema/contact.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "A contact is a collection of contact informations to find or to contact a natural person or an entity.",
3-
"type": ["array", "object"],
3+
"type": "object",
44
"example": {
55
"city": "Schönefeld",
66
"country": "Germany",

zmsentities/schema/day.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "Representation of a day in the calendar. You might find curious values in freeAppointments. While callcenter and public values might be positive, the intern value can be negative. This is due to calculation. The public and callcenter values are calculated per slot whereas the intern value is calculated for the whole day/all summed scopes. If the intern value is lower 0 and beyond, some slots might be booked with more clients than available. This might be due to changes in the availability settings.",
44
"example": {
55
"year": 2015,
@@ -56,7 +56,7 @@
5656
"$ref": "slot.json"
5757
},
5858
"processList": {
59-
"type": ["array", "object"],
59+
"type": "array",
6060
"description": "list of processes, only available if status is detail",
6161
"items": {
6262
"$ref": "process.json"

zmsentities/schema/dayoff.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": ["array", "object"],
2+
"type": "object",
33
"description": "A dayoff is a free day where a department and its scopes are closed. Beware, if an availability is valid only for one day, it overrules a dayoff, so you can administrate exceptions on a particular scope.",
44
"example": {
55
"id" : 1234,

0 commit comments

Comments
 (0)