Upload 54 files

Dockerfile

@@ -1,7 +1,13 @@
-FROM python:3
-WORKDIR /usr/src/app
-COPY requirements.txt ./
-RUN pip install -r requirements.txt
-COPY . .
-EXPOSE 7860
+FROM ubuntu:24.04
+RUN apt-get update
+RUN apt-get install -y python3-pip
+RUN apt-get install -y python3-venv
+WORKDIR /code
+RUN python3 -m venv /code/venv
+COPY ./requirements.txt /code/requirements.txt
+RUN /code/venv/bin/pip install --upgrade pip
+RUN /code/venv/bin/pip install -r /code/requirements.txt
+COPY . .
+ENV PATH="/code/venv/bin:$PATH"
+EXPOSE 7860
 CMD ["python","./manage.py","runserver","0.0.0.0:7860"]

api/urls.py

@@ -8,4 +8,5 @@ urlpatterns = [
     path('resources-forward/<str:resource_name>/<str:image_id>', resources_forward, name='resources_forward'),
     path('product-category', product_category, name='product_category'),
     path('coupon-list', CouponListView.as_view(), name='coupon_List'),
+    path('coupon-redeem', CouponRedeemView.as_view(), name='coupon_redeem'),
 ]

api/views.py

@@ -128,6 +128,7 @@ class CouponListView(APIView):
 
         user = UserData.objects.get(user=request.user)
         coupons = user.coupons.all()
+        redeemedCoupons = user.activatedCoupons.all()
         data = []
         for coupon in coupons:
             data.append({
@@ -138,6 +139,7 @@ class CouponListView(APIView):
                 "loyaltyCode": coupon.loyaltyCode,
                 "discount": coupon.discount,
                 "isExpired": coupon.isExpired,
+                "isRedeemed": coupon in redeemedCoupons,
                 "expiryDate": coupon.expiryDate,
                 "discountFunction": discount_functions[coupon.discountFunction],
                 "discountMethod": discount_methods[coupon.discountMethod],
@@ -148,3 +150,21 @@ class CouponListView(APIView):
             })
 
         return JsonResponse({"data": data})
+
+
+class CouponRedeemView(APIView):
+    permission_classes = [IsAuthenticated]
+    def post(self, request):
+        couponCode = request.data["couponCode"]
+        user = UserData.objects.get(user=request.user)
+        coupon = Coupon.objects.get(couponCode=couponCode)
+        if coupon not in user.coupons.all() or coupon == None:
+            return JsonResponse({"message": "Coupon is not available for this user"})
+        if coupon.isExpired:
+            return JsonResponse({"message": "Coupon is expired"})
+        if user.rewardPoints < coupon.pointsNeededForRedemption:
+            return JsonResponse({"message": "You don't have enough points to redeem this coupon"})
+        user.rewardPoints -= coupon.pointsNeededForRedemption
+        user.save()
+        user.activatedCoupons.add(coupon)
+        return JsonResponse({"message": "Coupon redeemed successfully"})

authentication/migrations/0006_userdata_activatedcoupons.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.16 on 2024-11-12 22:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("authentication", "0005_userdata_refcode"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userdata",
+            name="activatedCoupons",
+            field=models.ManyToManyField(
+                blank=True, related_name="activatedCoupons", to="authentication.coupon"
+            ),
+        ),
+    ]

authentication/models.py

@@ -54,6 +54,7 @@ class UserData(models.Model):
     isBlocked = models.BooleanField(default=False)
     isDeleted = models.BooleanField(default=False)
     coupons = models.ManyToManyField(Coupon, blank=True, related_name='coupons')
+    activatedCoupons = models.ManyToManyField(Coupon, blank=True, related_name='activatedCoupons')
     
     def __str__(self):
         return self.user.first_name + " " + self.user.last_name

authentication/urls.py

@@ -9,4 +9,5 @@ urlpatterns = [
     path('password-reset/request/', RequestPasswordResetView.as_view(), name='password_reset_request'),
     path('password-reset/resend/', ResendOTPView.as_view(), name='password_reset_resend'),
     path('password-reset/confirm/', ResetPasswordView.as_view(), name='password_reset_confirm'),
+    path('user-detail/', UserDetailView.as_view(), name='user_detail'),
 ]

authentication/views.py

@@ -100,6 +100,32 @@ class LoginView(APIView):
             print(e)
             return JsonResponse({'error': str(e)}, status=400)
         
+class UserDetailView(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        user = request.user
+        userDataObj = UserData.objects.get(user=user)
+        userData ={}
+        userData['email'] = user.email
+        userData['first_name'] = user.first_name
+        userData['last_name'] = user.last_name
+        userData["phone"] = userDataObj.phone
+        userData["refCode"] = userDataObj.refCode
+        userData["birthDate"] = userDataObj.birthDate
+        userData["gender"] = userDataObj.gender
+        userData["streetName"] = userDataObj.streetName
+        userData["city"] = userDataObj.city
+        userData["state"] = userDataObj.state
+        userData["country"] = userDataObj.country
+        userData["pincode"] = userDataObj.pincode
+        userData["rewardPoints"] = userDataObj.rewardPoints
+        userData["isVerified"] = userDataObj.isVerified
+        userData["isSubscribed"] = userDataObj.isSubscribed
+        userData["isBlocked"] = userDataObj.isBlocked
+        userData["isDeleted"] = userDataObj.isDeleted
+        return JsonResponse(userData, status=200)
+        
 
 class LogoutView(APIView):
     permission_classes = [IsAuthenticated]

oneOone/settings.py

@@ -102,9 +102,9 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'postgres',
-        'USER': 'postgres.psjobjezrtkjvenhsmge',
+        'USER': 'postgres.igsosentooipcjyflmnw',
         'PORT': 6543,
-        'PASSWORD': 'ErO9vgKcwCA1bdah',
+        'PASSWORD': 'bfHBTQr6xCAwdbts',
         'HOST': 'aws-0-us-east-1.pooler.supabase.com',
     }
 }