Merge pull request #36 from QRTaxi/yj

feat: success 후 cancel 시 메시지 전송

call/consumers/receive_consumers.py

@@ -22,3 +22,6 @@ def send_message(self, event):
  'driver_id': driver_id,
  'assign_id': assign_id,
  })
+
+ def cancel(self, event_dict):
+ self.send_json(event_dict)

call/models/assign.py

@@ -45,7 +45,18 @@ def websocket_message(instance: Assign, created: bool):
  "type": message_type,
  "assign_id": assign_pk,
  })
-
+
+ if instance.status == 'cancel' and instance.driver_id:
+ message_type = "cancel"
+ instance.channel_layer_group_send(
+ "drivers",
+ {
+ "assign_id": assign_pk,
+ "driver_id": instance.driver_id.id,
+ "type": message_type,
+ }
+ )
+
 def call__on_post_save(instance: Assign, created: bool, **kwargs):
  websocket_message(instance, created)
 

call/services/call_cancel_service.py

@@ -1,4 +1,5 @@
 from call.models import Assign
+from driver.models import CustomDriver
 from rest_framework import exceptions
 
 def cancel_call(cancel_call_data):
@@ -10,6 +11,10 @@ def cancel_call(cancel_call_data):
  get_assign_info = Assign.objects.get(id=assign_id)
  get_assign_info.status = 'cancel'
  get_assign_info.save(update_fields=['status'])
+ if get_assign_info.driver_id is not None:
+ driver = get_assign_info.driver_id
+ get_driver_info = CustomDriver.objects.get(id=driver.id)
+ get_driver_info.is_able = True
+ get_driver_info.save(update_fields=['is_able'])
  except Assign.DoesNotExist:
- raise exceptions.NotFound("해당 데이터를 찾을 수 없습니다.")
-
+ raise exceptions.NotFound("해당 데이터를 찾을 수 없습니다.")