From 7f9a91c7c0135d4f87b77c9bbd4f662c671752fb Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 14 Apr 2020 12:52:17 +0200
Subject: [PATCH] settings parameter names unified
---
smash/web/importer/exporter_cron_job.py | 4 ++--
smash/web/importer/importer_cron_job.py | 4 ++--
smash/web/tests/importer/test_exporter_cron_job.py | 6 +++---
smash/web/tests/importer/test_importer_cron_job.py | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/smash/web/importer/exporter_cron_job.py b/smash/web/importer/exporter_cron_job.py
index 1d6d7682..8ea23426 100644
--- a/smash/web/importer/exporter_cron_job.py
+++ b/smash/web/importer/exporter_cron_job.py
@@ -23,14 +23,14 @@ class ExporterCronJob(CronJobBase):
email_title = "Daily export"
email_recipients = getattr(settings, "DEFAULT_FROM_EMAIL", None)
- filename = getattr(settings, "DAILY_EXPORT_FILE", None)
+ filename = getattr(settings, "DAILY_SUBJECT_EXPORT_FILE", None)
if filename is None:
logger.info("Exporting subjects skipped. File not defined ")
return "export file not defined"
logger.info("Exporting subjects from file: " + filename)
try:
- exporter = Exporter(settings.DAILY_EXPORT_FILE)
+ exporter = Exporter(settings.DAILY_SUBJECT_EXPORT_FILE)
exporter.execute()
email_body = exporter.get_summary()
EmailSender().send_email(email_title,
diff --git a/smash/web/importer/importer_cron_job.py b/smash/web/importer/importer_cron_job.py
index 670130d4..9c96971f 100644
--- a/smash/web/importer/importer_cron_job.py
+++ b/smash/web/importer/importer_cron_job.py
@@ -28,7 +28,7 @@ class SubjectImporterCronJob(CronJobBase):
email_title = "Subjects daily import"
email_recipients = getattr(settings, "DEFAULT_FROM_EMAIL", None)
- filename = getattr(settings, "DAILY_IMPORT_FILE", None)
+ filename = getattr(settings, "DAILY_SUBJECT_IMPORT_FILE", None)
if filename is None:
logger.info("Importing subjects skipped. File not defined ")
@@ -40,7 +40,7 @@ class SubjectImporterCronJob(CronJobBase):
email_recipients)
return "import file not found"
try:
- importer = Importer(settings.DAILY_IMPORT_FILE, TnsCsvSubjectImportReader())
+ importer = Importer(settings.DAILY_SUBJECT_IMPORT_FILE, TnsCsvSubjectImportReader())
importer.execute()
email_body = importer.get_summary()
EmailSender().send_email(email_title,
diff --git a/smash/web/tests/importer/test_exporter_cron_job.py b/smash/web/tests/importer/test_exporter_cron_job.py
index d1b44a37..95c09253 100644
--- a/smash/web/tests/importer/test_exporter_cron_job.py
+++ b/smash/web/tests/importer/test_exporter_cron_job.py
@@ -16,10 +16,10 @@ from django_cron.models import CronJobLog
class TestCronJobExporter(TestCase):
def setUp(self):
- setattr(settings, "DAILY_EXPORT_FILE", None)
+ setattr(settings, "DAILY_SUBJECT_EXPORT_FILE", None)
def tearDown(self):
- setattr(settings, "DAILY_EXPORT_FILE", None)
+ setattr(settings, "DAILY_SUBJECT_EXPORT_FILE", None)
def test_import_without_configuration(self):
CronJobLog.objects.all().delete()
@@ -34,7 +34,7 @@ class TestCronJobExporter(TestCase):
def test_import(self):
new_file, tmp = tempfile.mkstemp()
- setattr(settings, "DAILY_EXPORT_FILE", tmp)
+ setattr(settings, "DAILY_SUBJECT_EXPORT_FILE", tmp)
CronJobLog.objects.all().delete()
job = ExporterCronJob()
diff --git a/smash/web/tests/importer/test_importer_cron_job.py b/smash/web/tests/importer/test_importer_cron_job.py
index 861a839e..685d5159 100644
--- a/smash/web/tests/importer/test_importer_cron_job.py
+++ b/smash/web/tests/importer/test_importer_cron_job.py
@@ -18,7 +18,7 @@ from django_cron.models import CronJobLog
class TestCronJobImporter(TestCase):
def tearDown(self):
- setattr(settings, "DAILY_IMPORT_FILE", None)
+ setattr(settings, "DAILY_SUBJECT_IMPORT_FILE", None)
def test_import_without_configuration(self):
CronJobLog.objects.all().delete()
@@ -35,7 +35,7 @@ class TestCronJobImporter(TestCase):
new_file, tmp = tempfile.mkstemp()
copyfile(filename, tmp)
- setattr(settings, "DAILY_IMPORT_FILE", tmp)
+ setattr(settings, "DAILY_SUBJECT_IMPORT_FILE", tmp)
CronJobLog.objects.all().delete()
job = SubjectImporterCronJob()
--
GitLab