Skip to content
Snippets Groups Projects
Commit dc53959d authored by David Trattnig's avatar David Trattnig
Browse files

refact: read camelCase props from Steering API

parent 00946568
No related branches found
No related tags found
1 merge request!22CamelCase API
Hide whitespace changes
Inline Side-by-side
schemas/openapi-steering.json
+ 14
− 14
View file @ dc53959d
...@@ -25,55 +25,55 @@ ...@@ -25,55 +25,55 @@
"title": { "title": {
"type": "integer" "type": "integer"
}, },
"schedule_id": { "scheduleId": {
"type": "integer" "type": "integer"
}, },
"is_repetition": { "isRepetition": {
"type": "boolean", "type": "boolean",
"nullable": true "nullable": true
}, },
"playlist_id": { "playlistId": {
"type": "integer", "type": "integer",
"nullable": true "nullable": true
}, },
"schedule_default_playlist_id": { "scheduleDefaultPlaylistId": {
"type": "integer", "type": "integer",
"nullable": true "nullable": true
}, },
"show_default_playlist_id": { "showDefaultPlaylistId": {
"type": "integer", "type": "integer",
"nullable": true "nullable": true
}, },
"show_id": { "showId": {
"type": "integer" "type": "integer"
}, },
"show_name": { "showName": {
"type": "string" "type": "string"
}, },
"show_hosts": { "showHosts": {
"type": "string" "type": "string"
}, },
"show_type": { "showType": {
"type": "string", "type": "string",
"nullable": true "nullable": true
}, },
"show_categories": { "showCategories": {
"type": "string", "type": "string",
"nullable": true "nullable": true
}, },
"show_topics": { "showTopics": {
"type": "string", "type": "string",
"nullable": true "nullable": true
}, },
"show_musicfocus": { "showMusicfocus": {
"type": "string", "type": "string",
"nullable": true "nullable": true
}, },
"show_languages": { "showLanguages": {
"type": "string", "type": "string",
"nullable": true "nullable": true
}, },
"show_fundingcategory": { "showFundingcategory": {
"type": "string", "type": "string",
"nullable": true "nullable": true
}, },
......
src/aura_engine/scheduling/api.py
+ 4
− 4
View file @ dc53959d
...@@ -41,10 +41,10 @@ class ApiFetcher(threading.Thread): ...@@ -41,10 +41,10 @@ class ApiFetcher(threading.Thread):
""" """
API_TIMESLOT_ID = "id" API_TIMESLOT_ID = "id"
API_PLID_PLAYLIST = "playlist_id" API_PLID_PLAYLIST = "playlistId"
API_PLID_SCHEDULE = "schedule_default_playlist_id" API_PLID_SCHEDULE = "scheduleDefaultPlaylistId"
API_PLID_SHOW = "show_default_playlist_id" API_PLID_SHOW = "showDefaultPlaylistId"
MODEL_TIMESLOT_ID = "timeslot_id" MODEL_TIMESLOT_ID = "timeslotId"
MODEL_PLID_PLAYLIST = "playlist_id" MODEL_PLID_PLAYLIST = "playlist_id"
MODEL_PLID_SCHEDULE = "default_schedule_playlist_id" MODEL_PLID_SCHEDULE = "default_schedule_playlist_id"
MODEL_PLID_SHOW = "default_show_playlist_id" MODEL_PLID_SHOW = "default_show_playlist_id"
......
src/aura_engine/scheduling/programme.py
+ 16
− 16
View file @ dc53959d
...@@ -321,7 +321,7 @@ class ProgrammeStore: ...@@ -321,7 +321,7 @@ class ProgrammeStore:
# Filter the local timeslot from the fetched ones # Filter the local timeslot from the fetched ones
existing_remotely = list( existing_remotely = list(
filter( filter(
lambda new_timeslot: new_timeslot["timeslot_id"] lambda new_timeslot: new_timeslot["timeslotId"]
== local_timeslot.timeslot_id, == local_timeslot.timeslot_id,
fetched_timeslots, fetched_timeslots,
) )
...@@ -362,26 +362,26 @@ class ProgrammeStore: ...@@ -362,26 +362,26 @@ class ProgrammeStore:
timeslot_db = Timeslot() timeslot_db = Timeslot()
havetoadd = True havetoadd = True
timeslot_db.show_id = timeslot["show_id"] timeslot_db.show_id = timeslot["showId"]
timeslot_db.timeslot_id = timeslot["timeslot_id"] timeslot_db.timeslot_id = timeslot["timeslotId"]
timeslot_db.timeslot_start = SU.to_datetime(timeslot["start"]) timeslot_db.timeslot_start = SU.to_datetime(timeslot["start"])
timeslot_db.timeslot_end = SU.to_datetime(timeslot["end"]) timeslot_db.timeslot_end = SU.to_datetime(timeslot["end"])
timeslot_db.show_name = timeslot["show_name"] timeslot_db.show_name = timeslot["showName"]
timeslot_db.show_hosts = timeslot["show_hosts"] timeslot_db.show_hosts = timeslot["showHosts"]
timeslot_db.is_repetition = timeslot["is_repetition"] timeslot_db.is_repetition = timeslot["isRepetition"]
timeslot_db.funding_category = timeslot["show_fundingcategory"] timeslot_db.funding_category = timeslot["showFundingcategory"]
timeslot_db.languages = timeslot["show_languages"] timeslot_db.languages = timeslot["showLanguages"]
timeslot_db.type = timeslot["show_type"] timeslot_db.type = timeslot["showType"]
timeslot_db.category = timeslot["show_categories"] timeslot_db.category = timeslot["showCategories"]
timeslot_db.topic = timeslot["show_topics"] timeslot_db.topic = timeslot["showTopics"]
timeslot_db.musicfocus = timeslot["show_musicfocus"] timeslot_db.musicfocus = timeslot["showMusicfocus"]
timeslot_db.playlist_id = timeslot["playlist_id"] timeslot_db.playlist_id = timeslot["playlistId"]
# Optional API properties # Optional API properties
if "default_schedule_playlist_id" in timeslot: if "default_schedule_playlistId" in timeslot:
timeslot_db.default_schedule_playlist_id = timeslot["default_schedule_playlist_id"] timeslot_db.default_schedule_playlist_id = timeslot["defaultSchedulePlaylistId"]
if "default_show_playlist_id" in timeslot: if "default_show_playlist_id" in timeslot:
timeslot_db.default_show_playlist_id = timeslot["default_show_playlist_id"] timeslot_db.default_show_playlist_id = timeslot["defaultShowPlaylistId"]
msg = f"Store/Update TIMESLOT havetoadd={havetoadd} - data: {timeslot}" msg = f"Store/Update TIMESLOT havetoadd={havetoadd} - data: {timeslot}"
self.logger.debug(SU.pink(msg)) self.logger.debug(SU.pink(msg))
......
src/aura_steering_api/models/timeslot.py
+ 28
− 28
View file @ dc53959d
...@@ -97,33 +97,33 @@ class Timeslot: ...@@ -97,33 +97,33 @@ class Timeslot:
if title is not UNSET: if title is not UNSET:
field_dict["title"] = title field_dict["title"] = title
if schedule_id is not UNSET: if schedule_id is not UNSET:
field_dict["schedule_id"] = schedule_id field_dict["scheduleId"] = schedule_id
if is_repetition is not UNSET: if is_repetition is not UNSET:
field_dict["is_repetition"] = is_repetition field_dict["isRepetition"] = is_repetition
if playlist_id is not UNSET: if playlist_id is not UNSET:
field_dict["playlist_id"] = playlist_id field_dict["playlistId"] = playlist_id
if schedule_default_playlist_id is not UNSET: if schedule_default_playlist_id is not UNSET:
field_dict["schedule_default_playlist_id"] = schedule_default_playlist_id field_dict["scheduleDefaultPlaylistId"] = schedule_default_playlist_id
if show_default_playlist_id is not UNSET: if show_default_playlist_id is not UNSET:
field_dict["show_default_playlist_id"] = show_default_playlist_id field_dict["showDefaultPlaylistId"] = show_default_playlist_id
if show_id is not UNSET: if show_id is not UNSET:
field_dict["show_id"] = show_id field_dict["showId"] = show_id
if show_name is not UNSET: if show_name is not UNSET:
field_dict["show_name"] = show_name field_dict["showName"] = show_name
if show_hosts is not UNSET: if show_hosts is not UNSET:
field_dict["show_hosts"] = show_hosts field_dict["showHosts"] = show_hosts
if show_type is not UNSET: if show_type is not UNSET:
field_dict["show_type"] = show_type field_dict["showType"] = show_type
if show_categories is not UNSET: if show_categories is not UNSET:
field_dict["show_categories"] = show_categories field_dict["showCategories"] = show_categories
if show_topics is not UNSET: if show_topics is not UNSET:
field_dict["show_topics"] = show_topics field_dict["showTopics"] = show_topics
if show_musicfocus is not UNSET: if show_musicfocus is not UNSET:
field_dict["show_musicfocus"] = show_musicfocus field_dict["showMusicfocus"] = show_musicfocus
if show_languages is not UNSET: if show_languages is not UNSET:
field_dict["show_languages"] = show_languages field_dict["showLanguages"] = show_languages
if show_fundingcategory is not UNSET: if show_fundingcategory is not UNSET:
field_dict["show_fundingcategory"] = show_fundingcategory field_dict["showFundingcategory"] = show_fundingcategory
if memo is not UNSET: if memo is not UNSET:
field_dict["memo"] = memo field_dict["memo"] = memo
if class_name is not UNSET: if class_name is not UNSET:
...@@ -152,33 +152,33 @@ class Timeslot: ...@@ -152,33 +152,33 @@ class Timeslot:
title = d.pop("title", UNSET) title = d.pop("title", UNSET)
schedule_id = d.pop("schedule_id", UNSET) schedule_id = d.pop("scheduleId", UNSET)
is_repetition = d.pop("is_repetition", UNSET) is_repetition = d.pop("isRepetition", UNSET)
playlist_id = d.pop("playlist_id", UNSET) playlist_id = d.pop("playlistId", UNSET)
schedule_default_playlist_id = d.pop("schedule_default_playlist_id", UNSET) schedule_default_playlist_id = d.pop("scheduleDefaultPlaylistId", UNSET)
show_default_playlist_id = d.pop("show_default_playlist_id", UNSET) show_default_playlist_id = d.pop("showDefaultPlaylistId", UNSET)
show_id = d.pop("show_id", UNSET) show_id = d.pop("showId", UNSET)
show_name = d.pop("show_name", UNSET) show_name = d.pop("showName", UNSET)
show_hosts = d.pop("show_hosts", UNSET) show_hosts = d.pop("showHosts", UNSET)
show_type = d.pop("show_type", UNSET) show_type = d.pop("showType", UNSET)
show_categories = d.pop("show_categories", UNSET) show_categories = d.pop("showCategories", UNSET)
show_topics = d.pop("show_topics", UNSET) show_topics = d.pop("showTopics", UNSET)
show_musicfocus = d.pop("show_musicfocus", UNSET) show_musicfocus = d.pop("showMusicfocus", UNSET)
show_languages = d.pop("show_languages", UNSET) show_languages = d.pop("showLanguages", UNSET)
show_fundingcategory = d.pop("show_fundingcategory", UNSET) show_fundingcategory = d.pop("showFundingcategory", UNSET)
memo = d.pop("memo", UNSET) memo = d.pop("memo", UNSET)
......
tests/json/steering-api-v1-playout.json
+ 42
− 42
View file @ dc53959d
...@@ -4,20 +4,20 @@ ...@@ -4,20 +4,20 @@
"start":"2023-05-16T10:06:00", "start":"2023-05-16T10:06:00",
"end":"2023-05-16T10:10:00", "end":"2023-05-16T10:10:00",
"title":"Pepi's Polka", "title":"Pepi's Polka",
"schedule_id":17, "scheduleId":17,
"is_repetition":false, "isRepetition":false,
"playlist_id":1, "playlistId":1,
"schedule_default_playlist_id":null, "scheduleDefaultPlaylistId":null,
"show_default_playlist_id":null, "showDefaultPlaylistId":null,
"show_id":1, "showId":1,
"show_name":"Musikprogramm", "showName":"Musikprogramm",
"show_hosts":"Musikredaktion", "showHosts":"Musikredaktion",
"show_type":"Unmoderiertes Musikprogramm", "showType":"Unmoderiertes Musikprogramm",
"show_categories":"", "showCategories":"",
"show_topics":"", "showTopics":"",
"show_musicfocus":"", "showMusicfocus":"",
"show_languages":"", "showLanguages":"",
"show_fundingcategory":"Standard", "showFundingcategory":"Standard",
"memo":"", "memo":"",
"className":"default" "className":"default"
}, },
...@@ -26,20 +26,20 @@ ...@@ -26,20 +26,20 @@
"start":"2023-05-16T13:00:00", "start":"2023-05-16T13:00:00",
"end":"2023-05-16T13:05:00", "end":"2023-05-16T13:05:00",
"title":"Wurlitzer", "title":"Wurlitzer",
"schedule_id":18, "scheduleId":18,
"is_repetition":false, "isRepetition":false,
"playlist_id":1, "playlistId":1,
"schedule_default_playlist_id":1, "scheduleDefaultPlaylistId":1,
"show_default_playlist_id":1, "showDefaultPlaylistId":1,
"show_id":1, "showId":1,
"show_name":"Musikprogramm", "showName":"Musikprogramm",
"show_hosts":"Musikredaktion", "showHosts":"Musikredaktion",
"show_type":"Unmoderiertes Musikprogramm", "showType":"Unmoderiertes Musikprogramm",
"show_categories":"", "showCategories":"",
"show_topics":"", "showTopics":"",
"show_musicfocus":"", "showMusicfocus":"",
"show_languages":"", "showLanguages":"",
"show_fundingcategory":"Standard", "showFundingcategory":"Standard",
"memo":"", "memo":"",
"className":"default" "className":"default"
}, },
...@@ -48,20 +48,20 @@ ...@@ -48,20 +48,20 @@
"start":"2023-05-16T15:00:00", "start":"2023-05-16T15:00:00",
"end":"2023-05-16T15:05:00", "end":"2023-05-16T15:05:00",
"title":"Pepi's Polka II", "title":"Pepi's Polka II",
"schedule_id":19, "scheduleId":19,
"is_repetition":false, "isRepetition":false,
"playlist_id":1, "playlistId":1,
"schedule_default_playlist_id":1, "scheduleDefaultPlaylistId":1,
"show_default_playlist_id":1, "showDefaultPlaylistId":1,
"show_id":1, "showId":1,
"show_name":"Musikprogramm", "showName":"Musikprogramm",
"show_hosts":"Musikredaktion", "showHosts":"Musikredaktion",
"show_type":"Unmoderiertes Musikprogramm", "showType":"Unmoderiertes Musikprogramm",
"show_categories":"", "showCategories":"",
"show_topics":"", "showTopics":"",
"show_musicfocus":"", "showMusicfocus":"",
"show_languages":"", "showLanguages":"",
"show_fundingcategory":"Standard", "showFundingcategory":"Standard",
"memo":"", "memo":"",
"className":"default" "className":"default"
} }
......
tests/test_scheduling_api_fetcher.py
+ 4
− 4
View file @ dc53959d
...@@ -102,8 +102,8 @@ class TestSchedulingApiFetcher(unittest.TestCase): ...@@ -102,8 +102,8 @@ class TestSchedulingApiFetcher(unittest.TestCase):
# Test Timeslot 1 # Test Timeslot 1
ts1 = response[0] ts1 = response[0]
self.assertEqual(1, ts1["show_id"]) self.assertEqual(1, ts1["showId"])
self.assertEqual("Musikprogramm", ts1["show_name"]) self.assertEqual("Musikprogramm", ts1["showName"])
self.assertEqual("Wurlitzer", ts1["title"]) self.assertEqual("Wurlitzer", ts1["title"])
self.assertEqual(1, ts1["playlist_id"]) self.assertEqual(1, ts1["playlist_id"])
self.assertEqual(1, ts1["playlist"]["id"]) self.assertEqual(1, ts1["playlist"]["id"])
...@@ -113,8 +113,8 @@ class TestSchedulingApiFetcher(unittest.TestCase): ...@@ -113,8 +113,8 @@ class TestSchedulingApiFetcher(unittest.TestCase):
# Test Timeslot 2 # Test Timeslot 2
ts2 = response[1] ts2 = response[1]
self.assertEqual(1, ts2["show_id"]) self.assertEqual(1, ts2["showId"])
self.assertEqual("Musikprogramm", ts2["show_name"]) self.assertEqual("Musikprogramm", ts2["showName"])
self.assertEqual("Pepi's Polka II", ts2["title"]) self.assertEqual("Pepi's Polka II", ts2["title"])
self.assertEqual(1, ts2["playlist_id"]) self.assertEqual(1, ts2["playlist_id"])
self.assertEqual(1, ts2["playlist"]["id"]) self.assertEqual(1, ts2["playlist"]["id"])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment