Merge branch 'xyc/dev_skills' into xyq/skill_market

Author: xuyaqist

backend/database/skill_db.py

@@ -352,11 +352,12 @@ def delete_skill(skill_name: str, updated_by: Optional[str] = None) -> bool:
         updated_by: User ID of the user performing the delete
 
     Returns:
-        True if deleted successfully
+        True if deleted successfully, False if skill not found or already deleted
     """
     with get_db_session() as session:
         skill = session.query(SkillInfo).filter(
-            SkillInfo.skill_name == skill_name
+            SkillInfo.skill_name == skill_name,
+            SkillInfo.delete_flag != 'Y'
         ).first()
 
         if not skill:

test/backend/database/test_skill_db.py

@@ -1699,6 +1699,26 @@ def test_delete_skill_without_updated_by(self, monkeypatch, mock_session):
 
         assert result is True
 
+    def test_delete_skill_already_deleted(self, monkeypatch, mock_session):
+        """Test deleting a skill that is already deleted returns False."""
+        session, query = mock_session
+
+        mock_first = MagicMock()
+        mock_first.return_value = None
+        mock_filter = MagicMock()
+        mock_filter.first = mock_first
+        query.filter.return_value = mock_filter
+
+        mock_ctx = MagicMock()
+        mock_ctx.__enter__.return_value = session
+        mock_ctx.__exit__.return_value = None
+        monkeypatch.setattr(
+            "backend.database.skill_db.get_db_session", lambda: mock_ctx)
+
+        result = delete_skill('already_deleted_skill')
+
+        assert result is False
+
 
 # ===== get_tool_names_by_ids Tests =====