fix

core/apps/contracts/migrations/0004_alter_contract_folder.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2 on 2025-11-11 19:20
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contracts', '0003_alter_folder_options_folder_user'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contract',
+            name='folder',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contracts', to='contracts.folder'),
+        ),
+    ]

core/apps/contracts/models/contract.py

@@ -26,7 +26,7 @@ class Contract(BaseModel):
     add_notification = models.BooleanField(default=False)
 
     company = models.ForeignKey(get_user_model(), on_delete=models.CASCADE, related_name='contracts')
-    folder = models.ForeignKey(Folder, on_delete=models.SET_NULL, null=True, blank=True, related_name='countracts')
+    folder = models.ForeignKey(Folder, on_delete=models.SET_NULL, null=True, blank=True, related_name='contracts')
 
     def __str__(self):
         return f'{self.name}'

core/apps/contracts/serializers/contract.py

@@ -40,6 +40,7 @@ class ContractCreateSerializer(serializers.Serializer):
                 company=user,
                 folder=validated_data.get('folder'),
             )
+            
             return contract.id
 
 
@@ -58,4 +59,15 @@ class ContractDetailSerializer(serializers.ModelSerializer):
         model = Contract
         fields = [
             'id', 'name', 'file', 'status', 'contract_number', 'contract_sides',
-        ]
+        ]
+
+
+class ContractUpdateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Contract
+        fields = ['folder']
+
+    def update(self, instance, validated_data):
+        instance.folder = validated_data.get('folder', instance.folder)
+        instance.save()
+        return instance

core/apps/contracts/serializers/folder.py

@@ -1,6 +1,7 @@
 from rest_framework import serializers
 
 from core.apps.contracts.models import Folder
+from core.apps.contracts.serializers.contract import ContractListSerializer
 
 
 class FolderListSerializer(serializers.ModelSerializer):
@@ -28,4 +29,14 @@ class FolderSerializer(serializers.ModelSerializer):
     def update(self, instance, validated_data):
         instance.name = validated_data.get('name', instance.name)
         instance.save()
-        return instance
+        return instance
+    
+
+class FolderDetailSerializer(serializers.ModelSerializer):
+    contracts = ContractListSerializer(many=True)
+
+    class Meta:
+        model = Folder
+        fields = [
+            'id', 'name', 'contracts'
+        ]

core/apps/contracts/urls.py

@@ -11,6 +11,7 @@ urlpatterns = [
             path('create/', contract_views.ContractCreateApiView.as_view(), name='create-contract'),
             path('list/', contract_views.ContractListApiView.as_view(), name='list-contract'),
             path('<uuid:id>/', contract_views.ContractDetailApiView.as_view(), name='detail-contract'),
+            path('<uuid:id>/update/', contract_views.ContractUpdateApiView.as_view()),
         ]
     )),
     path('contract_side/', include([
@@ -28,6 +29,7 @@ urlpatterns = [
             path('list/', folder_views.FolderListApiView.as_view()),
             path('create/', folder_views.FolderCreateApiView.as_view()),
             path('<uuid:folder_id>/update/', folder_views.FolderUpdateApiView.as_view()),
+            path('<uuid:id>/contracts/', folder_views.ContractListApiView.as_view()),
         ]
     )),
 ]

core/apps/contracts/views/contract.py

@@ -1,3 +1,5 @@
+from django.shortcuts import get_object_or_404
+
 from rest_framework import generics, views, status, permissions, parsers
 from rest_framework.response import Response
 
@@ -37,4 +39,18 @@ class ContractDetailApiView(views.APIView):
         if not contract:
             return error_message("Contract not found", 404)
         serializer = contract_serializer.ContractDetailSerializer(contract)
-        return Response(serializer.data, status=200)    
+        return Response(serializer.data, status=200)
+    
+
+class ContractUpdateApiView(generics.GenericAPIView):
+    serializer_class = contract_serializer.ContractUpdateSerializer
+    queryset = Contract.objects.all()
+    permission_classes = [permissions.IsAuthenticated]
+
+    def patch(self, request, id):
+        contract = get_object_or_404(Contract, id=id)
+        serializer = self.serializer_class(data=request.data, instance=contract)
+        if serializer.is_valid(raise_exception=True):
+            serializer.save()
+            return Response({"success": True, 'message': 'updated'}, status=200)
+        return Response({'success': False, 'message': serializer.errors}, status=400)

core/apps/contracts/views/folder.py

@@ -44,3 +44,14 @@ class FolderUpdateApiView(generics.GenericAPIView):
             serializer.save()
             return Response({"message":"Folder tahrirlandi"}, status=200)
         return Response(serializer.errors, status=400)
+
+
+class ContractListApiView(generics.GenericAPIView):
+    serializer_class = serializers.FolderDetailSerializer
+    queryset = Folder.objects.all()
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request, id):
+        folder = get_object_or_404(Folder, id=id, user=request.user)
+        serializer = self.serializer_class(folder)
+        return Response(serializer.data)