Merge pull request internetarchive#11070 from jimchamp/10971/bug/subject-carousel-date-filtering

Fix date filtering for main subject page carousel

Author: mekarpeles

openlibrary/plugins/openlibrary/js/carousel/Carousel.js

@@ -154,7 +154,8 @@ export class Carousel {
             pageMode: loadMore.pageMode,
             hasFulltextOnly: loadMore.hasFulltextOnly,
             secondaryAction: loadMore.secondaryAction,
-            key: loadMore.key
+            key: loadMore.key,
+            ...loadMore.extraParams
         });
         this.appendLoadingSlide();
         $.ajax({url: url, type: 'GET'})

openlibrary/plugins/openlibrary/partials.py

@@ -14,7 +14,10 @@
 from openlibrary.plugins.openlibrary.lists import get_user_lists
 from openlibrary.plugins.upstream.checkins import get_reading_goals
 from openlibrary.plugins.worksearch.code import do_search, work_search
-from openlibrary.plugins.worksearch.subjects import get_subject
+from openlibrary.plugins.worksearch.subjects import (
+    date_range_to_publish_year_filter,
+    get_subject,
+)
 from openlibrary.views.loanstats import get_trending_books
 
 
@@ -189,8 +192,12 @@ def _do_subjects_query(self, params: dict) -> list:
         pseudoKey = params.get("q", "")
         offset = int(params.get("page", 1))
         limit = int(params.get("limit", 18))
+        published_in = params.get("published_in", "")
+        publish_year = date_range_to_publish_year_filter(published_in)
 
-        subject = get_subject(pseudoKey, offset=offset, limit=limit)
+        subject = get_subject(
+            pseudoKey, offset=offset, limit=limit, publish_year=publish_year
+        )
         return subject.get("works", [])
 
 

openlibrary/plugins/worksearch/subjects.py

@@ -112,16 +112,10 @@ def GET(self, key):
         if i.get('has_fulltext') == 'true':
             filters['has_fulltext'] = 'true'
 
-        if i.get('published_in'):
-            if '-' in i.published_in:
-                begin, end = i.published_in.split('-', 1)
-
-                if safeint(begin, None) is not None and safeint(end, None) is not None:
-                    filters['publish_year'] = f'[{begin} TO {end}]'
-            else:
-                y = safeint(i.published_in, None)
-                if y is not None:
-                    filters['publish_year'] = i.published_in
+        if publish_year_filter := date_range_to_publish_year_filter(
+            i.get('published_in')
+        ):
+            filters['publish_year'] = publish_year_filter
 
         subject_results = get_subject(
             key,
@@ -142,6 +136,19 @@ def process_key(self, key):
         return key
 
 
+def date_range_to_publish_year_filter(published_in: str) -> str:
+    if published_in:
+        if '-' in published_in:
+            begin, end = published_in.split('-', 1)
+            if safeint(begin, None) is not None and safeint(end, None) is not None:
+                return f'[{begin} TO {end}]'
+        else:
+            year = safeint(published_in, None)
+            if year is not None:
+                return published_in
+    return ''
+
+
 SubjectType = Literal["subject", "place", "person", "time"]
 
 SubjectPseudoKey = str