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

fixed guardian reject issue, updated ids in notification method, remove unnecessary condition from analytics and user management

Browse Source
This commit is contained in:
abutalib-kiwi
2023-09-13 18:15:07 +05:30
parent e157e98a17
commit d1a4b86b09
9 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
guardian/serializers.py
View File

@ -243,8 +243,8 @@ class TaskSerializer(serializers.ModelSerializer):
task_data['junior'] = junior
instance = JuniorTask.objects.create(**task_data)
tasks_created.append(instance)
send_notification.delay(TASK_ASSIGNED, guardian.user.id, GUARDIAN,
junior.auth.id, {'task_id': instance.id})
send_notification.delay(TASK_ASSIGNED, guardian.user_id, GUARDIAN,
junior.auth_id, {'task_id': instance.id})
return instance
class GuardianDetailSerializer(serializers.ModelSerializer):
@ -443,8 +443,8 @@ class ApproveTaskSerializer(serializers.ModelSerializer):
# update complete time of task
# instance.completed_on = real_time()
instance.completed_on = timezone.now().astimezone(pytz.utc)
send_notification.delay(TASK_APPROVED, instance.guardian.user.id, GUARDIAN,
junior_details.auth.id, {'task_id': instance.id})
send_notification.delay(TASK_APPROVED, instance.guardian.user_id, GUARDIAN,
junior_details.auth_id, {'task_id': instance.id})
else:
# reject the task
instance.task_status = str(NUMBER['three'])
@ -452,8 +452,8 @@ class ApproveTaskSerializer(serializers.ModelSerializer):
# update reject time of task
# instance.rejected_on = real_time()
instance.rejected_on = timezone.now().astimezone(pytz.utc)
send_notification.delay(TASK_REJECTED, instance.guardian.user.id, GUARDIAN,
junior_details.auth.id, {'task_id': instance.id})
send_notification.delay(TASK_REJECTED, instance.guardian.user_id, GUARDIAN,
junior_details.auth_id, {'task_id': instance.id})
instance.save()
junior_data.save()
return junior_details