Skip to content
Snippets Groups Projects
Verified Commit a31d4567 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Include attendees when converting meeting to dict

Fix a few bugs on the move
parent bd2446a4
No related branches found
No related tags found
No related merge requests found
Pipeline #2411 passed with warnings
...@@ -6,7 +6,7 @@ from dataclasses import dataclass ...@@ -6,7 +6,7 @@ from dataclasses import dataclass
from enum import Enum from enum import Enum
from typing import Optional from typing import Optional
from .util import camel_to_snake, to_field_type from .util import camel_to_snake, snake_to_camel, to_field_type
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
...@@ -110,7 +110,7 @@ class Attendee: ...@@ -110,7 +110,7 @@ class Attendee:
continue continue
if name == "meeting": if name == "meeting":
res["meetingID"] = meeting.meeting_id res["meetingID"] = self.meeting.meeting_id
elif value is not None: elif value is not None:
if name in kwargs: if name in kwargs:
camel_name = kwargs[name] camel_name = kwargs[name]
......
...@@ -102,7 +102,13 @@ class Meeting: ...@@ -102,7 +102,13 @@ class Meeting:
if args and name not in args and name not in kwargs: if args and name not in args and name not in kwargs:
continue continue
if name not in ("api", "meta") and value is not None: if name == "api":
continue
elif name == "meta":
res["meta"] = self.meta
elif name == "attendees":
res["attendees"] = {"attendee": [{full_name: attendee.to_dict() for full_name, attendee in self.attendees.items()}]}
elif value is not None:
if name in kwargs: if name in kwargs:
camel_name = kwargs[name] camel_name = kwargs[name]
else: else:
...@@ -115,17 +121,16 @@ class Meeting: ...@@ -115,17 +121,16 @@ class Meeting:
res[camel_name] = str_value res[camel_name] = str_value
res["meta"] = self.meta
return res return res
def get_url_args(self, *args, **kwargs) -> dict: def get_url_args(self, *args, **kwargs) -> dict:
url_args = self.to_dict(*args, **kwargs) url_args = self.to_dict(*args, **kwargs)
# Unpack meta dictionary as values are passed one by one in URL if "meta" in url_args:
for name, value in url_args["meta"].items(): # Unpack meta dictionary as values are passed one by one in URL
url_args["meta_" + name] = value for name, value in url_args["meta"].items():
del url_args["meta"] url_args["meta_" + name] = value
del url_args["meta"]
return url_args return url_args
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment