DAILY_VISIT_IMPORT_FILE and DAILY_VISIT_EXPORT_FILE moved to configuration option

smash/web/importer/exporter_cron_job.py

@@ -7,7 +7,8 @@ from django.conf import settings
 from django_cron import CronJobBase, Schedule
 
 from web.models import ConfigurationItem
-from web.models.constants import CRON_JOB_TIMEOUT, DEFAULT_FROM_EMAIL, DAILY_SUBJECT_EXPORT_FILE
+from web.models.constants import CRON_JOB_TIMEOUT, DEFAULT_FROM_EMAIL, DAILY_SUBJECT_EXPORT_FILE, \
+    DAILY_VISIT_EXPORT_FILE
 from web.smash_email import EmailSender
 from .exporter import SubjectExporter, VisitExporter
 
@@ -26,7 +27,7 @@ class SubjectExporterCronJob(CronJobBase):
 
         filename = ConfigurationItem.objects.get(type=DAILY_SUBJECT_EXPORT_FILE).value
 
-        if filename is None:
+        if filename is None or filename == '':
             logger.info("Exporting subjects skipped. File not defined ")
             return "export file not defined"
         logger.info("Exporting subjects to file: " + filename)
@@ -57,9 +58,9 @@ class VisitExporterCronJob(CronJobBase):
         email_title = "Daily visit export"
         email_recipients = ConfigurationItem.objects.get(type=DEFAULT_FROM_EMAIL).value
 
-        filename = getattr(settings, "DAILY_VISIT_EXPORT_FILE", None)
+        filename = ConfigurationItem.objects.get(type=DAILY_VISIT_EXPORT_FILE).value
 
-        if filename is None:
+        if filename is None or filename == '':
             logger.info("Exporting visit skipped. File not defined ")
             return "export file not defined"
         logger.info("Exporting visits to file: " + filename)

smash/web/importer/importer_cron_job.py

@@ -10,7 +10,8 @@ from django.conf import settings
 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
+from web.models.constants import CRON_JOB_TIMEOUT, DEFAULT_FROM_EMAIL, DAILY_SUBJECT_IMPORT_FILE, \
+    DAILY_VISIT_IMPORT_FILE
 from web.smash_email import EmailSender
 from .csv_tns_subject_import_reader import TnsCsvSubjectImportReader
 from .csv_tns_visit_import_reader import TnsCsvVisitImportReader
@@ -73,9 +74,9 @@ class VisitImporterCronJob(CronJobBase):
         email_title = "Visits daily import"
         email_recipients = ConfigurationItem.objects.get(type=DEFAULT_FROM_EMAIL).value
 
-        filename = getattr(settings, "DAILY_VISIT_IMPORT_FILE", None)
+        filename = ConfigurationItem.objects.get(type=DAILY_VISIT_IMPORT_FILE).value
 
-        if filename is None:
+        if filename is None or filename == '':
             logger.info("Importing visits skipped. File not defined ")
             return "import file not defined"
         logger.info("Importing visits from file: " + filename)

smash/web/migrations/0176_configurationitem_local_setting_clean.py

@@ -2,7 +2,8 @@
 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
+from web.models.constants import DEFAULT_FROM_EMAIL, DAILY_SUBJECT_IMPORT_FILE, DAILY_SUBJECT_EXPORT_FILE, \
+    DAILY_VISIT_IMPORT_FILE, DAILY_VISIT_EXPORT_FILE
 
 
 def create_item(apps, item_type, value, name):
@@ -30,6 +31,14 @@ def configuration_items(apps, schema_editor):
     subject_export_file = getattr(settings, "DAILY_SUBJECT_EXPORT_FILE", '')
     create_item(apps, DAILY_SUBJECT_EXPORT_FILE, subject_export_file, "File used to export subjects automatically")
 
+    visit_import_file = getattr(settings, "DAILY_VISIT_IMPORT_FILE", '')
+    create_item(apps, DAILY_VISIT_IMPORT_FILE, visit_import_file, "File used to import visits automatically")
+
+    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")
+
+
+
 
 class Migration(migrations.Migration):
     dependencies = [

smash/web/models/constants.py

@@ -59,6 +59,8 @@ VIRUS_EMAIL_HOUR_CONFIGURATION_TYPE = "VIRUS_EMAIL_HOUR_CONFIGURATION_TYPE"
 DEFAULT_FROM_EMAIL = "DEFAULT_FROM_EMAIL"
 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"
 
 RED_CAP_LANGUAGE_4_FIELD_TYPE = 'RED_CAP_LANGUAGE_4_FIELD_TYPE'
 RED_CAP_LANGUAGE_3_FIELD_TYPE = 'RED_CAP_LANGUAGE_3_FIELD_TYPE'