Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions lego/apps/events/serializers/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@ class EventReadSerializer(
registration_count = RegistrationCountField()
total_capacity = TotalCapacityField()
user_reg = serializers.SerializerMethodField()
responsible_users = PublicUserField(
queryset=User.objects.all(),
allow_null=False,
required=True,
many=True,
)

class Meta:
model = Event
Expand All @@ -115,7 +109,6 @@ class Meta:
"is_admitted",
"survey",
"is_priced",
"responsible_users",
"is_foreign_language",
"user_reg",
"show_company_description",
Expand All @@ -142,15 +135,8 @@ class EventReadDetailedSerializer(
pools = PoolReadSerializer(many=True)
active_capacity = serializers.ReadOnlyField()
text = ContentSerializerField()
created_by = PublicUserSerializer()
registration_close_time = serializers.DateTimeField(read_only=True)
unregistration_close_time = serializers.DateTimeField(read_only=True)
responsible_users = PublicUserField(
queryset=User.objects.all(),
allow_null=False,
required=True,
many=True,
)

class Meta:
model = Event
Expand Down Expand Up @@ -190,13 +176,11 @@ class Meta:
"tags",
"is_merged",
"heed_penalties",
"created_by",
"legacy_registration_count",
"survey",
"use_consent",
"youtube_url",
"mazemap_poi",
"responsible_users",
"is_foreign_language",
"show_company_description",
)
Expand Down Expand Up @@ -307,9 +291,18 @@ class EventReadAuthUserDetailedSerializer(EventReadUserDetailedSerializer):
pools = PoolReadAuthSerializer(many=True)
waiting_registrations = RegistrationReadSerializer(many=True)
unanswered_surveys = serializers.SerializerMethodField()
created_by = PublicUserSerializer()
responsible_users = PublicUserField(
queryset=User.objects.all(),
allow_null=False,
required=True,
many=True,
)

class Meta(EventReadUserDetailedSerializer.Meta):
fields = EventReadUserDetailedSerializer.Meta.fields + ( # type: ignore
"created_by",
"responsible_users",
"waiting_registrations",
"unanswered_surveys",
)
Expand All @@ -326,10 +319,17 @@ class EventAdministrateSerializer(EventReadSerializer, EventReadDetailedSerializ
responsible_group = AbakusGroupField(
queryset=AbakusGroup.objects.all(), required=False, allow_null=True
)
responsible_users = PublicUserField(
queryset=User.objects.all(),
allow_null=False,
required=True,
many=True,
)

class Meta(EventReadSerializer.Meta):
fields = EventReadSerializer.Meta.fields + ( # type: ignore
"pools",
"responsible_users",
"unregistered",
"waiting_registrations",
"use_consent",
Expand Down