Skip to content

Commit 9c67773

Browse files
dapolachdapolach
committed
Merge remote-tracking branch 'origin/feature/api-spec-first' into feature/api-spec-first
2 parents cee248e + 91a4fb8 commit 9c67773

17 files changed

Lines changed: 807 additions & 249 deletions

File tree

‎docs/openapi/klabis-full.json‎

Lines changed: 134 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,22 @@
291291
"type": "string"
292292
}
293293
},
294+
"TransactionSortParam": {
295+
"description": "Sorting criteria in the format: property,(asc|desc). Allowed fields: occurredAt,\nrecordedAt, amount, type.\n",
296+
"in": "query",
297+
"name": "sort",
298+
"required": false,
299+
"schema": {
300+
"default": [
301+
"occurredAt",
302+
"DESC"
303+
],
304+
"items": {
305+
"type": "string"
306+
},
307+
"type": "array"
308+
}
309+
},
294310
"TxIdParam": {
295311
"description": "Transaction UUID",
296312
"in": "path",
@@ -379,42 +395,60 @@
379395
"description": "Fields not recorded for a member are returned as null.",
380396
"properties": {
381397
"addressCity": {
382-
"nullable": true,
383-
"type": "string"
398+
"type": [
399+
"string",
400+
"null"
401+
]
384402
},
385403
"addressCountry": {
386-
"nullable": true,
387-
"type": "string"
404+
"type": [
405+
"string",
406+
"null"
407+
]
388408
},
389409
"addressPostalCode": {
390-
"nullable": true,
391-
"type": "string"
410+
"type": [
411+
"string",
412+
"null"
413+
]
392414
},
393415
"addressStreet": {
394-
"nullable": true,
395-
"type": "string"
416+
"type": [
417+
"string",
418+
"null"
419+
]
396420
},
397421
"dateOfBirth": {
398422
"format": "date",
399-
"nullable": true,
400-
"type": "string"
423+
"type": [
424+
"string",
425+
"null"
426+
]
401427
},
402428
"firstName": {
403-
"nullable": true,
404-
"type": "string"
429+
"type": [
430+
"string",
431+
"null"
432+
]
405433
},
406434
"identityCardNumber": {
407-
"nullable": true,
408-
"type": "string"
435+
"type": [
436+
"string",
437+
"null"
438+
]
409439
},
410440
"identityCardValidityDate": {
411441
"format": "date",
412-
"nullable": true,
413-
"type": "string"
442+
"type": [
443+
"string",
444+
"null"
445+
]
414446
},
415447
"lastName": {
416-
"nullable": true,
417-
"type": "string"
448+
"type": [
449+
"string",
450+
"null"
451+
]
418452
}
419453
},
420454
"type": "object"
@@ -2283,16 +2317,22 @@
22832317
"properties": {
22842318
"date": {
22852319
"format": "date",
2286-
"nullable": true,
2287-
"type": "string"
2320+
"type": [
2321+
"string",
2322+
"null"
2323+
]
22882324
},
22892325
"error": {
2290-
"nullable": true,
2291-
"type": "string"
2326+
"type": [
2327+
"string",
2328+
"null"
2329+
]
22922330
},
22932331
"name": {
2294-
"nullable": true,
2295-
"type": "string"
2332+
"type": [
2333+
"string",
2334+
"null"
2335+
]
22962336
},
22972337
"orisId": {
22982338
"format": "int32",
@@ -2385,8 +2425,10 @@
23852425
"EventSyncEntry": {
23862426
"properties": {
23872427
"error": {
2388-
"nullable": true,
2389-
"type": "string"
2428+
"type": [
2429+
"string",
2430+
"null"
2431+
]
23902432
},
23912433
"eventId": {
23922434
"format": "uuid",
@@ -2510,8 +2552,10 @@
25102552
"properties": {
25112553
"deadlineProcessedAt": {
25122554
"format": "date-time",
2513-
"nullable": true,
2514-
"type": "string"
2555+
"type": [
2556+
"string",
2557+
"null"
2558+
]
25152559
},
25162560
"id": {
25172561
"format": "uuid",
@@ -2780,13 +2824,17 @@
27802824
"properties": {
27812825
"lastSetAt": {
27822826
"format": "date-time",
2783-
"nullable": true,
2784-
"type": "string",
2827+
"type": [
2828+
"string",
2829+
"null"
2830+
],
27852831
"x-klabis-halforms-access": "READ_ONLY"
27862832
},
27872833
"url": {
2788-
"nullable": true,
2789-
"type": "string",
2834+
"type": [
2835+
"string",
2836+
"null"
2837+
],
27902838
"x-klabis-halforms-access": "READ_ONLY"
27912839
}
27922840
},
@@ -3065,17 +3113,21 @@
30653113
"properties": {
30663114
"currentGroupId": {
30673115
"format": "uuid",
3068-
"nullable": true,
3069-
"type": "string"
3116+
"type": [
3117+
"string",
3118+
"null"
3119+
]
30703120
},
30713121
"memberId": {
30723122
"format": "uuid",
30733123
"type": "string"
30743124
},
30753125
"recommendedLevelId": {
30763126
"format": "uuid",
3077-
"nullable": true,
3078-
"type": "string"
3127+
"type": [
3128+
"string",
3129+
"null"
3130+
]
30793131
},
30803132
"year": {
30813133
"format": "int32",
@@ -3100,17 +3152,21 @@
31003152
"description": "A member's current fee level summary for a year.",
31013153
"properties": {
31023154
"currentGroup": {
3103-
"allOf": [
3155+
"oneOf": [
31043156
{
31053157
"$ref": "#/components/schemas/CurrentGroupResponse"
3158+
},
3159+
{
3160+
"type": "null"
31063161
}
3107-
],
3108-
"nullable": true
3162+
]
31093163
},
31103164
"recommendedLevelId": {
31113165
"format": "uuid",
3112-
"nullable": true,
3113-
"type": "string"
3166+
"type": [
3167+
"string",
3168+
"null"
3169+
]
31143170
},
31153171
"votingOpen": {
31163172
"type": "boolean"
@@ -3122,24 +3178,30 @@
31223178
"description": "A member's assignment to a fee group.",
31233179
"properties": {
31243180
"firstName": {
3125-
"nullable": true,
3126-
"type": "string"
3181+
"type": [
3182+
"string",
3183+
"null"
3184+
]
31273185
},
31283186
"joinedAt": {
31293187
"format": "date",
31303188
"type": "string"
31313189
},
31323190
"lastName": {
3133-
"nullable": true,
3134-
"type": "string"
3191+
"type": [
3192+
"string",
3193+
"null"
3194+
]
31353195
},
31363196
"memberId": {
31373197
"format": "uuid",
31383198
"type": "string"
31393199
},
31403200
"registrationNumber": {
3141-
"nullable": true,
3142-
"type": "string"
3201+
"type": [
3202+
"string",
3203+
"null"
3204+
]
31433205
},
31443206
"source": {
31453207
"enum": [
@@ -3316,15 +3378,19 @@
33163378
"type": "integer"
33173379
},
33183380
"location": {
3319-
"nullable": true,
3320-
"type": "string"
3381+
"type": [
3382+
"string",
3383+
"null"
3384+
]
33213385
},
33223386
"name": {
33233387
"type": "string"
33243388
},
33253389
"organizer": {
3326-
"nullable": true,
3327-
"type": "string"
3390+
"type": [
3391+
"string",
3392+
"null"
3393+
]
33283394
}
33293395
},
33303396
"type": "object"
@@ -3498,17 +3564,23 @@
34983564
"type": "string"
34993565
},
35003566
"fixedAmount": {
3501-
"nullable": true,
3502-
"type": "number"
3567+
"type": [
3568+
"number",
3569+
"null"
3570+
]
35033571
},
35043572
"fixedCurrency": {
3505-
"nullable": true,
3506-
"type": "string"
3573+
"type": [
3574+
"string",
3575+
"null"
3576+
]
35073577
},
35083578
"percentage": {
35093579
"format": "int32",
3510-
"nullable": true,
3511-
"type": "integer"
3580+
"type": [
3581+
"integer",
3582+
"null"
3583+
]
35123584
},
35133585
"rankingShortName": {
35143586
"type": "string"
@@ -3759,8 +3831,10 @@
37593831
},
37603832
"registeredAt": {
37613833
"format": "date-time",
3762-
"nullable": true,
3763-
"type": "string",
3834+
"type": [
3835+
"string",
3836+
"null"
3837+
],
37643838
"x-klabis-halforms-access": "READ_ONLY"
37653839
},
37663840
"siCardNumber": {
@@ -9318,7 +9392,7 @@
93189392
"$ref": "#/components/parameters/SizeParam"
93199393
},
93209394
{
9321-
"$ref": "#/components/parameters/SortParam"
9395+
"$ref": "#/components/parameters/TransactionSortParam"
93229396
},
93239397
{
93249398
"description": "Only include transactions occurred on or after this date",

0 commit comments

Comments
 (0)