setop/agenda_culturel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On améliore l'import json

Browse Source 
See #372
This commit is contained in:
Jean-Marie Favreau 2025-04-06 14:58:19 +02:00
parent 05013ecdfb
commit ea19bb9bc0
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/agenda_culturel/celery.py
View File

@ -130,11 +130,12 @@ def import_events_from_json(self, json):
importer = DBImporterEvents(self.request.id) importer = DBImporterEvents(self.request.id)
# try: try:
success, error_message = importer.import_events(json) success, error_message = importer.import_events(json)
close_import_task(self.request.id, success, error_message, importer)
# finally, close task except Exception as e:
close_import_task(self.request.id, success, error_message, importer) logger.error(e)
close_import_task(self.request.id, False, e, importer)
class ChromiumTask(Task): class ChromiumTask(Task):

7
src/agenda_culturel/db_importer.py
View File

@ -1,5 +1,6 @@
import json import json
import logging import logging
from datetime import date
from django.utils import timezone from django.utils import timezone
@ -42,8 +43,8 @@ class DBImporterEvents:
try: try:
structure = json.loads(json_structure) structure = json.loads(json_structure)
except Exception: except Exception as e:
return (False, "JSON file is not correctly structured") return (False, "JSON file is not correctly structured: " + str(e))
if len(structure) == 0: if len(structure) == 0:
return (True, "") return (True, "")
@ -63,6 +64,8 @@ class DBImporterEvents:
if "date" in structure["header"]: if "date" in structure["header"]:
self.date = structure["header"]["date"] self.date = structure["header"]["date"]
else:
self.date = str(date.today())
# get events # get events
for event in structure["events"]: for event in structure["events"]: