SUBJECT_IMPORT_RUN_AT changed to configuration option

smash/web/importer/importer_cron_job.py

@@ -11,7 +11,7 @@ from django_cron import CronJobBase, Schedule
 
 from web.models import ConfigurationItem
 from web.models.constants import CRON_JOB_TIMEOUT, DEFAULT_FROM_EMAIL, DAILY_SUBJECT_IMPORT_FILE, \
-    DAILY_VISIT_IMPORT_FILE
+    DAILY_VISIT_IMPORT_FILE, SUBJECT_IMPORT_RUN_AT
 from web.smash_email import EmailSender
 from .csv_tns_subject_import_reader import TnsCsvSubjectImportReader
 from .csv_tns_visit_import_reader import TnsCsvVisitImportReader
@@ -21,7 +21,10 @@ logger = logging.getLogger(__name__)
 
 
 class SubjectImporterCronJob(CronJobBase):
-    RUN_AT_TIMES = getattr(settings, "SUBJECT_IMPORT_RUN_AT", ['23:45'])
+    item = ConfigurationItem.objects.filter(type=SUBJECT_IMPORT_RUN_AT).first()
+    RUN_AT_TIMES = []
+    if item is not None:
+        RUN_AT_TIMES = item.value.split(';')
     schedule = Schedule(run_at_times=RUN_AT_TIMES)
     code = 'web.import_subjects_daily_job'  # a unique code
 

smash/web/migrations/0176_configurationitem_local_setting_clean.py

@@ -3,7 +3,7 @@ from django.conf import settings
 from django.db import migrations
 
 from web.models.constants import DEFAULT_FROM_EMAIL, DAILY_SUBJECT_IMPORT_FILE, DAILY_SUBJECT_EXPORT_FILE, \
-    DAILY_VISIT_IMPORT_FILE, DAILY_VISIT_EXPORT_FILE
+    DAILY_VISIT_IMPORT_FILE, DAILY_VISIT_EXPORT_FILE, SUBJECT_IMPORT_RUN_AT
 
 
 def create_item(apps, item_type, value, name):
@@ -37,7 +37,9 @@ def configuration_items(apps, schema_editor):
     visit_export_file = getattr(settings, "DAILY_VISIT_EXPORT_FILE", '')
     create_item(apps, DAILY_VISIT_EXPORT_FILE, visit_export_file, "File used to export visits automatically")
 
-
+    subject_import_run_at_times = getattr(settings, "SUBJECT_IMPORT_RUN_AT", ['23:45'])
+    create_item(apps, SUBJECT_IMPORT_RUN_AT, ';'.join(subject_import_run_at_times),
+                "At what times should the subject importer run")
 
 
 class Migration(migrations.Migration):

smash/web/models/constants.py

@@ -61,6 +61,7 @@ DAILY_SUBJECT_IMPORT_FILE = "DAILY_SUBJECT_IMPORT_FILE"
 DAILY_SUBJECT_EXPORT_FILE = "DAILY_SUBJECT_EXPORT_FILE"
 DAILY_VISIT_IMPORT_FILE = "DAILY_VISIT_IMPORT_FILE"
 DAILY_VISIT_EXPORT_FILE = "DAILY_VISIT_EXPORT_FILE"
+SUBJECT_IMPORT_RUN_AT = "SUBJECT_IMPORT_RUN_AT"
 
 RED_CAP_LANGUAGE_4_FIELD_TYPE = 'RED_CAP_LANGUAGE_4_FIELD_TYPE'
 RED_CAP_LANGUAGE_3_FIELD_TYPE = 'RED_CAP_LANGUAGE_3_FIELD_TYPE'