diff --git a/config/settings/base.py b/config/settings/base.py index c0a92b8..70c5d1b 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -27,13 +27,13 @@ DJANGO_APPS = [ 'django.contrib.staticfiles', ] -DJANGO_UNFOLD = [ - "unfold", - "unfold.contrib.filters", - "unfold.contrib.forms", - "unfold.contrib.guardian", - "unfold.contrib.simple_history", -] +# DJANGO_UNFOLD = [ +# "unfold", +# "unfold.contrib.filters", +# "unfold.contrib.forms", +# "unfold.contrib.guardian", +# "unfold.contrib.simple_history", +# ] APPS = [ 'core.apps.shared', @@ -49,7 +49,7 @@ PACKAGES = [ ] INSTALLED_APPS = [] -INSTALLED_APPS += DJANGO_UNFOLD +# INSTALLED_APPS += DJANGO_UNFOLD INSTALLED_APPS += DJANGO_APPS INSTALLED_APPS += PACKAGES INSTALLED_APPS += APPS @@ -151,4 +151,4 @@ from config.conf.rest_framework import * from config.conf.simplejwt import * from config.conf.celery import * from config.conf.redis import * -from config.conf.unfold import * \ No newline at end of file +# from config.conf.unfold import * \ No newline at end of file diff --git a/core/apps/accounts/views/auth.py b/core/apps/accounts/views/auth.py index ab87299..521d68f 100644 --- a/core/apps/accounts/views/auth.py +++ b/core/apps/accounts/views/auth.py @@ -48,6 +48,7 @@ class ConfirUserApiView(generics.GenericAPIView): return Response({"success": True, "message": "code is expired"}, status=status.HTTP_400_BAD_REQUEST) if code.is_verify: return Response({"success": True, "message": "code is verified"}, status=status.HTTP_400_BAD_REQUEST) + user.is_active = True user.save() code.is_verify = True code.is_expired = True diff --git a/core/apps/contracts/serializers/contract.py b/core/apps/contracts/serializers/contract.py index 8db7ce4..500f966 100644 --- a/core/apps/contracts/serializers/contract.py +++ b/core/apps/contracts/serializers/contract.py @@ -28,7 +28,7 @@ class ContractCreateSerializer(serializers.Serializer): add_folder=validated_data.pop('add_folder'), add_notification=validated_data.pop('add_notification'), ) - return contract + return contract.id class ContractListSerializer(serializers.ModelSerializer): diff --git a/core/apps/contracts/views/contract.py b/core/apps/contracts/views/contract.py index 2f942e5..500dbd1 100644 --- a/core/apps/contracts/views/contract.py +++ b/core/apps/contracts/views/contract.py @@ -14,10 +14,21 @@ class ContractCreateApiView(generics.CreateAPIView): def get_serializer_context(self): return {'user': self.request.user} + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + contract = serializer.save() + + return Response({ + "success": True, + "message": "Contract successfully created", + "contract_id": str(contract) + }, status=status.HTTP_201_CREATED) + class ContractListApiView(generics.ListAPIView): serializer_class = contract_serializer.ContractListSerializer queryset = Contract.objects.all() def get_queryset(self): - return super().get_queryset() + return Contract.objects.filter(contract_sides__user=self.request.user)