chore: Use constants, not literal strings

open-contracting · Aug 30, 2023 · b6ceb03 · b6ceb03
1 parent 4ea5245
commit b6ceb03
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/data_registry/process_manager/process.py b/data_registry/process_manager/process.py
@@ -8,7 +8,7 @@
 from django.utils import timezone
 
 from data_registry.exceptions import RecoverableException
-from data_registry.models import Job, Task
+from data_registry.models import Collection, Job, Task
 from data_registry.process_manager.task.factory import TaskFactory
 from data_registry.process_manager.util import request
 
@@ -141,9 +141,9 @@ def should_be_planned(collection):
             return True
 
         delta = timedelta(days=30)  # MONTHLY
-        if collection.retrieval_frequency == "HALF_YEARLY":
+        if collection.retrieval_frequency == Collection.RetrievalFrequency.HALF_YEARLY:
             delta = timedelta(days=180)
-        elif collection.retrieval_frequency == "ANNUALLY":
+        elif collection.retrieval_frequency == Collection.RetrievalFrequency.ANNUALLY:
             delta = timedelta(days=365)
 
         return date.today() >= (last_job.start + delta).date()

diff --git a/data_registry/templates/detail.html b/data_registry/templates/detail.html
@@ -119,7 +119,7 @@ <h2 class="h4 mb-3">{% translate "Overview" %}</h2>
         <dl class="mb-n2 list-desc-grid">
             <dt>{% translate "Data date range:" %}</dt>
             <dd>{{ job.date_from|date:"M Y" }} - {{ job.date_to|date:"M Y" }}
-                {% if collection.retrieval_frequency == "NEVER" %}
+                {% if collection.retrieval_frequency == never %}
                     ({{ collection.get_retrieval_frequency_display }})
                 {% endif %}
             </dd>
@@ -128,7 +128,7 @@ <h2 class="h4 mb-3">{% translate "Overview" %}</h2>
             <dt>{% translate "Last retrieved:" %}</dt>
             <dd>
                 {{ collection.last_retrieved|date:"M Y" }}
-                {% if collection.retrieval_frequency != "NEVER" %}
+                {% if collection.retrieval_frequency != never %}
                     ({% blocktranslate with retrieval_frequency=collection.get_retrieval_frequency_display.lower %}retrieved {{ retrieval_frequency }}{% endblocktranslate %})
                 {% endif %}
             </dd>

diff --git a/data_registry/templates/search.html b/data_registry/templates/search.html
@@ -147,7 +147,7 @@ <h2>{{ collection.country }}: {{ collection.title }}</h2>
                         <dt>{% translate "Data date range:" %}</dt>
                         <dd>
                             {{ collection.date_from|date:"M Y" }} - {{ collection.date_to|date:"M Y" }}
-                            {% if collection.retrieval_frequency == "NEVER" %}
+                            {% if collection.retrieval_frequency == never %}
                                 ({{ collection.get_retrieval_frequency_display }})
                             {% endif %}
                         </dd>
@@ -156,7 +156,7 @@ <h2>{{ collection.country }}: {{ collection.title }}</h2>
                         <dt>{% translate "Last retrieved:" %}</dt>
                         <dd>
                             {{ collection.last_retrieved|date:"M Y" }}
-                            {% if collection.retrieval_frequency != "NEVER" %}
+                            {% if collection.retrieval_frequency != never %}
                                 ({% blocktranslate with retrieval_frequency=collection.get_retrieval_frequency_display.lower %}retrieved {{ retrieval_frequency }}{% endblocktranslate %})
                             {% endif %}
                         </dd>

diff --git a/data_registry/views.py b/data_registry/views.py
@@ -137,6 +137,7 @@ def facet_counts(qs, key):
         "date_ranges": date_ranges,
         "frequencies": Collection.UpdateFrequency.choices,
         "counts": counts,
+        "never": Collection.RetrievalFrequency.NEVER,
     }
     return render(request, "search.html", context)
 
@@ -152,7 +153,11 @@ def detail(request, id):
     job = collection.job.filter(active=True).first()
     files = Export.get_files(job and job.id)
 
-    return render(request, "detail.html", {"collection": collection, "job": job, "files": files})
+    return render(
+        request,
+        "detail.html",
+        {"collection": collection, "job": job, "files": files, "never": Collection.RetrievalFrequency.NEVER},
+    )
 
 
 @login_required