Stop tracking migrations and release 4.8.9

rog/serializers.py

@@ -316,8 +316,8 @@ class RegistrationSerializer(serializers.ModelSerializer):
 class NewCategorySerializer(serializers.ModelSerializer):
     class Meta:
         model = NewCategory
-        #fields = ['id','category_name', 'category_number', 'duration', 'num_of_member', 'family', 'female']
-        fields = ['id','category_name', 'category_number']
+        fields = ['id','category_name', 'category_number', 'duration', 'num_of_member', 'family', 'female']
+        #fields = ['id','category_name', 'category_number']
 
 class NewEvent2Serializer(serializers.ModelSerializer):
     class Meta:
@@ -344,8 +344,8 @@ class TeamSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Team
-        fields = ['id','zekken_number', 'team_name', 'category', 'owner']
-        read_only_fields = ['id', 'owner', 'zekken_number']
+        fields = ['id','team_name', 'category', 'owner']
+        read_only_fields = ['id', 'owner']
 
     def to_representation(self, instance):
         ret = super().to_representation(instance)
@@ -353,7 +353,11 @@ class TeamSerializer(serializers.ModelSerializer):
             ret['category'] = {
                 'id': instance.category.id,
                 'category_name': instance.category.category_name,
-                'category_number': instance.category.category_number
+                'category_number': instance.category.category_number,
+                'duration': instance.category.duration,
+                'num_of_member':instance.category.num_of_member,
+                'family':instance.category.family,
+                'female':instance.category.female
             }
         else:
             ret['category'] = None
@@ -415,13 +419,14 @@ class EntrySerializer(serializers.ModelSerializer):
     category = serializers.PrimaryKeyRelatedField(queryset=NewCategory.objects.all())
     owner = serializers.PrimaryKeyRelatedField(read_only=True)
     date = serializers.DateTimeField(input_formats=['%Y-%m-%d'])  
+    zekken_number = serializers.IntegerField() 
 
     #date = serializers.DateTimeField(default_timezone=timezone.get_current_timezone())
 
 
     class Meta:
         model = Entry
-        fields = ['id','team', 'event', 'category', 'date','owner']
+        fields = ['id','team', 'event', 'category', 'date','zekken_number','owner']
         read_only_fields = ['id','owner']
 
     def validate_date(self, value):
@@ -463,6 +468,7 @@ class EntrySerializer(serializers.ModelSerializer):
         category = data.get('category')
         entry_date = data.get('date')
         owner = self.context['request'].user
+        zekken_number = data.get('zekken_number')
 
         # Check if team, event, and category exist
         if not Team.objects.filter(id=team.id).exists():
@@ -476,6 +482,13 @@ class EntrySerializer(serializers.ModelSerializer):
         if Entry.objects.filter(team=team, event=event, date__date=entry_date, owner=owner).exists():
             raise serializers.ValidationError("既に登録済みです。")
 
+        # Validate zekken_number
+        if zekken_number is not None:
+            if zekken_number <= 0:
+                raise serializers.ValidationError("ゼッケン番号は正の整数である必要があります。")
+            if Entry.objects.filter(event=event, zekken_number=zekken_number).exists():
+                raise serializers.ValidationError("このゼッケン番号は既に使用されています。")
+
         return data
 
     def to_internal_value(self, data):