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

check answer api fixed

Browse Source
This commit is contained in:
abutalib-kiwi
2023-09-08 16:41:59 +05:30
parent 1e97d7bd6b
commit 4a554272a0
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
junior/views.py
View File

@ -643,10 +643,10 @@ class CheckAnswerAPIView(viewsets.ModelViewSet):
answer_id = self.request.GET.get('answer_id') answer_id = self.request.GET.get('answer_id')
current_page = self.request.GET.get('current_page') current_page = self.request.GET.get('current_page')
queryset = self.get_queryset() queryset = self.get_queryset()
submit_ans = SurveyOption.objects.filter(id=answer_id, is_answer=True).last() submit_ans = SurveyOption.objects.filter(id=answer_id).last()
junior_article_points = JuniorArticlePoints.objects.filter(junior__auth=self.request.user, junior_article_points = JuniorArticlePoints.objects.filter(junior__auth=self.request.user,
question=queryset) question=queryset)
if submit_ans: if submit_ans.is_answer:
junior_article_points.update(submitted_answer=submit_ans, is_attempt=True, is_answer_correct=True) junior_article_points.update(submitted_answer=submit_ans, is_attempt=True, is_answer_correct=True)
JuniorPoints.objects.filter(junior__auth=self.request.user).update(total_points= JuniorPoints.objects.filter(junior__auth=self.request.user).update(total_points=
F('total_points') + queryset.points) F('total_points') + queryset.points)

6
notifications/utils.py
View File

@ -104,7 +104,6 @@ def send_notification(notification_type, from_user_id, from_user_type, to_user_i
notification_data, push_data, from_user, to_user = get_notification_data(notification_type, from_user_id, notification_data, push_data, from_user, to_user = get_notification_data(notification_type, from_user_id,
from_user_type, to_user_id, extra_data) from_user_type, to_user_id, extra_data)
user_notification_type = UserNotification.objects.filter(user=to_user).first() user_notification_type = UserNotification.objects.filter(user=to_user).first()
notification_data.update({'badge': Notification.objects.filter(notification_to=to_user, is_read=False).count()})
Notification.objects.create(notification_type=notification_type, notification_from=from_user, Notification.objects.create(notification_type=notification_type, notification_from=from_user,
notification_to=to_user, data=notification_data) notification_to=to_user, data=notification_data)
if user_notification_type and user_notification_type.push_notification: if user_notification_type and user_notification_type.push_notification:
@ -139,13 +138,10 @@ def send_notification_multiple_user(notification_type, from_user_id, from_user_t
notification_list = [] notification_list = []
for user in to_user_list: for user in to_user_list:
notification_copy_data = notification_data.copy()
notification_copy_data.update(
{'badge': Notification.objects.filter(notification_to=user, is_read=False).count()})
notification_list.append(Notification(notification_type=notification_type, notification_list.append(Notification(notification_type=notification_type,
notification_to=user, notification_to=user,
notification_from=from_user, notification_from=from_user,
data=notification_copy_data)) data=notification_data))
Notification.objects.bulk_create(notification_list) Notification.objects.bulk_create(notification_list)
to_user_list = to_user_list.filter(user_notification__push_notification=True) to_user_list = to_user_list.filter(user_notification__push_notification=True)
send_multiple_push(to_user_list, push_data) send_multiple_push(to_user_list, push_data)