nouffer/rogaining_srv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

イベントにpublicや対応クラスなどを追加

Browse Source
This commit is contained in:
hayano
2024-10-21 12:48:42 +00:00
parent 6f0d8d15fd
commit b8d7029965
4 changed files with 59 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rog/serializers.py
View File

@ -344,7 +344,7 @@ class NewCategorySerializer(serializers.ModelSerializer):
class NewEvent2Serializer(serializers.ModelSerializer):
class Meta:
model = NewEvent2
fields = ['id','event_name', 'start_datetime', 'end_datetime']
fields = ['id','event_name', 'start_datetime', 'end_datetime', 'deadlineDateTime', 'public', 'hour_3', 'hour_5', 'class_general','class_family','class_solo_male','class_solo_female']
class NewEventSerializer(serializers.ModelSerializer):
class Meta:
@ -448,7 +448,7 @@ class EntrySerializer(serializers.ModelSerializer):
class Meta:
model = Entry
fields = ['id','team', 'event', 'category', 'date','zekken_number','owner']
fields = ['id','team', 'event', 'category', 'date','zekken_number','owner','is_active', 'hasParticipated', 'hasGoaled']
read_only_fields = ['id','owner']
def validate_date(self, value):
@ -494,18 +494,24 @@ class EntrySerializer(serializers.ModelSerializer):
elif isinstance(entry_date, str):
entry_date = datetime.strptime(entry_date, "%Y-%m-%d").date()
logger.debug(f"==== entry_date : {entry_date} ====")
logger.debug("test-0")
logger.debug(f"==== start:{event.start_datetime.date()} <= entry_date : {entry_date} <= end:{event.end_datetime.date()} ?? ====")
if entry_date < event.start_datetime.date() or entry_date > event.end_datetime.date():
raise serializers.ValidationError(f"日付は{event.start_datetime.date()}から{event.end_datetime.date()}の間である必要があります。")
logger.debug("test-1")
owner = self.context['request'].user
zekken_number = data.get('zekken_number')
try:
logger.debug(f"Parsed data: team={team}, event={event}, category={category}, ")
logger.debug(f"Parsed data: team={team}, event={event}, category={category}, "
f"entry_date={entry_date}, owner={owner}, zekken_number={zekken_number}")
owner = self.context['request'].user
zekken_number = data.get('zekken_number')
logger.debug(f"entry_date={entry_date}, owner={owner}, zekken_number={zekken_number}")
except Exception:
raise serializers.ValidationError(f"何らかのエラーが発生しました")
# Check if team, event, and category exist
if not Team.objects.filter(id=team.id).exists():