Refactored to check trial when running scheduled job

app/celery/scheduled_tasks.py

@@ -39,7 +39,7 @@ from app.notifications.process_notifications import send_notification_to_queue
 from app.statsd_decorators import statsd
 from app.celery.tasks import process_job
 from app.config import QueueNames, TaskNames
-from app.utils import convert_utc_to_bst
+from app.utils import convert_utc_to_bst, get_unrestricted_letter_ids
 
 
 @notify_celery.task(name="remove_csv_files")
@@ -308,9 +308,14 @@ def populate_monthly_billing():
 @statsd(namespace="tasks")
 def run_letter_jobs():
     job_ids = dao_get_letter_job_ids_by_status(JOB_STATUS_READY_TO_SEND)
-    notify_celery.send_task(
-        name=TaskNames.DVLA_FILES,
-        args=(job_ids,),
-        queue=QueueNames.PROCESS_FTP
-    )
-    current_app.logger.info("Queued {} ready letter job ids onto {}".format(len(job_ids), QueueNames.PROCESS_FTP))
+
+    unrestricted_job_ids = get_unrestricted_letter_ids(job_ids)
+
+    if unrestricted_job_ids:
+        notify_celery.send_task(
+            name=TaskNames.DVLA_FILES,
+            args=(unrestricted_job_ids,),
+            queue=QueueNames.PROCESS_FTP
+        )
+    current_app.logger.info(
+        "Queued {} ready letter job ids onto {}".format(len(unrestricted_job_ids), QueueNames.PROCESS_FTP))

app/celery/tasks.py

@@ -75,7 +75,7 @@ def process_job(job_id):
 
     db_template = dao_get_template_by_id(job.template_id, job.template_version)
 
-    if db_template.template_type == LETTER_TYPE and service.restricted:
+    if db_template.template_type == LETTER_TYPE and job.service.restricted:
         job.job_status = JOB_STATUS_ERROR
         dao_update_job(job)
         current_app.logger.warn(
@@ -97,9 +97,9 @@ def process_job(job_id):
             update_job_to_sent_to_dvla.apply_async([str(job.id)], queue=QueueNames.RESEARCH_MODE)
         else:
             build_dvla_file.apply_async([str(job.id)], queue=QueueNames.JOBS)
-        # temporary logging
-        current_app.logger.info("send job {} to build-dvla-file in the {} queue".format(
-            job_id, QueueNames.JOBS if not service.research_mode else QueueNames.RESEARCH_MODE))
+            # temporary logging
+            current_app.logger.info("send job {} to build-dvla-file in the {} queue".format(
+                job_id, QueueNames.JOBS))
     else:
         job.job_status = JOB_STATUS_FINISHED
 

app/letters/rest.py

@@ -8,6 +8,7 @@ from app.schemas import job_schema
 from app.v2.errors import register_errors
 from app.letters.letter_schemas import letter_job_ids
 from app.schema_validation import validate
+from app.utils import get_unrestricted_letter_ids
 
 letter_job = Blueprint("letter-job", __name__)
 register_errors(letter_job)
@@ -16,7 +17,11 @@ register_errors(letter_job)
 @letter_job.route('/send-letter-jobs', methods=['POST'])
 def send_letter_jobs():
     job_ids = validate(request.get_json(), letter_job_ids)
-    notify_celery.send_task(name=TaskNames.DVLA_FILES, args=(job_ids['job_ids'],), queue=QueueNames.PROCESS_FTP)
+
+    unrestricted_job_ids = get_unrestricted_letter_ids(job_ids['job_ids'])
+
+    notify_celery.send_task(
+        name=TaskNames.DVLA_FILES, args=(unrestricted_job_ids,), queue=QueueNames.PROCESS_FTP)
 
     return jsonify(data={"response": "Task created to send files to DVLA"}), 201
 

app/utils.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 
 import pytz
-from flask import url_for
+from flask import current_app, url_for
 from sqlalchemy import func
 from notifications_utils.template import SMSMessageTemplate, PlainTextEmailTemplate, LetterPreviewTemplate
 
@@ -86,3 +86,31 @@ def get_public_notify_type_text(notify_type, plural=False):
         notify_type_text = 'text message'
 
     return '{}{}'.format(notify_type_text, 's' if plural else '')
+
+
+def get_unrestricted_letter_ids(job_ids):
+    from app.dao.jobs_dao import (
+        dao_get_job_by_id,
+        dao_update_job
+    )
+
+    from app.models import (LETTER_TYPE, JOB_STATUS_ERROR)
+    from app.dao.templates_dao import dao_get_template_by_id
+
+    unrestricted_job_ids = []
+
+    for job_id in job_ids:
+        job = dao_get_job_by_id(job_id)
+
+        template = dao_get_template_by_id(job.template_id, job.template_version)
+
+        if template.template_type == LETTER_TYPE:
+            if job.service.restricted:
+                job.job_status = JOB_STATUS_ERROR
+                dao_update_job(job)
+                current_app.logger.warn(
+                    "Job {} has been set to error, service {} is in trial mode".format(job.id, job.service.id))
+            else:
+                unrestricted_job_ids.append(job_id)
+
+    return unrestricted_job_ids