pre release 20240903

rog/serializers.py

@@ -489,6 +489,17 @@ class EntrySerializer(serializers.ModelSerializer):
         event = data.get('event')
         category = data.get('category')
         entry_date = data.get('date')
+        if isinstance(entry_date, datetime):
+            entry_date = entry_date.date()
+        elif isinstance(entry_date, str):
+            entry_date = datetime.strptime(entry_date, "%Y-%m-%d").date()
+
+        logger.debug(f"==== entry_date : {entry_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()}の間である必要があります。")
+
+
         owner = self.context['request'].user
         zekken_number = data.get('zekken_number')
 
@@ -534,6 +545,11 @@ class EntrySerializer(serializers.ModelSerializer):
         ret['event'] = NewEvent2Serializer(instance.event).data
         ret['category'] = NewCategorySerializer(instance.category).data
         ret['owner'] = CustomUserSerializer(instance.owner).data
+
+        if isinstance(ret['date'], datetime):
+            ret['date'] = ret['date'].date().isoformat()
+        elif isinstance(ret['date'], date):
+            ret['date'] = ret['date'].isoformat()
         return ret
 
         #if isinstance(ret['date'], datetime):