Merge pull request #34 from uktrade/HOTFIX/date-formatting-default-sort

Sorts by most recent on page load, fixes date formats
uktrade · Oct 18, 2024 · 567ec5b · 567ec5b
2 parents 7dc8d1b + 31475b5
commit 567ec5b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/orp/orp_search/public_gateway.py b/orp/orp_search/public_gateway.py
@@ -131,6 +131,11 @@ def search(self, config: SearchDocumentConfig):
                 )
             ]
 
+            # Format dates in the DataFrame
+            filtered_df["date_modified"] = pd.to_datetime(
+                filtered_df["date_modified"], format="%d/%m/%Y"
+            )
+
             # If config.publisher_terms is not None, then add filter
             # for publisher in filtered_df
             if config.publisher_terms is not None:
@@ -154,27 +159,21 @@ def search(self, config: SearchDocumentConfig):
                     )
                 ]
 
-            if config.sort_by is None:
-                results = filtered_df.to_dict(orient="records")
-                # logger.info("filtered data: %s", results)
-                return results
+            # if config.sort_by is None:
+            #     results = filtered_df.to_dict(orient="records")
+            #     # logger.info("filtered data: %s", results)
+            #     return results
 
-            sorted_df = None
-
-            if config.sort_by == "recent":
-                # Sort the DataFrame by 'date_modified' in descending order
-                # Ensure 'date_modified' is in datetime format
-                filtered_df["date_modified"] = pd.to_datetime(
-                    filtered_df["date_modified"], format="%d/%m/%Y"
-                )
+            # sorted_df = None
 
+            if config.sort_by == "recent" or config.sort_by is None:
                 # Sort the DataFrame by 'date_modified' in descending order
                 sorted_df = filtered_df.sort_values(
                     by="date_modified", ascending=False
                 )
             elif config.sort_by == "relevance":
                 # Calculate relevance score
-                # (based on the number of keywords found)
+
                 def calculate_relevance(row, search_terms):
                     def score_text(text, terms):
                         text_processed = text.replace(" ", "").lower()

diff --git a/orp/orp_search/templates/orp.html b/orp/orp_search/templates/orp.html
@@ -262,7 +262,7 @@ <h2 class="govuk-heading-m">
                 Published by: {{ result.publisher}}
               </p>
               <p class="govuk-body-s orp-secondary-text-colour">
-                Last updated: {{ result.date_modified }}
+                Last updated: {{ result.date_modified | date:"j F Y" }}
               </p>
               <ul class="govuk-list orp-topics-list">
                 {% for topic in result.regulatory_topics %}