Merge pull request #7023 from categulario/fix/badges-not-assigned

badges not assigned

Author: emi420

backend/services/users/user_service.py

@@ -900,9 +900,6 @@ async def check_and_update_mapper_level(
         user = await UserService.get_user_by_id(user_id, db)
         user_level = await MappingLevel.get_by_id(user.mapping_level, db)
 
-        if user_level.id == (await MappingLevel.get_max_level(db)).id:
-            return  # User has achieved the highest level, no need to proceed
-
         async with db.transaction():
             # Update user stats
             if not stats:
@@ -923,9 +920,15 @@ async def check_and_update_mapper_level(
             # Assign levels based on badges
             next_level = await MappingLevel.get_next(user_level.ordering, db)
 
+            if not next_level:
+                return  # User has achieved the highest level, no need to proceed
+
             if await MappingLevel.all_badges_satisfied(next_level.id, user.id, db):
                 if next_level.approvals_required == 0:
                     await user.set_mapping_level(next_level, db)
+                    await UserService.notify_level_upgrade(
+                        user_id, user.username, next_level.name, db
+                    )
                 else:
                     await UserNextLevel.nominate(user.id, next_level.id, db)
 
@@ -950,6 +953,9 @@ async def approve_level(user_id: int, voter_id: int, db: Database):
                 await user.set_mapping_level(requested_level, db)
                 await UserNextLevel.clear(user_id, requested_level.id, db)
                 await UserLevelVote.clear(user_id, requested_level.id, db)
+                await UserService.notify_level_upgrade(
+                    user_id, user.username, requested_level.name, db
+                )
 
     @staticmethod
     async def next_level(user_id: int, db: Database) -> Optional[UserNextLevelDTO]:

tests/api/unit/services/users/test_user_service.py

@@ -186,6 +186,14 @@ async def test_check_and_update_mapper_level_happy_path(self, mock_get):
         new_level = await MappingLevel.get_by_id(user.mapping_level, self.db)
         assert new_level.id == 2
         assert new_level.name == "INTERMEDIATE"
+        # Message is sent
+        message_count = await self.db.execute(
+            "select count(*) from messages where to_user_id = :user_id",
+            {
+                "user_id": self.test_user.id,
+            },
+        )
+        assert message_count == 1
 
     @patch.object(AsyncClient, "get")
     async def test_check_and_update_mapper_level_no_level_upgrade(self, mock_get):
@@ -262,12 +270,49 @@ async def test_check_and_update_mapper_level_max_level(self, mock_get):
                 "result": {
                     "topics": {"changeset": {"value": 2000.0}},
                 },
+                "user": {
+                    "changesets": {"count": 2000.0},
+                },
+            }
+        )
+        mock_get.return_value = mock_response
+        await self.test_user.set_mapping_level(
+            await MappingLevel.get_by_id(3, self.db), self.db
+        )
+
+        # Act
+        await UserService.check_and_update_mapper_level(self.test_user.id, self.db)
+
+        # Assert
+        # no level is upgraded
+        user = await User.get_by_id(self.test_user.id, self.db)
+        new_level = await MappingLevel.get_by_id(user.mapping_level, self.db)
+        assert new_level.id == 3
+        assert new_level.name == "ADVANCED"
+
+    @patch.object(AsyncClient, "get")
+    async def test_check_and_update_mapper_level_assignes_badges_on_top_level(
+        self, mock_get
+    ):
+        # Arrange
+        mock_response = AsyncMock()
+        mock_response.status_code = 200
+        mock_response.json = MagicMock(
+            return_value={
+                "result": {
+                    "topics": {"changeset": {"value": 2000.0}},
+                },
+                "user": {
+                    "changesets": {"count": 251.0},
+                },
             }
         )
         mock_get.return_value = mock_response
         await self.test_user.set_mapping_level(
             await MappingLevel.get_by_id(3, self.db), self.db
         )
+        badges = await MappingBadge.get_related_to_user(self.test_user.id, self.db)
+        assert len(badges) == 0
 
         # Act
         await UserService.check_and_update_mapper_level(self.test_user.id, self.db)
@@ -278,6 +323,9 @@ async def test_check_and_update_mapper_level_max_level(self, mock_get):
         new_level = await MappingLevel.get_by_id(user.mapping_level, self.db)
         assert new_level.id == 3
         assert new_level.name == "ADVANCED"
+        # The badge is assigned
+        badges = await MappingBadge.get_related_to_user(self.test_user.id, self.db)
+        assert len(badges) == 1
 
     @patch.object(AsyncClient, "get")
     async def test_get_user_dto_by_username(self, mock_get):
@@ -378,6 +426,14 @@ async def test_approve_level(self):
         )
         # votes are cleared
         assert await UserLevelVote.count(self.test_user.id, level.id, self.db) == 0
+        # Message is sent
+        message_count = await self.db.execute(
+            "select count(*) from messages where to_user_id = :user_id",
+            {
+                "user_id": self.test_user.id,
+            },
+        )
+        assert message_count == 1
 
     async def test_next_level(self):
         next_level = await UserService.next_level(self.test_user.id, self.db)