appa/call_api/api.py

@@ -68,7 +68,9 @@ def get_record(call_request: CallRequest, logging=True):
             if result['call_result_code'] != call_status.STATUS_1:
                 call_request.call_text_log = result['text_log']
                 call_request.call_result = result['call_result']
-                call_request.request_status = call_request.RequestStatus.COMPLETED
+
+                if result['call_result_code'] not in [call_status.STATUS_14]:
+                    call_request.request_status = call_request.RequestStatus.COMPLETED
 
                 if result['confirmed']:
                     call_request.status = call_request.Status.APPROVED

appa/settings.py

@@ -211,12 +211,12 @@ CELERY_IGNORE_RESULT = True
 CELERYBEAT_SCHEDULE = {
     'update_call_requests_task': {
         'task': 'appa.tasks.update_call_requests_task',
-        'schedule': crontab(hour='8', minute='0'),
+        'schedule': crontab(hour='23', minute='0'),
         'options': {'queue': CELERY_DEFAULT_QUEUE}
     },
     'check_call_requests_task': {
         'task': 'appa.tasks.check_call_requests_task',
-        'schedule': crontab(minute='*/5'),
+        'schedule': crontab(minute='*/1'),
         'options': {'queue': CELERY_DEFAULT_QUEUE}
     }
 }

appa/tasks.py

@@ -10,28 +10,19 @@ from appa.medicine_api import api as medicine_api
 
 @app.task(bind=True, acks_late=True)
 def send_call_request_task(self, ids=None):
-    call_requests = CallRequest.objects.filter(
+    call_requests = CallRequest.objects.filter(is_active=True)
-        id__in=ids,
+    if ids and len(ids) > 0:
-        is_active=True
+        call_requests = call_requests.filter(id__in=ids)
-    ).exclude(
+    else:
-        status__in=[
+        tomorrow = datetime.date.today() + datetime.timedelta(days=1)
-            CallRequest.Status.APPROVED,
-            CallRequest.Status.CANCELED
-        ]
-    )
 
-    for call_request in call_requests:
+        call_requests = CallRequest.objects.filter(
-        call_api.add_call_request(call_request)
+            date=tomorrow,
-
+            status__in=[
-
+                CallRequest.Status.PENDING,
-@app.task(bind=True, acks_late=True)
+                CallRequest.Status.WITHOUT_ANSWER
-def send_daily_call_request_task(self, ids=None):
+            ]
-    tomorrow = datetime.date.today() + datetime.timedelta(days=1)
+        )
-    call_requests = CallRequest.objects.filter(
-        date=tomorrow,
-        status=CallRequest.Status.PENDING,
-        is_active=True
-    )
 
     for call_request in call_requests:
         call_api.add_call_request(call_request)