Exception handling enhancement

tests/integration/api/v1/test_admin_endpoints.py

@@ -23,10 +23,9 @@ class TestAdminAPI:
         response = client.get("/api/v1/admin/users", headers=auth_headers)
 
         assert response.status_code == 403
-        assert (
-            "Access denied" in response.json()["detail"]
-            or "admin" in response.json()["detail"].lower()
-        )
+        data = response.json()
+        assert data["error_code"] == "ADMIN_REQUIRED"
+        assert "Admin privileges required" in data["message"]
 
     def test_toggle_user_status_admin(self, client, admin_headers, test_user):
         """Test admin toggling user status"""
@@ -45,18 +44,35 @@ class TestAdminAPI:
         response = client.put("/api/v1/admin/users/99999/status", headers=admin_headers)
 
         assert response.status_code == 404
-        assert "User not found" in response.json()["detail"]
+        data = response.json()
+        assert data["error_code"] == "USER_NOT_FOUND"
+        assert "User with ID '99999' not found" in data["message"]
 
-    def test_toggle_user_status_cannot_deactivate_self(
+    def test_toggle_user_status_cannot_modify_self(
         self, client, admin_headers, test_admin
     ):
-        """Test that admin cannot deactivate their own account"""
+        """Test that admin cannot modify their own account"""
         response = client.put(
             f"/api/v1/admin/users/{test_admin.id}/status", headers=admin_headers
         )
 
-        assert response.status_code == 400
-        assert "Cannot deactivate your own account" in response.json()["detail"]
+        assert response.status_code == 400  # Business logic error
+        data = response.json()
+        assert data["error_code"] == "CANNOT_MODIFY_SELF"
+        assert "Cannot perform 'deactivate account' on your own account" in data["message"]
+
+    def test_toggle_user_status_cannot_modify_admin(
+        self, client, admin_headers, test_admin, another_admin
+    ):
+        """Test that admin cannot modify another admin"""
+        response = client.put(
+            f"/api/v1/admin/users/{another_admin.id}/status", headers=admin_headers
+        )
+
+        assert response.status_code == 400  # Business logic error
+        data = response.json()
+        assert data["error_code"] == "USER_STATUS_CHANGE_FAILED"
+        assert "Cannot modify another admin user" in data["message"]
 
     def test_get_all_shops_admin(self, client, admin_headers, test_shop):
         """Test admin getting all shops"""
@@ -78,10 +94,8 @@ class TestAdminAPI:
         response = client.get("/api/v1/admin/shops", headers=auth_headers)
 
         assert response.status_code == 403
-        assert (
-            "Access denied" in response.json()["detail"]
-            or "admin" in response.json()["detail"].lower()
-        )
+        data = response.json()
+        assert data["error_code"] == "ADMIN_REQUIRED"
 
     def test_verify_shop_admin(self, client, admin_headers, test_shop):
         """Test admin verifying/unverifying shop"""
@@ -99,7 +113,9 @@ class TestAdminAPI:
         response = client.put("/api/v1/admin/shops/99999/verify", headers=admin_headers)
 
         assert response.status_code == 404
-        assert "Shop not found" in response.json()["detail"]
+        data = response.json()
+        assert data["error_code"] == "SHOP_NOT_FOUND"
+        assert "Shop with ID '99999' not found" in data["message"]
 
     def test_toggle_shop_status_admin(self, client, admin_headers, test_shop):
         """Test admin toggling shop status"""
@@ -117,7 +133,8 @@ class TestAdminAPI:
         response = client.put("/api/v1/admin/shops/99999/status", headers=admin_headers)
 
         assert response.status_code == 404
-        assert "Shop not found" in response.json()["detail"]
+        data = response.json()
+        assert data["error_code"] == "SHOP_NOT_FOUND"
 
     def test_get_marketplace_import_jobs_admin(
         self, client, admin_headers, test_marketplace_job
@@ -159,10 +176,32 @@ class TestAdminAPI:
         )
 
         assert response.status_code == 403
-        assert (
-            "Access denied" in response.json()["detail"]
-            or "admin" in response.json()["detail"].lower()
-        )
+        data = response.json()
+        assert data["error_code"] == "ADMIN_REQUIRED"
+
+    def test_get_user_statistics(self, client, admin_headers):
+        """Test admin getting user statistics"""
+        response = client.get("/api/v1/admin/stats/users", headers=admin_headers)
+
+        assert response.status_code == 200
+        data = response.json()
+        assert "total_users" in data
+        assert "active_users" in data
+        assert "inactive_users" in data
+        assert "activation_rate" in data
+        assert isinstance(data["total_users"], int)
+
+    def test_get_shop_statistics(self, client, admin_headers):
+        """Test admin getting shop statistics"""
+        response = client.get("/api/v1/admin/stats/shops", headers=admin_headers)
+
+        assert response.status_code == 200
+        data = response.json()
+        assert "total_shops" in data
+        assert "active_shops" in data
+        assert "verified_shops" in data
+        assert "verification_rate" in data
+        assert isinstance(data["total_shops"], int)
 
     def test_admin_pagination_users(self, client, admin_headers, test_user, test_admin):
         """Test user pagination works correctly"""