diff --git a/src/divera247/models/alarm.py b/src/divera247/models/alarm.py index 97237a2..a74f61b 100644 --- a/src/divera247/models/alarm.py +++ b/src/divera247/models/alarm.py @@ -295,7 +295,7 @@ class AlarmResult(BaseModel): default=None, description='Im Archiv, nur noch für Schreibberechtigte zugänglich', ) - ucr_adressed: Sequence[int] | None = Field( + ucr_addressed: Sequence[int] | None = Field( default=None, description='Adressierte Benutzer', ) @@ -358,10 +358,6 @@ class AlarmResult(BaseModel): default=None, description="Einsatzdauer (z.B. '35 Minuten')", ) - ucr_addressed: Sequence[int] | None = Field( - default=None, - description='Adressierte Benutzer (API spelling)', - ) ucr_answeredcount: Mapping[str, int] | None = Field( default=None, description='Anzahl Rückmeldungen pro Status (status_id -> count)', diff --git a/tests/alarm/get_alarms_id_response.json b/tests/alarm/get_alarms_id_response.json index 493933c..3f84f87 100644 --- a/tests/alarm/get_alarms_id_response.json +++ b/tests/alarm/get_alarms_id_response.json @@ -57,9 +57,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": {}, "ucr_self_addressed": true, "ucr_self_status_id": 0, @@ -83,6 +80,9 @@ "title": "Anruferweg", "value": "Call to 19222" } + ], + "ucr_addressed": [ + 0 ] }, "ucr": 0 diff --git a/tests/alarm/get_alarms_list_response.json b/tests/alarm/get_alarms_list_response.json index 5e397b4..fe3d4fc 100644 --- a/tests/alarm/get_alarms_list_response.json +++ b/tests/alarm/get_alarms_list_response.json @@ -58,9 +58,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": {}, "ucr_self_addressed": true, "ucr_self_status_id": 0, @@ -84,6 +81,9 @@ "title": "Anruferweg", "value": "Call to 19222" } + ], + "ucr_addressed": [ + 0 ] } ], diff --git a/tests/alarm/get_alarms_response.json b/tests/alarm/get_alarms_response.json index dfe26ae..243e2bb 100644 --- a/tests/alarm/get_alarms_response.json +++ b/tests/alarm/get_alarms_response.json @@ -59,9 +59,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": {}, "ucr_self_addressed": true, "ucr_self_status_id": 0, @@ -85,6 +82,9 @@ "title": "Anruferweg", "value": "Call to 19222" } + ], + "ucr_addressed": [ + 0 ] }, "additionalProp2": { @@ -144,9 +144,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": {}, "ucr_self_addressed": true, "ucr_self_status_id": 0, @@ -170,6 +167,9 @@ "title": "Anruferweg", "value": "Call to 19222" } + ], + "ucr_addressed": [ + 0 ] }, "additionalProp3": { @@ -229,9 +229,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": {}, "ucr_self_addressed": true, "ucr_self_status_id": 0, @@ -255,6 +252,9 @@ "title": "Anruferweg", "value": "Call to 19222" } + ], + "ucr_addressed": [ + 0 ] } }, diff --git a/tests/alarm/post_alarms_response.json b/tests/alarm/post_alarms_response.json index 3815a24..927e89d 100644 --- a/tests/alarm/post_alarms_response.json +++ b/tests/alarm/post_alarms_response.json @@ -57,9 +57,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": {}, "ucr_self_addressed": true, "ucr_self_status_id": 0, @@ -83,6 +80,9 @@ "title": "Anruferweg", "value": "Call to 19222" } + ], + "ucr_addressed": [ + 0 ] } } diff --git a/tests/alarm/put_alarms_id_response.json b/tests/alarm/put_alarms_id_response.json index 493933c..3f84f87 100644 --- a/tests/alarm/put_alarms_id_response.json +++ b/tests/alarm/put_alarms_id_response.json @@ -57,9 +57,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": {}, "ucr_self_addressed": true, "ucr_self_status_id": 0, @@ -83,6 +80,9 @@ "title": "Anruferweg", "value": "Call to 19222" } + ], + "ucr_addressed": [ + 0 ] }, "ucr": 0 diff --git a/tests/event/get_events_id_response.json b/tests/event/get_events_id_response.json index ab38892..d5e3511 100644 --- a/tests/event/get_events_id_response.json +++ b/tests/event/get_events_id_response.json @@ -47,9 +47,6 @@ "access_names": true, "participation": true, "note": "bin dabei!", - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -57,7 +54,10 @@ "count_recipients": 0, "count_read": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] }, "ucr": 0 -} \ No newline at end of file +} diff --git a/tests/event/get_events_response.json b/tests/event/get_events_response.json index 1f10fd4..89c960e 100644 --- a/tests/event/get_events_response.json +++ b/tests/event/get_events_response.json @@ -49,9 +49,6 @@ "access_names": true, "participation": true, "note": "bin dabei!", - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -59,7 +56,10 @@ "count_recipients": 0, "count_read": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] }, "additionalProp2": { "id": 123, @@ -108,9 +108,6 @@ "access_names": true, "participation": true, "note": "bin dabei!", - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -118,7 +115,10 @@ "count_recipients": 0, "count_read": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] }, "additionalProp3": { "id": 123, @@ -167,9 +167,6 @@ "access_names": true, "participation": true, "note": "bin dabei!", - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -177,7 +174,10 @@ "count_recipients": 0, "count_read": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] } }, "sorting": [ @@ -185,4 +185,4 @@ ] }, "ucr": 0 -} \ No newline at end of file +} diff --git a/tests/event/post_events_response.json b/tests/event/post_events_response.json index 0884d44..0ccd148 100644 --- a/tests/event/post_events_response.json +++ b/tests/event/post_events_response.json @@ -47,9 +47,6 @@ "access_names": true, "participation": true, "note": "bin dabei!", - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -57,6 +54,9 @@ "count_recipients": 0, "count_read": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] } -} \ No newline at end of file +} diff --git a/tests/event/put_events_id_response.json b/tests/event/put_events_id_response.json index 0884d44..0ccd148 100644 --- a/tests/event/put_events_id_response.json +++ b/tests/event/put_events_id_response.json @@ -47,9 +47,6 @@ "access_names": true, "participation": true, "note": "bin dabei!", - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -57,6 +54,9 @@ "count_recipients": 0, "count_read": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] } -} \ No newline at end of file +} diff --git a/tests/news/get_news_id_response.json b/tests/news/get_news_id_response.json index 9752b31..b029e1f 100644 --- a/tests/news/get_news_id_response.json +++ b/tests/news/get_news_id_response.json @@ -66,9 +66,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -79,7 +76,10 @@ "archive": true, "ts_archive": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] }, "ucr": 0 } diff --git a/tests/news/get_news_response.json b/tests/news/get_news_response.json index 949fc94..21303b8 100644 --- a/tests/news/get_news_response.json +++ b/tests/news/get_news_response.json @@ -68,9 +68,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -81,7 +78,10 @@ "archive": true, "ts_archive": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] }, "additionalProp2": { "id": 123, @@ -149,9 +149,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -162,7 +159,10 @@ "archive": true, "ts_archive": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] }, "additionalProp3": { "id": 123, @@ -230,9 +230,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -243,7 +240,10 @@ "archive": true, "ts_archive": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] } }, "sorting": [ diff --git a/tests/news/post_news_response.json b/tests/news/post_news_response.json index 764ddb5..14d7504 100644 --- a/tests/news/post_news_response.json +++ b/tests/news/post_news_response.json @@ -66,9 +66,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -79,6 +76,9 @@ "archive": true, "ts_archive": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] } } diff --git a/tests/news/put_news_id_response.json b/tests/news/put_news_id_response.json index 764ddb5..14d7504 100644 --- a/tests/news/put_news_id_response.json +++ b/tests/news/put_news_id_response.json @@ -66,9 +66,6 @@ "answerable": true, "hidden": true, "deleted": true, - "ucr_adressed": [ - 0 - ], "ucr_answered": [ 0 ], @@ -79,6 +76,9 @@ "archive": true, "ts_archive": 0, "ts_create": 0, - "ts_update": 0 + "ts_update": 0, + "ucr_addressed": [ + 0 + ] } }