diff --git a/gibspons/requirements.txt b/gibspons/requirements.txt index 28bf820..1fca7c8 100644 --- a/gibspons/requirements.txt +++ b/gibspons/requirements.txt @@ -7,7 +7,7 @@ Django==5.0.1 django-cors-headers==4.3.1 djangorestframework==3.14.0 djangorestframework-simplejwt==5.3.1 -django-filter==23.5.0 +django-filter==24.2 google-ai-generativelanguage==0.4.0 google-api-core==2.16.1 google-auth==2.27.0 diff --git a/gibspons/spons_app/serializers.py b/gibspons/spons_app/serializers.py index 78d0725..9b13764 100644 --- a/gibspons/spons_app/serializers.py +++ b/gibspons/spons_app/serializers.py @@ -58,7 +58,7 @@ class SponsorshipSerializer(serializers.ModelSerializer): class Meta: model=Sponsorship - fields=['id','company','poc','event','event_name','contacted_by','user_name','status','type_of_sponsorship','money_donated','additional','company_name'] + fields=['id','company','poc','event','event_name','contacted_by','user_name','updated_at','status','type_of_sponsorship','money_donated','additional','company_name'] #---------AI SERIALIZER------------------------- diff --git a/gibspons/spons_app/views/sponsorship.py b/gibspons/spons_app/views/sponsorship.py index 025bde6..4f1c04d 100644 --- a/gibspons/spons_app/views/sponsorship.py +++ b/gibspons/spons_app/views/sponsorship.py @@ -33,6 +33,9 @@ def patch(request,sponsor_id): if 'status' in serializer.validated_data and serializer.validated_data['status']=='Accepted' and request.user.role not in ['admin','owner']: return Response({'detail':'Permission denied'},status=status.HTTP_401_UNAUTHORIZED) + if any(serializer.validated_data.get(key) for key in ['money_donated', 'additional', 'type_of_sponsorship']) and serializer.validated_data['status']!='Accepted': + return Response({'detail':'Status must be accepted for this action'}) + serializer.save() return Response(serializer.data,status=status.HTTP_200_OK) return Response({"detail" : serializer.errors},status=status.HTTP_400_BAD_REQUEST) diff --git a/gibspons/sponsorship/settings.py b/gibspons/sponsorship/settings.py index f2a03ed..5df6039 100644 --- a/gibspons/sponsorship/settings.py +++ b/gibspons/sponsorship/settings.py @@ -26,7 +26,8 @@ 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', - 'django.contrib.staticfiles', + 'django.contrib.staticfiles', + 'django_filters', 'corsheaders', 'users', 'spons_app', @@ -139,7 +140,7 @@ #"rest_framework.authentication.TokenAuthentication", ), "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",), - "DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"], + 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'] } SIMPLE_JWT = {