fix popular search (#2436)

Author: abeglova

learning_resources/etl/posthog.py

@@ -14,6 +14,7 @@
 
 from learning_resources.exceptions import PostHogAuthenticationError, PostHogQueryError
 from learning_resources.models import LearningResource, LearningResourceViewEvent
+from learning_resources.utils import resource_upserted_actions
 
 log = logging.getLogger(__name__)
 
@@ -275,4 +276,13 @@ def load_posthog_lrd_view_events(
     List of LearningResourceViewEvent
     """
 
-    return [load_posthog_lrd_view_event(event) for event in events]
+    events = [load_posthog_lrd_view_event(event) for event in events]
+    learning_resource_ids = {
+        event.learning_resource_id for event in events if event is not None
+    }
+
+    for resource_id in learning_resource_ids:
+        learning_resource = LearningResource.objects.get(id=resource_id)
+        resource_upserted_actions(learning_resource, percolate=False)
+
+    return events

learning_resources/etl/posthog_test.py

@@ -10,13 +10,14 @@
 from faker import Faker
 
 from learning_resources.etl import posthog
-from learning_resources.models import LearningResourceViewEvent
+from learning_resources.factories import LearningResourceFactory
+from learning_resources.models import LearningResource, LearningResourceViewEvent
 from main.test_utils import MockResponse
 
 fake = Faker()
 
 
-def generate_fake_posthog_lr_properties():
+def generate_fake_posthog_lr_properties(learning_resource):
     """
     Generate a fake set of properties for a PostHog event.
 
@@ -27,16 +28,16 @@ def generate_fake_posthog_lr_properties():
 
     return json.dumps(
         {
-            "resourceType": fake.word(ext_word_list=["course", "program", "video"]),
+            "resourceType": learning_resource.resource_type,
             "platformCode": random.randrange(0, 9999),  # noqa: S311
-            "resourceId": random.randrange(0, 9999),  # noqa: S311
+            "resourceId": learning_resource.id,
             "readableId": str(uuid.uuid4()),
             "event_date": fake.date_time().isoformat(),
         }
     )
 
 
-def generate_fake_posthog_query_event(**kwargs):
+def generate_fake_posthog_query_event(learning_resource=None, **kwargs):
     """
     Generate a fake PostHog query event.
 
@@ -47,11 +48,14 @@ def generate_fake_posthog_query_event(**kwargs):
     """
 
     # datetimes here are all naive because this is what PostHog returns.
-
+    if learning_resource is None:
+        learning_resource = LearningResourceFactory.create()
     return [
         kwargs.get("uuid", str(uuid.uuid4())),
         kwargs.get("event", ""),
-        kwargs.get("properties", generate_fake_posthog_lr_properties()),
+        kwargs.get(
+            "properties", generate_fake_posthog_lr_properties(learning_resource)
+        ),
         kwargs.get("timestamp", datetime.now().isoformat()),  # noqa: DTZ005
         kwargs.get("distinct_id", ""),
         kwargs.get("elements_chain", ""),
@@ -68,6 +72,7 @@ def generate_fake_posthog_query_event(**kwargs):
 
 def generate_hogql_query_result(result_count: int = 5):
     """Return a faked-out HogQL result."""
+    learning_resource = LearningResourceFactory.create()
 
     return {
         "clickhouse": "",
@@ -98,7 +103,10 @@ def generate_hogql_query_result(result_count: int = 5):
         },
         "offset": None,
         "query": None,
-        "results": [generate_fake_posthog_query_event() for _ in range(result_count)],
+        "results": [
+            generate_fake_posthog_query_event(learning_resource)
+            for _ in range(result_count)
+        ],
         "timings": [],
         "types": [],
     }
@@ -111,6 +119,7 @@ def hogql_query_result():
     return generate_hogql_query_result()
 
 
+@pytest.mark.django_db
 @pytest.mark.parametrize(
     "skip_setting", [[None], ["ph_api_key"], ["ph_root_endpoint"], ["ph_project_id"]]
 )
@@ -245,10 +254,21 @@ def load_posthog_lrd_view_events(mocker):
 
     mocker.patch("requests.post", side_effect=api_call_results)
 
+    upsert_mock = mocker.patch(
+        "learning_resources.etl.posthog.resource_upserted_actions",
+        autospec=True,
+    )
     posthog_events = posthog.posthog_extract_lrd_view_events()
 
     lr_events = posthog.posthog_transform_lrd_view_events(posthog_events)
 
     stored_events = load_posthog_lrd_view_events(lr_events)
 
     assert LearningResourceViewEvent.objects.count() == len(stored_events)
+    learning_resource_ids = [
+        event.learning_resource_id for event in stored_events if event is not None
+    ]
+    learning_resource_ids = set(learning_resource_ids)
+    for resource_id in learning_resource_ids:
+        learning_resource = LearningResource.objects.get(id=resource_id)
+        upsert_mock.assert_any_call(learning_resource, percolate=False)

learning_resources/management/commands/load_posthog_lrd_view_events.py

@@ -2,8 +2,8 @@
 
 from django.core.management import BaseCommand
 
-from learning_resources.etl.pipelines import posthog_etl
 from learning_resources.models import LearningResourceViewEvent
+from learning_resources.tasks import get_learning_resource_views
 
 
 class Command(BaseCommand):
@@ -16,7 +16,8 @@ def handle(self, *args, **kwargs):  # noqa: ARG002
 
         self.stdout.write("Running the ETL pipeline...")
 
-        posthog_etl()
+        task = get_learning_resource_views.delay()
+        task.get()
 
         ev_count = LearningResourceViewEvent.objects.count()
 

learning_resources/models.py

@@ -515,9 +515,7 @@ def next_run(self) -> Optional["LearningResourceRun"]:
     @cached_property
     def views_count(self) -> int:
         """Return the number of views for the resource."""
-        return models.LearningResourceViewEvent.objects.filter(
-            learning_resource=self
-        ).count()
+        return LearningResourceViewEvent.objects.filter(learning_resource=self).count()
 
     @cached_property
     def user_list_parents(self) -> list["LearningResourceRelationship"]:

learning_resources/tasks.py

@@ -421,6 +421,7 @@ def get_learning_resource_views():
     """Load learning resource views from the PostHog ETL."""
 
     pipelines.posthog_etl()
+    clear_search_cache()
 
 
 @app.task(acks_late=True)

learning_resources_search/constants.py

@@ -122,6 +122,7 @@ class FilterConfig:
             "name": {"type": "keyword"},
         },
     },
+    "views": {"type": "integer"},
     "pace": {
         "type": "nested",
         "properties": {