ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-11-26 08:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

list of guardian code status

Browse Source
This commit is contained in:
jain
2023-08-26 17:09:10 +05:30
parent 9891060ee3
commit cf9376663c
8 changed files with 185 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
guardian/serializers.py
View File

@ -402,9 +402,13 @@ class ApproveJuniorSerializer(serializers.ModelSerializer):
def create(self, validated_data): def create(self, validated_data):
"""update guardian code""" """update guardian code"""
instance = self.context['junior'] instance = self.context['junior']
instance.guardian_code = [self.context['guardian_code']] guardian_code = self.context['guardian_code']
instance.guardian_code_approved = True print("guardian_code==>", guardian_code, '==>', type(guardian_code))
instance.guardian_code_status = str(NUMBER['two']) print("instance.guardian_code==>", instance.guardian_code, '==>',
type(instance.guardian_code))
index = instance.guardian_code.index(guardian_code)
print("index==>", index, '==>', type(index))
instance.guardian_code_status[index] = str(NUMBER['two'])
instance.save() instance.save()
return instance return instance
@ -512,4 +516,11 @@ class GuardianDetailListSerializer(serializers.ModelSerializer):
def get_guardian_code_status(self,obj): def get_guardian_code_status(self,obj):
"""guardian code status""" """guardian code status"""
print("obj.guardian.guardian_code===>",obj.guardian.guardian_code,'===>',type(obj.guardian.guardian_code))
print("obj.junior.guardian_code===>", obj.junior.guardian_code, '===>', type(obj.junior.guardian_code))
if obj.guardian.guardian_code in obj.junior.guardian_code:
index = obj.junior.guardian_code.index(obj.guardian.guardian_code)
print("index===>", index, '===>', type(index))
data = obj.junior.guardian_code_status[index]
print("data===>", data, '===>', type(data))
return obj.junior.guardian_code_status return obj.junior.guardian_code_status

26
guardian/views.py
View File

@ -179,9 +179,13 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
image = request.data['default_image'] image = request.data['default_image']
junior = request.data['junior'] junior = request.data['junior']
junior_id = Junior.objects.filter(id=junior).last() junior_id = Junior.objects.filter(id=junior).last()
if junior_id:
guardian_data = Guardian.objects.filter(user=request.user).last() guardian_data = Guardian.objects.filter(user=request.user).last()
if (guardian_data.guardian_code not in junior_id.guardian_code or index = junior_id.guardian_code.index(guardian_data.guardian_code)
junior_id.guardian_code_status in guardian_code_tuple): print("index===>", index, '===>', type(index))
status_index = junior_id.guardian_code_status[index]
print("status_index===>", status_index, '===>', type(status_index))
if status_index == str(NUMBER['three']):
return custom_error_response(ERROR_CODE['2078'], response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(ERROR_CODE['2078'], response_status=status.HTTP_400_BAD_REQUEST)
allowed_extensions = ['.jpg', '.jpeg', '.png'] allowed_extensions = ['.jpg', '.jpeg', '.png']
if not any(extension in str(image) for extension in allowed_extensions): if not any(extension in str(image) for extension in allowed_extensions):
@ -209,6 +213,8 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
junior_id.auth.id, {'task_id': task.id}) junior_id.auth.id, {'task_id': task.id})
return custom_response(SUCCESS_CODE['3018'], serializer.data, response_status=status.HTTP_200_OK) return custom_response(SUCCESS_CODE['3018'], serializer.data, response_status=status.HTTP_200_OK)
return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
else:
return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
except Exception as e: except Exception as e:
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
@ -302,8 +308,20 @@ class ApproveJuniorAPIView(viewsets.ModelViewSet):
junior_queryset.auth.id) junior_queryset.auth.id)
return custom_response(SUCCESS_CODE['3023'], serializer.data, response_status=status.HTTP_200_OK) return custom_response(SUCCESS_CODE['3023'], serializer.data, response_status=status.HTTP_200_OK)
else: else:
junior_queryset.guardian_code = None print("#############################################")
junior_queryset.guardian_code_status = str(NUMBER['one']) if junior_queryset.guardian_code and ('-' in junior_queryset.guardian_code):
print("777777777777777")
junior_queryset.guardian_code.remove('-')
if junior_queryset.guardian_code_status and ('-' in junior_queryset.guardian_code_status):
print("666666666666666666666666")
junior_queryset.guardian_code_status.remove('-')
print("guardian.guardian_code==>", guardian.guardian_code, '==>', type(guardian.guardian_code))
print("junior_queryset.guardian_code==>", junior_queryset.guardian_code, '==>', type(junior_queryset.guardian_code))
index = junior_queryset.guardian_code.index(guardian.guardian_code)
print("index==>", index, '==>', type(index))
junior_queryset.guardian_code.remove(guardian.guardian_code)
data = junior_queryset.guardian_code_status.pop(index)
print("data==>", data, '==>', type(data))
junior_queryset.save() junior_queryset.save()
send_notification.delay(ASSOCIATE_REJECTED, guardian.user.id, GUARDIAN, junior_queryset.auth.id) send_notification.delay(ASSOCIATE_REJECTED, guardian.user.id, GUARDIAN, junior_queryset.auth.id)
return custom_response(SUCCESS_CODE['3024'], response_status=status.HTTP_200_OK) return custom_response(SUCCESS_CODE['3024'], response_status=status.HTTP_200_OK)

17
junior/migrations/0030_remove_junior_guardian_code_status.py Normal file
View File

@ -0,0 +1,17 @@
# Generated by Django 4.2.2 on 2023-08-26 08:59
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('junior', '0029_junior_is_deleted'),
]
operations = [
migrations.RemoveField(
model_name='junior',
name='guardian_code_status',
),
]

19
junior/migrations/0031_junior_guardian_code_status.py Normal file
View File

@ -0,0 +1,19 @@
# Generated by Django 4.2.2 on 2023-08-26 08:59
import django.contrib.postgres.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('junior', '0030_remove_junior_guardian_code_status'),
]
operations = [
migrations.AddField(
model_name='junior',
name='guardian_code_status',
field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, default=None, max_length=10, null=True), null=True, size=None),
),
]

6
junior/models.py
View File

@ -76,9 +76,9 @@ class Junior(models.Model):
is_verified = models.BooleanField(default=False) is_verified = models.BooleanField(default=False)
"""guardian code is approved or not""" """guardian code is approved or not"""
guardian_code_approved = models.BooleanField(default=False) guardian_code_approved = models.BooleanField(default=False)
# guardian code status""" # # guardian code status"""
guardian_code_status = models.CharField(max_length=31, choices=GUARDIAN_CODE_STATUS, default='1', guardian_code_status = ArrayField(models.CharField(max_length=10, null=True, blank=True, default=None), null=True,
null=True, blank=True) )
# Profile created and updated time""" # Profile created and updated time"""
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True) updated_at = models.DateTimeField(auto_now=True)

40
junior/serializers.py
View File

@ -92,16 +92,23 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
# condition for guardian code # condition for guardian code
if guardian_code: if guardian_code:
if not junior.guardian_code: if not junior.guardian_code:
print("111111111")
junior.guardian_code = [] junior.guardian_code = []
junior.guardian_code_status = []
junior.guardian_code.extend(guardian_code) junior.guardian_code.extend(guardian_code)
junior.guardian_code_status.extend(str(NUMBER['three']))
elif len(junior.guardian_code) < 3 and len(guardian_code) < 3: elif len(junior.guardian_code) < 3 and len(guardian_code) < 3:
print("2222222222")
junior.guardian_code.extend(guardian_code) junior.guardian_code.extend(guardian_code)
junior.guardian_code_status.extend(str(NUMBER['three']))
else: else:
raise serializers.ValidationError({"error":ERROR_CODE['2081'],"code":"400", "status":"failed"}) raise serializers.ValidationError({"error":ERROR_CODE['2081'],"code":"400", "status":"failed"})
guardian_data = Guardian.objects.filter(guardian_code=guardian_code[0]).last() guardian_data = Guardian.objects.filter(guardian_code=guardian_code[0]).last()
if guardian_data: if guardian_data:
JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior) JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior)
junior.guardian_code_status = str(NUMBER['three']) # print("junior.guardian_code.index(guardian_code)==>",junior.guardian_code.index(guardian_code),'===>',type(junior.guardian_code.index(guardian_code)))
print("junior.guardian_code==>", junior.guardian_code, '===>', type(junior.guardian_code))
junior_approval_mail.delay(user.email, user.first_name) junior_approval_mail.delay(user.email, user.first_name)
send_notification.delay(ASSOCIATE_REQUEST, junior.auth.id, JUNIOR, guardian_data.user.id, {}) send_notification.delay(ASSOCIATE_REQUEST, junior.auth.id, JUNIOR, guardian_data.user.id, {})
@ -296,7 +303,7 @@ class AddJuniorSerializer(serializers.ModelSerializer):
referral_code=generate_code(ZOD, user_data.id), referral_code=generate_code(ZOD, user_data.id),
referral_code_used=guardian_data.referral_code, referral_code_used=guardian_data.referral_code,
is_password_set=False, is_verified=True, is_password_set=False, is_verified=True,
guardian_code_status=GUARDIAN_CODE_STATUS[1][0]) guardian_code_status=[str(NUMBER['two'])])
JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior_data, JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior_data,
relationship=relationship) relationship=relationship)
total_junior = Junior.objects.all().count() total_junior = Junior.objects.all().count()
@ -326,9 +333,18 @@ class RemoveJuniorSerializer(serializers.ModelSerializer):
if instance: if instance:
guardian_code = self.context['guardian_code'] guardian_code = self.context['guardian_code']
instance.is_invited = False instance.is_invited = False
if instance.guardian_code and ('-' in instance.guardian_code):
print("1111111111111")
instance.guardian_code.remove('-')
print("instance.guardian_code==>",instance.guardian_code,'==>',type(instance.guardian_code),'===>',
len(instance.guardian_code))
print("instance.guardian_code_status==>", instance.guardian_code_status, '==>', type(instance.guardian_code_status), '===>',
len(instance.guardian_code_status))
index = instance.guardian_code.index(guardian_code)
print("index==>",index,'==>',type(index))
instance.guardian_code.remove(guardian_code) instance.guardian_code.remove(guardian_code)
if not instance.guardian_code: data = instance.guardian_code_status.pop(index)
instance.guardian_code_status = str(NUMBER['one']) print("data==>", data, '==>', type(data))
instance.save() instance.save()
return instance return instance
@ -506,15 +522,19 @@ class RemoveGuardianCodeSerializer(serializers.ModelSerializer):
def update(self, instance, validated_data): def update(self, instance, validated_data):
guardian_code = self.context['guardian_code'] guardian_code = self.context['guardian_code']
if guardian_code in instance.guardian_code: if guardian_code in instance.guardian_code:
if instance.guardian_code and ('-' in instance.guardian_code):
print("777777777777777")
instance.guardian_code.remove('-')
if instance.guardian_code_status and ('-' in instance.guardian_code_status):
print("666666666666666666666666")
instance.guardian_code_status.remove('-')
index = instance.guardian_code.index(guardian_code)
print("index===>",index,'===>',type(index))
instance.guardian_code.remove(guardian_code) instance.guardian_code.remove(guardian_code)
data = instance.guardian_code_status.pop(index)
print("data===>", data, '===>', type(data))
else: else:
raise serializers.ValidationError({"error":ERROR_CODE['2082'],"code":"400", "status":"failed"}) raise serializers.ValidationError({"error":ERROR_CODE['2082'],"code":"400", "status":"failed"})
if not instance.guardian_code:
instance.guardian_code_status = str(NUMBER['one'])
elif instance.guardian_code and (len(instance.guardian_code) == 1 and '-' in instance.guardian_code):
instance.guardian_code_status = str(NUMBER['one'])
else:
instance.guardian_code_status = str(NUMBER['two'])
instance.save() instance.save()
return instance return instance

16
junior/views.py
View File

@ -99,7 +99,10 @@ class UpdateJuniorProfile(viewsets.ModelViewSet):
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
except Exception as e: except Exception as e:
if e.detail:
error_detail = e.detail.get('error', None) error_detail = e.detail.get('error', None)
else:
error_detail = str(e)
return custom_error_response(error_detail, response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(error_detail, response_status=status.HTTP_400_BAD_REQUEST)
class ValidateGuardianCode(viewsets.ModelViewSet): class ValidateGuardianCode(viewsets.ModelViewSet):
@ -191,7 +194,7 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
return custom_error_response(ERROR_CODE['2077'], response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(ERROR_CODE['2077'], response_status=status.HTTP_400_BAD_REQUEST)
elif not data: elif not data:
return custom_error_response(ERROR_CODE['2076'], response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(ERROR_CODE['2076'], response_status=status.HTTP_400_BAD_REQUEST)
if data == "Max": elif data == "Max":
return custom_error_response(ERROR_CODE['2081'], response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(ERROR_CODE['2081'], response_status=status.HTTP_400_BAD_REQUEST)
return custom_response(SUCCESS_CODE['3021'], response_status=status.HTTP_200_OK) return custom_response(SUCCESS_CODE['3021'], response_status=status.HTTP_200_OK)
# use AddJuniorSerializer serializer # use AddJuniorSerializer serializer
@ -208,6 +211,7 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
junior = Junior.objects.filter(auth__email=self.request.data['email']).first() junior = Junior.objects.filter(auth__email=self.request.data['email']).first()
guardian = Guardian.objects.filter(user=self.request.user).first() guardian = Guardian.objects.filter(user=self.request.user).first()
if junior.guardian_code and ('-' in junior.guardian_code): if junior.guardian_code and ('-' in junior.guardian_code):
print("1111111111111")
junior.guardian_code.remove('-') junior.guardian_code.remove('-')
if not junior: if not junior:
return none return none
@ -219,7 +223,7 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
junior.guardian_code.append(guardian.guardian_code) junior.guardian_code.append(guardian.guardian_code)
else: else:
return "Max" return "Max"
junior.guardian_code_status = str(NUMBER['two']) junior.guardian_code_status = [str(NUMBER['two'])]
junior.save() junior.save()
JuniorGuardianRelationship.objects.get_or_create(guardian=guardian, junior=junior, JuniorGuardianRelationship.objects.get_or_create(guardian=guardian, junior=junior,
relationship=str(self.request.data['relationship'])) relationship=str(self.request.data['relationship']))
@ -736,7 +740,7 @@ class RemoveGuardianCodeAPIView(views.APIView):
permission_classes = [IsAuthenticated] permission_classes = [IsAuthenticated]
def put(self, request, format=None): def put(self, request, format=None):
try: # try:
guardian_code = self.request.data.get("guardian_code") guardian_code = self.request.data.get("guardian_code")
junior_queryset = Junior.objects.filter(auth=self.request.user).last() junior_queryset = Junior.objects.filter(auth=self.request.user).last()
if junior_queryset: if junior_queryset:
@ -751,9 +755,9 @@ class RemoveGuardianCodeAPIView(views.APIView):
else: else:
# task in another state # task in another state
return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
except Exception as e: # except Exception as e:
error_detail = e.detail.get('error', None) # error_detail = e.detail.get('error', None)
return custom_error_response(error_detail, response_status=status.HTTP_400_BAD_REQUEST) # return custom_error_response(error_detail, response_status=status.HTTP_400_BAD_REQUEST)
class FAQViewSet(GenericViewSet, mixins.CreateModelMixin, class FAQViewSet(GenericViewSet, mixins.CreateModelMixin,

52
zod_bank/settings.py
View File

@ -181,32 +181,32 @@ AUTH_PASSWORD_VALIDATORS = [
# database query logs settings # database query logs settings
# Allows us to check db hits # Allows us to check db hits
# useful to optimize db query and hit # useful to optimize db query and hit
LOGGING = { # LOGGING = {
"version": 1, # "version": 1,
"filters": { # "filters": {
"require_debug_true": { # "require_debug_true": {
"()": "django.utils.log.RequireDebugTrue" # "()": "django.utils.log.RequireDebugTrue"
} # }
}, # },
"handlers": { # "handlers": {
"console": { # "console": {
"level": "DEBUG", # "level": "DEBUG",
"filters": [ # "filters": [
"require_debug_true" # "require_debug_true"
], # ],
"class": "logging.StreamHandler" # "class": "logging.StreamHandler"
} # }
}, # },
# database logger # # database logger
"loggers": { # "loggers": {
"django.db.backends": { # "django.db.backends": {
"level": "DEBUG", # "level": "DEBUG",
"handlers": [ # "handlers": [
"console" # "console"
] # ]
} # }
} # }
} # }
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/3.0/topics/i18n/ # https://docs.djangoproject.com/en/3.0/topics/i18n/