chore: Consolidate timestamp format strings.

openedx · Nov 25, 2024 · 5ed76f0 · 5ed76f0
1 parent 0f5c43c
commit 5ed76f0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/enterprise_catalog/apps/api/v1/views/catalog_csv.py b/enterprise_catalog/apps/api/v1/views/catalog_csv.py
@@ -2,6 +2,8 @@
 import csv
 import time
 
+from enterprise_catalog.apps.catalog.constants import TIMESTAMP_FORMAT
+
 from django.http import StreamingHttpResponse
 from rest_framework.decorators import action
 from rest_framework.generics import GenericAPIView
@@ -110,7 +112,7 @@ def get(self, request, **kwargs):
         if invalid_facets:
             return Response(f'Error: invalid facet(s): {invalid_facets} provided.', status=HTTP_400_BAD_REQUEST)
 
-        filename = f'Enterprise-Catalog-Export-{time.strftime("%Y%m%d%H%M%S")}.csv'
+        filename = f'Enterprise-Catalog-Export-{time.strftime(TIMESTAMP_FORMAT)}.csv'
 
         response = StreamingHttpResponse(
             streaming_content=(self.iter_items(facets, algoliaQuery)),

diff --git a/enterprise_catalog/apps/api/v1/views/catalog_workbook.py b/enterprise_catalog/apps/api/v1/views/catalog_workbook.py
@@ -13,6 +13,7 @@
 from enterprise_catalog.apps.catalog.algolia_utils import (
     get_initialized_algolia_client,
 )
+from enterprise_catalog.apps.catalog.constants import TIMESTAMP_FORMAT
 
 
 logger = logging.getLogger(__name__)
@@ -143,7 +144,7 @@ def get(self, request, **kwargs):
             output,
             content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         )
-        filename = f'Enterprise-Catalog-Export-{time.strftime("%Y%m%d%H%M%S")}.xlsx'
+        filename = f'Enterprise-Catalog-Export-{time.strftime(TIMESTAMP_FORMAT)}.xlsx'
         response['Content-Disposition'] = f'attachment; filename={filename}'
 
         return response
diff --git a/enterprise_catalog/apps/catalog/constants.py b/enterprise_catalog/apps/catalog/constants.py
@@ -5,6 +5,7 @@
     DISABLE_MODEL_ADMIN_CHANGES_SWITCH,
 )
 
+TIMESTAMP_FORMAT = '%Y%m%d%H%M%SZ'
 
 # Algolia timestamp default
 ALGOLIA_DEFAULT_TIMESTAMP = (datetime(3000, 1, 1)).timestamp()

diff --git a/enterprise_catalog/apps/catalog/tests/factories.py b/enterprise_catalog/apps/catalog/tests/factories.py
@@ -10,6 +10,7 @@
     COURSE_RUN,
     LEARNER_PATHWAY,
     PROGRAM,
+    TIMESTAMP_FORMAT,
     json_serialized_course_modes,
 )
 from enterprise_catalog.apps.catalog.models import (
@@ -180,7 +181,7 @@ def _json_metadata(self):
                 'overview': 'Pathway for a data engineer.',
                 'published': True,
                 'visible_via_association': True,
-                'created': datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ'),
+                'created': datetime.datetime.utcnow().strftime(TIMESTAMP_FORMAT),
                 'card_image': {
                     'card': {
                         'url': self.card_image_url,

diff --git a/enterprise_catalog/apps/catalog/tests/test_algolia_utils.py b/enterprise_catalog/apps/catalog/tests/test_algolia_utils.py
@@ -15,6 +15,7 @@
     LEARNER_PATHWAY,
     PROGRAM,
     RESTRICTION_FOR_B2B,
+    t,
 )
 from enterprise_catalog.apps.catalog.tests.factories import (
     ContentMetadataFactory,
@@ -32,7 +33,7 @@
 
 def _days_from_now(days=0):
     deadline = localized_utcnow() + timedelta(days=days)
-    return deadline.strftime('%Y-%m-%dT%H:%M:%SZ')
+    return deadline.strftime(TIMESTMAP_FORMAT)
 
 
 def _get_from_cache(days):