Upload 54 files

authentication/migrations/0007_userdata_revelid.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-11-26 08:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("authentication", "0006_userdata_activatedcoupons"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userdata",
+            name="revelId",
+            field=models.CharField(default="", max_length=50),
+        ),
+    ]

authentication/migrations/0008_alter_userdata_pincode.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-11-26 10:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("authentication", "0007_userdata_revelid"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="userdata",
+            name="pincode",
+            field=models.CharField(max_length=10),
+        ),
+    ]

authentication/models.py

@@ -38,6 +38,7 @@ class Coupon(models.Model):
 
 class UserData(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
+    revelId = models.CharField(max_length=50, default="")
     refCode = models.CharField(max_length=50, default="")
     phone = models.CharField(max_length=15)
     birthDate = models.DateField()
@@ -46,7 +47,7 @@ class UserData(models.Model):
     city = models.CharField(max_length=50)
     state = models.CharField(max_length=50)
     country = models.CharField(max_length=50)
-    pincode = models.IntegerField()
+    pincode = models.CharField(max_length=10)
     otp = models.IntegerField(null=True, blank=True)
     rewardPoints = models.IntegerField(default=0)
     isVerified = models.BooleanField(default=False)

authentication/views.py

@@ -10,17 +10,18 @@ from rest_framework_simplejwt.tokens import RefreshToken
 from rest_framework.permissions import IsAuthenticated, AllowAny
 from django.core.mail import send_mail
 import random
+import requests
 from django.utils import timezone
 from datetime import timedelta
 from .models import UserData
+import uuid
 
 # In-memory storage for OTPs (use a persistent storage in production)
 OTP_STORAGE = {}
 
 
 class RegisterView(APIView):
-    authentication_classes = ()
-    permission_classes = ()  # Allow any
+    permission_classes = [AllowAny]
 
     def post(self, request):
         try:
@@ -29,7 +30,17 @@ class RegisterView(APIView):
             password = data.get('password')
             first_name = data.get('first_name')
             last_name = data.get('last_name')
-            
+            phone = data.get('phone')
+            birthDate = data.get('birthDate')
+            gender = data.get('gender', 'male')
+            streetName = data.get('streetName')
+            city = data.get('city')
+            state = data.get('state')
+            country = data.get('country')
+            pincode = data.get('pincode')
+            getUpdates = data.get('getUpdates', False)
+            birthDate = birthDate.split('T')[0]
+
             if User.objects.filter(email=email).exists():
                 return JsonResponse({'error': 'Email already exists'}, status=400)
 
@@ -41,6 +52,21 @@ class RegisterView(APIView):
                 last_name=last_name
             )
             user.save()
+
+            userDataObj = UserData.objects.create(
+                user=user,
+                phone=phone,
+                refCode=phone,
+                birthDate=birthDate,
+                gender=gender,
+                streetName=streetName,
+                city=city,
+                state=state,
+                country=country,
+                pincode=pincode,
+                isSubscribed=getUpdates
+            )
+
             otp = random.randint(100000, 999999)
             OTP_STORAGE[email] = {
                 'otp': otp,
@@ -48,15 +74,105 @@ class RegisterView(APIView):
             }
             print(otp)
             # Send OTP via email
-            send_mail(
-                'Password Reset OTP',
-                f'Your OTP for password reset is {otp}',
-                'noreply@example.com',  # Replace with your email
-                [email],
-                fail_silently=False,
-            )
-            return JsonResponse({'message': 'User registered successfully'}, status=201)
+            # send_mail(
+            #     'Password Reset OTP',
+            #     f'Your OTP for password reset is {otp}',
+            #     'noreply@example.com',  # Replace with your email
+            #     [email],
+            #     fail_silently=False,
+            # )
+
+            # Add user to Revel system
+            revel_payload = json.dumps({
+                "accept_checks": False,
+                "account_balance": None,
+                "account_limit": None,
+                "active": True,
+                "address": streetName,
+                "birth_date": birthDate,
+                "cc_exp": "03/22",
+                "cc_first_name": first_name,
+                "cc_last_name": last_name,
+                "cc_last_4_digits": "1111",
+                "city": city,
+                "company_name": "B-Company",
+                # "contract_expiration": "2019-05-16T00:00:00",
+                "created_by": "/enterprise/User/9393/",
+                "created_date": timezone.now().isoformat(),
+                "customer_groups": [],
+                "deleted": False,
+                "discount": 0,
+                "email": email,
+                "email_opt_in": getUpdates,
+                # "exp_date": "1919-05-16T00:00:00",
+                "expensify_account": f'{{"{email}":["193"]}}',
+                "first_name": first_name,
+                "gender": 0 if gender.lower() == 'male' else 1,
+                "gift_card_numbers": [],
+                "is_visitor": False,
+                "last_name": last_name,
+                "lic_number": "EAK173",
+                "loyalty_number": None,
+                "loyalty_ref_id": "",
+                "notes": "New Customer",
+                "ok_to_email": False,
+                "past_due": 0,
+                "phone_number": phone,
+                "phone_opt_in": getUpdates,
+                "pin": "",
+                "post_opt_in": False,
+                "ref_number": "1731-147709",
+                "reward_card_numbers": [],
+                "source": None,
+                "state": state,
+                "tax_exempt": False,
+                # "tax_location": "CA Orange County",
+                # "third_party_id": "1731147709",
+                "title": "Mr" if gender == "male" else "Ms",
+                "total_purchases": 0,
+                "total_visits": 0,
+                "track_as_company": True,
+                "type": 1,
+                "updated_by": "/enterprise/User/9393/",
+                "updated_date": timezone.now().isoformat(),
+                "uuid": uuid.uuid4().hex,
+                "vehicles": [],
+                "version_date": timezone.now().isoformat(),
+                "zipcode": pincode
+            })
+            revel_headers = {
+                'content-type': 'application/json',
+                'API-AUTHENTICATION': 'fab57498544244e38bfc2741880f8d61:ed9628295b0642e1b38308795c9cdadd58012df4ceb84a3b9d441c017a1eeac0'
+            }
+            revel_response = requests.post("https://101smokeshop-uat.revelup.com/resources/Customer/", headers=revel_headers, data=revel_payload)
+            # print(revel_response.json())
+
+            userDataObj.revelId = revel_response.json()['id']
+            userDataObj.save()
+            refresh = RefreshToken.for_user(user)
+            userData = {}
+            userData['email'] = user.email
+            userData['first_name'] = user.first_name
+            userData['last_name'] = user.last_name
+            userData['access'] = str(refresh.access_token)
+            userData['refresh'] = str(refresh)
+            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)
         except Exception as e:
+            print(e)
             return JsonResponse({'error': str(e)}, status=400)
 
 
@@ -73,7 +189,7 @@ class LoginView(APIView):
             if user is not None:
                 refresh = RefreshToken.for_user(user)
                 userDataObj = UserData.objects.get(user=user)
-                userData ={}
+                userData = {}
                 userData['email'] = user.email
                 userData['first_name'] = user.first_name
                 userData['last_name'] = user.last_name
@@ -99,15 +215,19 @@ class LoginView(APIView):
         except Exception as e:
             print(e)
             return JsonResponse({'error': str(e)}, status=400)
-        
+
+
 class UserDetailView(APIView):
     permission_classes = [IsAuthenticated]
 
     def get(self, request):
         user = request.user
+        refresh = RefreshToken.for_user(user)
         userDataObj = UserData.objects.get(user=user)
-        userData ={}
+        userData = {}
         userData['email'] = user.email
+        userData['access'] = str(refresh.access_token)
+        userData['refresh'] = str(refresh)
         userData['first_name'] = user.first_name
         userData['last_name'] = user.last_name
         userData["phone"] = userDataObj.phone
@@ -125,7 +245,51 @@ class UserDetailView(APIView):
         userData["isBlocked"] = userDataObj.isBlocked
         userData["isDeleted"] = userDataObj.isDeleted
         return JsonResponse(userData, status=200)
-        
+
+    def post(self, request):
+        try:
+            user = request.user
+            userDataObj = UserData.objects.get(user=user)
+            data = json.loads(request.body)
+            user.email = data.get('email', user.email)
+            user.first_name = data.get('first_name', user.first_name)
+            user.last_name = data.get('last_name', user.last_name)
+            userDataObj.phone = data.get('phone', userDataObj.phone)
+            userDataObj.refCode = data.get('phone', userDataObj.phone)
+            userDataObj.birthDate = data.get('birthDate', userDataObj.birthDate).split('T')[0]
+            userDataObj.gender = data.get('gender', userDataObj.gender)
+            userDataObj.streetName = data.get('streetName', userDataObj.streetName)
+            userDataObj.city = data.get('city', userDataObj.city)
+            userDataObj.state = data.get('state', userDataObj.state)
+            userDataObj.country = data.get('country', userDataObj.country)
+            userDataObj.pincode = data.get('pincode', userDataObj.pincode)
+            user.save()
+            userDataObj.save()
+            userData = {}
+            refresh = RefreshToken.for_user(user)
+            userData['email'] = user.email
+            userData['access'] = str(refresh.access_token)
+            userData['refresh'] = str(refresh)
+            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({'message': 'User data updated successfully', "data": userData}, status=200)
+        except Exception as e:
+            return JsonResponse({'error': str(e)}, status=400)
+
 
 class LogoutView(APIView):
     permission_classes = [IsAuthenticated]
@@ -145,14 +309,13 @@ class LogoutView(APIView):
                     'status': 'success',
                     'message': 'Successfully logged out'
                 })
-            except :
+            except:
                 return JsonResponse({
                     "error": "Invalid token",
                     "status": "error"
                 }, status=400)
 
 
-
 class RequestPasswordResetView(APIView):
     authentication_classes = ()
     permission_classes = ()  # Allow any
@@ -265,6 +428,7 @@ class ResetPasswordView(APIView):
         except Exception as e:
             return JsonResponse({'error': str(e)}, status=400)
 
+
 class refreshTokenView(APIView):
     def post(self, request):
         try:
@@ -275,4 +439,3 @@ class refreshTokenView(APIView):
             return JsonResponse({'access': access}, status=200)
         except Exception as e:
             return JsonResponse({'error': str(e)}, status=400)
-    

oneOone/settings.py

@@ -166,7 +166,7 @@ REST_FRAMEWORK = {
 
 
 SIMPLE_JWT = {
-    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=60),
+    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=720),
     'REFRESH_TOKEN_LIFETIME': timedelta(days=60),
     'ROTATE_REFRESH_TOKENS': True,
     'BLACKLIST_AFTER_ROTATION': True,