fix: move record_user_activity to top-level import and into both branches in rating_service (closes #16)

- Move deferred `from app.services.user_activity_service import record_user_activity` to module-level import in rating_service.py
- Move the record_user_activity try/except call inside both the if (update) and else (insert) branches so a future early return cannot silently skip activity tracking
- Add `test_rate_video_user_activity_failure_does_not_break` test that patches record_user_activity to raise and asserts the rating call still succeeds and returns a valid Rating object

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: pmcfadin

app/services/rating_service.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from datetime import datetime, timezone
 from typing import Optional, List, Dict, Any
 from uuid import UUID
@@ -18,8 +19,11 @@
 from app.models.video import VideoID, VideoStatusEnum
 from app.models.user import User
 from app.services import video_service
+from app.services.user_activity_service import record_user_activity
 from astrapy.exceptions.data_api_exceptions import DataAPIResponseException
 
+logger = logging.getLogger(__name__)
+
 RATINGS_TABLE_NAME = video_service.VIDEO_RATINGS_TABLE_NAME  # "video_ratings_by_user"
 RATINGS_SUMMARY_TABLE_NAME = video_service.VIDEO_RATINGS_SUMMARY_TABLE_NAME
 
@@ -112,6 +116,16 @@ async def rate_video(
             createdAt=created_at,
             updatedAt=now,
         )
+        # Track in user_activity (never fail the rating operation)
+        try:
+            await record_user_activity(
+                userid=current_user.userid,
+                activity_type="rate",
+            )
+        except Exception:
+            logger.debug(
+                "user_activity insert failed for rate; ignoring", exc_info=True
+            )
     else:
         rating_obj = Rating(
             videoId=video_id,
@@ -127,6 +141,16 @@ async def rate_video(
             "rating_date": now,
         }
         await db_table.insert_one(document=insert_doc)
+        # Track in user_activity (never fail the rating operation)
+        try:
+            await record_user_activity(
+                userid=current_user.userid,
+                activity_type="rate",
+            )
+        except Exception:
+            logger.debug(
+                "user_activity insert failed for rate; ignoring", exc_info=True
+            )
 
     # update aggregate
     await _update_video_aggregate_rating(

tests/services/test_rating_service.py

@@ -64,6 +64,158 @@ async def test_rate_video_new(viewer_user: User):
         ratings_tbl.insert_one.assert_called_once()
 
 
+@pytest.mark.asyncio
+async def test_rate_video_user_activity_failure_does_not_break(viewer_user: User):
+    """If user_activity insert fails, the rating still succeeds."""
+    video_id = uuid4()
+    req = RatingCreateOrUpdateRequest(rating=4)
+
+    ready_video = Video(
+        videoid=video_id,
+        userid=uuid4(),
+        added_date=datetime.now(timezone.utc),
+        name="Title",
+        location="http://a.b/c.mp4",
+        location_type=0,
+        status=VideoStatusEnum.READY,
+        title="Title",
+    )
+
+    with (
+        patch(
+            "app.services.rating_service.video_service.get_video_by_id",
+            new_callable=AsyncMock,
+        ) as mock_get_vid,
+        patch(
+            "app.services.rating_service.get_table", new_callable=AsyncMock
+        ) as mock_get_table,
+        patch(
+            "app.services.rating_service.record_user_activity",
+            new_callable=AsyncMock,
+            side_effect=Exception("DB error"),
+        ) as mock_record,
+    ):
+        mock_get_vid.return_value = ready_video
+        ratings_tbl = AsyncMock()
+        videos_tbl = AsyncMock()
+        mock_get_table.side_effect = [videos_tbl]
+        ratings_tbl.find_one.return_value = None
+        ratings_tbl.insert_one.return_value = {}
+        ratings_tbl.find = MagicMock(return_value=[])
+
+        result = await rating_service.rate_video(video_id, req, viewer_user, db_table=ratings_tbl)
+        assert result.rating == 4
+        ratings_tbl.insert_one.assert_called_once()
+        mock_record.assert_awaited_once()
+
+
+@pytest.mark.asyncio
+async def test_rate_video_new_calls_record_user_activity(viewer_user: User):
+    """New rating triggers record_user_activity with activity_type='rate'."""
+    video_id = uuid4()
+    req = RatingCreateOrUpdateRequest(rating=4)
+
+    ready_video = Video(
+        videoid=video_id,
+        userid=uuid4(),
+        added_date=datetime.now(timezone.utc),
+        name="Title",
+        location="http://a.b/c.mp4",
+        location_type=0,
+        status=VideoStatusEnum.READY,
+        title="Title",
+    )
+
+    with (
+        patch(
+            "app.services.rating_service.video_service.get_video_by_id",
+            new_callable=AsyncMock,
+        ) as mock_get_vid,
+        patch(
+            "app.services.rating_service.get_table", new_callable=AsyncMock
+        ) as mock_get_table,
+        patch(
+            "app.services.user_activity_service.get_table", new_callable=AsyncMock
+        ) as mock_ua_get_table,
+    ):
+        mock_get_vid.return_value = ready_video
+        ratings_tbl = AsyncMock()
+        videos_tbl = AsyncMock()
+        mock_get_table.side_effect = [ratings_tbl, videos_tbl]
+
+        ratings_tbl.find_one.return_value = None
+        ratings_tbl.insert_one.return_value = {}
+        ratings_tbl.find = MagicMock(return_value=[])
+
+        mock_ua_table = AsyncMock()
+        mock_ua_get_table.return_value = mock_ua_table
+
+        await rating_service.rate_video(video_id, req, viewer_user, db_table=ratings_tbl)
+
+        mock_ua_table.insert_one.assert_awaited_once()
+        doc = mock_ua_table.insert_one.call_args.args[0] if mock_ua_table.insert_one.call_args.args else mock_ua_table.insert_one.call_args.kwargs
+        assert doc["userid"] == str(viewer_user.userid)
+        assert doc["activity_type"] == "rate"
+
+
+@pytest.mark.asyncio
+async def test_rate_video_update_calls_record_user_activity(viewer_user: User):
+    """Updated rating also triggers record_user_activity."""
+    video_id = uuid4()
+    req = RatingCreateOrUpdateRequest(rating=5)
+
+    ready_video = Video(
+        videoid=video_id,
+        userid=uuid4(),
+        added_date=datetime.now(timezone.utc),
+        name="Title",
+        location="http://a.b/c.mp4",
+        location_type=0,
+        status=VideoStatusEnum.READY,
+        title="Title",
+    )
+
+    existing_doc = {
+        "videoid": str(video_id),
+        "userid": str(viewer_user.userid),
+        "rating": 3,
+        "rating_date": datetime.now(timezone.utc),
+    }
+
+    with (
+        patch(
+            "app.services.rating_service.video_service.get_video_by_id",
+            new_callable=AsyncMock,
+        ) as mock_get_vid,
+        patch(
+            "app.services.rating_service.get_table", new_callable=AsyncMock
+        ) as mock_get_table,
+        patch(
+            "app.services.rating_service._update_video_aggregate_rating",
+            new_callable=AsyncMock,
+        ) as mock_update_agg,
+        patch(
+            "app.services.user_activity_service.get_table", new_callable=AsyncMock
+        ) as mock_ua_get_table,
+    ):
+        mock_get_vid.return_value = ready_video
+        ratings_tbl = AsyncMock()
+        videos_tbl = AsyncMock()
+        mock_get_table.side_effect = [ratings_tbl, videos_tbl]
+
+        ratings_tbl.find_one.return_value = existing_doc
+        ratings_tbl.update_one.return_value = {}
+
+        mock_ua_table = AsyncMock()
+        mock_ua_get_table.return_value = mock_ua_table
+
+        await rating_service.rate_video(video_id, req, viewer_user, db_table=ratings_tbl)
+
+        mock_ua_table.insert_one.assert_awaited_once()
+        doc = mock_ua_table.insert_one.call_args.args[0] if mock_ua_table.insert_one.call_args.args else mock_ua_table.insert_one.call_args.kwargs
+        assert doc["activity_type"] == "rate"
+
+
 # ---------------------------------------------------------------------------
 # Existing rating update
 # ---------------------------------------------------------------------------