From b0aef2b63d6bd5058392e8ba7bd9680dba60c8a8 Mon Sep 17 00:00:00 2001 From: William Palin Date: Tue, 3 Dec 2024 16:19:51 -0500 Subject: [PATCH 1/2] fix(opinion_page.views): Update sponsorship timeframe --- cl/opinion_page/views.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/cl/opinion_page/views.py b/cl/opinion_page/views.py index 38e129ef5f..652d81fb00 100644 --- a/cl/opinion_page/views.py +++ b/cl/opinion_page/views.py @@ -888,12 +888,14 @@ async def view_opinion_old( )[:3] # Identify opinions updated/added in partnership with v|lex for 3 years - sponsored = False - if ( - cluster.date_created.date() > datetime.datetime(2022, 6, 1).date() - and cluster.filepath_json_harvard - ): - sponsored = True + three_years_ago = (datetime.now() - timedelta(days=3 * 365)).date() + date_created = cluster.date_created.date() + sponsored = ( + datetime(2022, 6, 1).date() + <= date_created + <= datetime(2024, 1, 31).date() + and date_created > three_years_ago + ) view_authorities_url = reverse( "view_case_authorities", args=[cluster.pk, cluster.slug] @@ -1003,12 +1005,14 @@ async def setup_opinion_context( note_form = NoteForm(instance=note) # Identify opinions updated/added in partnership with v|lex for 3 years - sponsored = False - if ( - cluster.date_created.date() > datetime.datetime(2022, 6, 1).date() - and cluster.filepath_json_harvard - ): - sponsored = True + three_years_ago = (datetime.now() - timedelta(days=3 * 365)).date() + date_created = cluster.date_created.date() + sponsored = ( + datetime(2022, 6, 1).date() + <= date_created + <= datetime(2024, 1, 31).date() + and date_created > three_years_ago + ) context = { "tab": tab, From c2bd19465f66cd8df11a7253f27102d688e99434 Mon Sep 17 00:00:00 2001 From: William Palin Date: Tue, 3 Dec 2024 16:24:40 -0500 Subject: [PATCH 2/2] fix(opinion_page.views): Lint/import error --- cl/opinion_page/views.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cl/opinion_page/views.py b/cl/opinion_page/views.py index 652d81fb00..fc45ff0a4e 100644 --- a/cl/opinion_page/views.py +++ b/cl/opinion_page/views.py @@ -1,5 +1,6 @@ import datetime from collections import OrderedDict, defaultdict +from datetime import timedelta from http import HTTPStatus from typing import Any, Dict, Union from urllib.parse import urlencode @@ -888,12 +889,14 @@ async def view_opinion_old( )[:3] # Identify opinions updated/added in partnership with v|lex for 3 years - three_years_ago = (datetime.now() - timedelta(days=3 * 365)).date() + three_years_ago = ( + datetime.datetime.now() - timedelta(days=3 * 365) + ).date() date_created = cluster.date_created.date() sponsored = ( - datetime(2022, 6, 1).date() + datetime.datetime(2022, 6, 1).date() <= date_created - <= datetime(2024, 1, 31).date() + <= datetime.datetime(2024, 1, 31).date() and date_created > three_years_ago ) @@ -1005,12 +1008,14 @@ async def setup_opinion_context( note_form = NoteForm(instance=note) # Identify opinions updated/added in partnership with v|lex for 3 years - three_years_ago = (datetime.now() - timedelta(days=3 * 365)).date() + three_years_ago = ( + datetime.datetime.now() - timedelta(days=3 * 365) + ).date() date_created = cluster.date_created.date() sponsored = ( - datetime(2022, 6, 1).date() + datetime.datetime(2022, 6, 1).date() <= date_created - <= datetime(2024, 1, 31).date() + <= datetime.datetime(2024, 1, 31).date() and date_created > three_years_ago )