From 4f2af094648c5e81b7773e1acd3b085ed23b0461 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Wed, 30 Oct 2024 14:19:39 +0100 Subject: [PATCH] Refactoring --- src/agenda_culturel/models.py | 15 +++++++-------- src/agenda_culturel/views.py | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index 92c593d..b9333de 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -1632,14 +1632,13 @@ class CategorisationRule(models.Model): # all rules are applied, starting from the first to the last def apply_rules(event): - rules = CategorisationRule.objects.all().order_by("weight", "pk") - - for rule in rules: - if rule.match(event): - event.category = rule.category - return 1 - - return 0 + c = CategorisationRule.get_category_from_rules(event) + + if c is None: + return 0 + else: + event.category = c + return 1 def get_category_from_rules(event): rules = CategorisationRule.objects.all().order_by("weight", "pk") diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index 9a20ccd..aba6d32 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -1749,14 +1749,14 @@ def apply_categorisation_rules(request): messages.success( request, _( - "The rules were successfully applied and 1 event was categorised." + "The rules were successfully applied and 1 event with default category was categorised." ), ) else: messages.success( request, _( - "The rules were successfully applied and {} events were categorised." + "The rules were successfully applied and {} events with default category were categorised." ).format(nb), ) else: