Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion accounts/tasks.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
from celery import shared_task
from .models import CustomerUser
from .models import CustomerUser, SMSAuthenticate

@shared_task
def reset_no_show_num():
CustomerUser.objects.update(no_show_num=0)
return "All no_show_num values reset to 0"

@shared_task
def reset_bad_sms_count():
SMSAuthenticate.objects.all().update(bad_sms_count=0)
return "All bad sms values reset to 0"
7 changes: 7 additions & 0 deletions booth/tasks.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from celery import shared_task
from .models import Booth

@shared_task
def reset_no_show_num():
Booth.objects.exclude(operating_status='not_started').update(operating_status='finished')
return "All operating_status reset to finished"
82 changes: 41 additions & 41 deletions waiting/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -723,47 +723,47 @@ def confirm_waiting(self, request, pk=None):
except Exception as e:
print("WebSocket send error (cancel):", str(e))

entered_user_waitings = Waiting.objects.filter(user = waiting.user, waiting_status="waiting")
for w in entered_user_waitings:
w.waiting_status = "canceled"
w.save()

waiting_team_cnt = Waiting.objects.filter(booth=w.booth, waiting_status='waiting').count()
entering_team_cnt = Waiting.objects.filter(booth=w.booth, waiting_status='entering').count()
entered_team_cnt = Waiting.objects.filter(booth=w.booth, waiting_status='entered').count()
canceled_team_cnt = (Waiting.objects.filter(booth=w.booth, waiting_status='canceled').count() +
Waiting.objects.filter(booth=w.booth, waiting_status='time_over').count())

try:
channel_layer = get_channel_layer()
admin_group_name = f"booth_{w.booth.booth_id}_admin"
async_to_sync(channel_layer.group_send)(
admin_group_name,
{
'type': 'send_to_admin',
'status': 'success',
'message': '사용자가 대기를 취소했습니다.',
'code': 200,
'data': {
'waiting_id': w.waiting_id,
'waiting_status': w.waiting_status,
'booth_info': {
'waiting_team_cnt': waiting_team_cnt,
'entering_team_cnt': entering_team_cnt,
'entered_team_cnt': entered_team_cnt,
'canceled_team_cnt': canceled_team_cnt
}
}
}
)
except Exception as e:
print("WebSocket send error (cancel):", str(e))

sms_status_2 = "입장 준비해주세요."
self.sms_sending(w.booth, sms_status_2)

# serializer = WaitingDetailSerializer(waiting)
# print(serializer.data)
# entered_user_waitings = Waiting.objects.filter(user = waiting.user, waiting_status="waiting")
# for w in entered_user_waitings:
# w.waiting_status = "canceled"
# w.save()

# waiting_team_cnt = Waiting.objects.filter(booth=w.booth, waiting_status='waiting').count()
# entering_team_cnt = Waiting.objects.filter(booth=w.booth, waiting_status='entering').count()
# entered_team_cnt = Waiting.objects.filter(booth=w.booth, waiting_status='entered').count()
# canceled_team_cnt = (Waiting.objects.filter(booth=w.booth, waiting_status='canceled').count() +
# Waiting.objects.filter(booth=w.booth, waiting_status='time_over').count())

# try:
# channel_layer = get_channel_layer()
# admin_group_name = f"booth_{w.booth.booth_id}_admin"
# async_to_sync(channel_layer.group_send)(
# admin_group_name,
# {
# 'type': 'send_to_admin',
# 'status': 'success',
# 'message': '사용자가 대기를 취소했습니다.',
# 'code': 200,
# 'data': {
# 'waiting_id': w.waiting_id,
# 'waiting_status': w.waiting_status,
# 'booth_info': {
# 'waiting_team_cnt': waiting_team_cnt,
# 'entering_team_cnt': entering_team_cnt,
# 'entered_team_cnt': entered_team_cnt,
# 'canceled_team_cnt': canceled_team_cnt
# }
# }
# }
# )
# except Exception as e:
# print("WebSocket send error (cancel):", str(e))

# sms_status_2 = "입장 준비해주세요."
# self.sms_sending(w.booth, sms_status_2)

# # serializer = WaitingDetailSerializer(waiting)
# # print(serializer.data)
return custom_response(
data=None,
message="대기가 입장되었습니다.",
Expand Down