feat: Mise à jour du modèle (possibilité d'associer une réduciton à un

frais d'inscription [#18]

Back-End/School/serializers.py

@@ -180,21 +180,48 @@ class DiscountSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 class FeeSerializer(serializers.ModelSerializer):
+    discounts = serializers.PrimaryKeyRelatedField(queryset=Discount.objects.all(), many=True)
+
     class Meta:
         model = Fee
         fields = '__all__'
 
+    def create(self, validated_data):
+        discounts_data = validated_data.pop('discounts', [])
+        
+        # Create the Fee instance
+        fee = Fee.objects.create(**validated_data)
+        
+        # Add discounts if provided
+        fee.discounts.set(discounts_data)
+        
+        return fee
+
+    def update(self, instance, validated_data):
+        discounts_data = validated_data.pop('discounts', [])
+        
+        # Update the Fee instance
+        instance.name = validated_data.get('name', instance.name)
+        instance.description = validated_data.get('description', instance.description)
+        instance.base_amount = validated_data.get('base_amount', instance.base_amount)
+        instance.currency = validated_data.get('currency', instance.currency)
+        instance.payment_option = validated_data.get('payment_option', instance.payment_option)
+        instance.is_active = validated_data.get('is_active', instance.is_active)
+        instance.updated_at = validated_data.get('updated_at', instance.updated_at)
+        instance.save()
+        
+        # Update discounts if provided
+        instance.discounts.set(discounts_data)
+        
+        return instance
+
 class TuitionFeeSerializer(serializers.ModelSerializer):
     discounts = serializers.PrimaryKeyRelatedField(queryset=Discount.objects.all(), many=True)
-    final_amount = serializers.SerializerMethodField()
 
     class Meta:
         model = TuitionFee
         fields = '__all__'
 
-    def get_final_amount(self, obj):
-        return obj.calculate_final_amount()
-
     def create(self, validated_data):
         discounts_data = validated_data.pop('discounts', [])
         
@@ -202,8 +229,7 @@ class TuitionFeeSerializer(serializers.ModelSerializer):
         tuition_fee = TuitionFee.objects.create(**validated_data)
         
         # Add discounts if provided
-        for discount in discounts_data:
-            tuition_fee.discounts.add(discount)
+        tuition_fee.discounts.set(discounts_data)
         
         return tuition_fee
 
@@ -215,14 +241,12 @@ class TuitionFeeSerializer(serializers.ModelSerializer):
         instance.description = validated_data.get('description', instance.description)
         instance.base_amount = validated_data.get('base_amount', instance.base_amount)
         instance.currency = validated_data.get('currency', instance.currency)
-        instance.validity_start_date = validated_data.get('validity_start_date', instance.validity_start_date)
-        instance.validity_end_date = validated_data.get('validity_end_date', instance.validity_end_date)
         instance.payment_option = validated_data.get('payment_option', instance.payment_option)
         instance.is_active = validated_data.get('is_active', instance.is_active)
+        instance.updated_at = validated_data.get('updated_at', instance.updated_at)
         instance.save()
         
         # Update discounts if provided
-        if discounts_data:
-            instance.discounts.set(discounts_data)
+        instance.discounts.set(discounts_data)
         
         return instance