On nettoie le code
This commit is contained in:
parent
18ca7200a0
commit
ca205c5ccd
@ -1200,8 +1200,6 @@ class Event(models.Model):
|
||||
max_date = None
|
||||
uuids = set()
|
||||
|
||||
logger.warning("===================== 000")
|
||||
|
||||
# for each event, check if it's a new one, or a one to be updated
|
||||
for event in events:
|
||||
sdate = date.fromisoformat(event.start_day)
|
||||
@ -1225,9 +1223,7 @@ class Event(models.Model):
|
||||
# check if the event has already be imported (using uuid)
|
||||
same_events = event.find_same_events_by_uuid()
|
||||
|
||||
logger.warning("===================== A")
|
||||
if len(same_events) != 0:
|
||||
logger.warning("===================== B")
|
||||
# check if one event has been imported and not modified in this list
|
||||
same_imported = Event.find_last_pure_import(same_events)
|
||||
|
||||
@ -1235,18 +1231,15 @@ class Event(models.Model):
|
||||
if not same_imported:
|
||||
for e in same_events:
|
||||
if event.similar(e):
|
||||
logger.warning("===================== C")
|
||||
same_imported = e
|
||||
break
|
||||
|
||||
if same_imported:
|
||||
logger.warning("===================== D")
|
||||
# reopen DuplicatedEvents if required
|
||||
if not event.similar(same_imported) and same_imported.other_versions:
|
||||
if same_imported.status != Event.STATUS.TRASH:
|
||||
if same_imported.other_versions.is_published():
|
||||
if same_imported.other_versions.representative != same_imported:
|
||||
logger.warning("===================== E")
|
||||
same_imported.other_versions.representative = None
|
||||
same_imported.other_versions.save()
|
||||
|
||||
@ -1255,7 +1248,6 @@ class Event(models.Model):
|
||||
same_imported.prepare_save()
|
||||
to_update.append(same_imported)
|
||||
else:
|
||||
logger.warning("===================== F")
|
||||
# otherwise, the new event possibly a duplication of the remaining others.
|
||||
|
||||
# check if it should be published
|
||||
@ -1266,7 +1258,6 @@ class Event(models.Model):
|
||||
# it will be imported
|
||||
to_import.append(event)
|
||||
else:
|
||||
logger.warning("===================== G")
|
||||
# if uuid is unique (or not available), check for similar events
|
||||
similar_events = event.find_similar_events()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user