Skip to content
Snippets Groups Projects
Commit 90887b18 authored by Olivier Le Brouster's avatar Olivier Le Brouster
Browse files

enhance: refactor deletion code

parent ad844dc4
No related branches found
No related tags found
No related merge requests found
......@@ -112,26 +112,25 @@ class Command(BaseCommand):
def _delete_event(self, wrapper, estim_event, until):
event = getattr(estim_event, 'event', None)
reason = None
if event is None:
reason = 'event not found'
elif not wrapper.has_to_keep(event):
reason = 'not kept'
elif estim_event.data_hash not in wrapper.valid_hashes(event, until):
reason = 'modified event'
if reason is not None:
try:
wrapper.remove(estim_event, production=not self.dry_run)
except EstimEventTemporaryError, e:
estim_event.status = EstimEvent.STATUS_TEMPORARY_ERROR
estim_event.message = force_text(e)[:1024]
self._warning('* TEMPORARY ERROR ON DELETION: {} - {} - {} [{}]'.format(event.pk, estim_event.key['date_debut'], event, estim_event.data_hash))
estim_event.save()
self._warning('* TEMPORARY ERROR ON DELETION ({}): {} - {} - {} [{}]'.format(reason, event.pk, estim_event.key['date_debut'], event, estim_event.data_hash))
self._warning(' %s' % estim_event.message)
else:
self._info('* DELETION (event not found) {} [{}]'.format(estim_event, estim_event.data_hash))
return
if not wrapper.has_to_keep(event):
wrapper.remove(estim_event, production=not self.dry_run)
self._info('* DELETION (not kept): {} - {} - {} [{}]'.format(event.pk, estim_event.key['date_debut'], event, estim_event.data_hash))
return
if estim_event.data_hash not in wrapper.valid_hashes(event, until):
wrapper.remove(estim_event, production=not self.dry_run)
self._info('* DELETION (modified event): {} - {} - {} [{}]'.format(event.pk, estim_event.key['date_debut'], event, estim_event.data_hash))
self._info('* DELETION ({}) {} [{}]'.format(reason, estim_event, estim_event.data_hash))
return
self._notice('* KEPT: {} - {} - {} [{}]'.format(event.pk, estim_event.key['date_debut'], event, estim_event.data_hash))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment