From ea19bb9bc0bad49f6429c03d263a25fddb9c813f Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sun, 6 Apr 2025 14:58:19 +0200 Subject: [PATCH] =?UTF-8?q?On=20am=C3=A9liore=20l'import=20json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See #372 --- src/agenda_culturel/celery.py | 11 ++++++----- src/agenda_culturel/db_importer.py | 7 +++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/agenda_culturel/celery.py b/src/agenda_culturel/celery.py index 900cb10..9008707 100644 --- a/src/agenda_culturel/celery.py +++ b/src/agenda_culturel/celery.py @@ -130,11 +130,12 @@ def import_events_from_json(self, json): importer = DBImporterEvents(self.request.id) - # try: - success, error_message = importer.import_events(json) - - # finally, close task - close_import_task(self.request.id, success, error_message, importer) + try: + success, error_message = importer.import_events(json) + close_import_task(self.request.id, success, error_message, importer) + except Exception as e: + logger.error(e) + close_import_task(self.request.id, False, e, importer) class ChromiumTask(Task): diff --git a/src/agenda_culturel/db_importer.py b/src/agenda_culturel/db_importer.py index e6b6193..6dd3ed6 100644 --- a/src/agenda_culturel/db_importer.py +++ b/src/agenda_culturel/db_importer.py @@ -1,5 +1,6 @@ import json import logging +from datetime import date from django.utils import timezone @@ -42,8 +43,8 @@ class DBImporterEvents: try: structure = json.loads(json_structure) - except Exception: - return (False, "JSON file is not correctly structured") + except Exception as e: + return (False, "JSON file is not correctly structured: " + str(e)) if len(structure) == 0: return (True, "") @@ -63,6 +64,8 @@ class DBImporterEvents: if "date" in structure["header"]: self.date = structure["header"]["date"] + else: + self.date = str(date.today()) # get events for event in structure["events"]: