テストを若干修正

tests/repositories/test_projects_repository.py

@@ -3,11 +3,16 @@ import sys
 import types
 import unittest
 
+from pydantic import ValidationError
+
 ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
 if ROOT not in sys.path:
     sys.path.insert(0, ROOT)
 
+from app.repositories.projects_repository import ProjectsRepository
+
 if "psycopg" not in sys.modules:
+    print("Stubbing psycopg and psycopg_pool modules for testing")
     psycopg_stub = types.ModuleType("psycopg")
 
     class Connection:  # noqa: D401 - ダミークラス
@@ -49,6 +54,7 @@ if "psycopg" not in sys.modules:
     sys.modules["psycopg_pool"] = pool_stub
 
 if "dotenv" not in sys.modules:
+    print("Stubbing dotenv module for testing")
     dotenv_stub = types.ModuleType("dotenv")
 
     def load_dotenv(*args, **kwargs):  # pragma: no cover
@@ -58,9 +64,6 @@ if "dotenv" not in sys.modules:
     sys.modules["dotenv"] = dotenv_stub
 
 
-from app.repositories.projects_repository import ProjectsRepository
-
-
 class ProjectsRepositoryTestCase(unittest.TestCase):
     def test_transform_row_maps_database_columns_to_api_keys(self):
         repo = ProjectsRepository()
@@ -93,22 +96,18 @@ class ProjectsRepositoryTestCase(unittest.TestCase):
 
         api_row = repo._transform_row(db_row)
 
-        self.assertEqual(api_row["projectId"], "100")
-        self.assertEqual(api_row["circleName"], "Circle A")
-        self.assertEqual(api_row["category"], "展示")
-        self.assertTrue(api_row["firstDay"])
-        self.assertIsNone(api_row["optionalImageName1"])
+        self.assertEqual(api_row.projectId, "100")
+        self.assertEqual(api_row.circleName, "Circle A")
+        self.assertEqual(api_row.category, "展示")
+        self.assertTrue(api_row.firstDay)
+        self.assertIsNone(api_row.optionalImageName1)
 
     def test_transform_row_handles_missing_columns(self):
         repo = ProjectsRepository()
         db_row = {"project_id": "200"}
 
-        api_row = repo._transform_row(db_row)
-
-        self.assertEqual(api_row["projectId"], "200")
-        # 欠けているカラムは None になる
-        self.assertIsNone(api_row["circleName"])
-        self.assertIsNone(api_row["description"])
+        # 必須フィールドが欠けているため、ValidationError が発生するはず
+        self.assertRaises(ValidationError, lambda: repo._transform_row(db_row))
 
 
 if __name__ == "__main__":

tests/services/test_projects_service.py

@@ -7,9 +7,13 @@ ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
 if ROOT not in sys.path:
     sys.path.insert(0, ROOT)
 
+from app.services.projects_service import ProjectsService
+from schemas.projects import Project
 
 if "psycopg" not in sys.modules:  # psycopg が未インストールでも読み込みできるようにする
+    print("psycopg not found, using stub")
     psycopg_stub = types.ModuleType("psycopg")
+
     class Connection:  # noqa: D401 - ダミークラス
         """psycopg.Connection のスタブ"""
 
@@ -49,6 +53,7 @@ if "psycopg" not in sys.modules:  # psycopg が未インストールでも読み
     sys.modules["psycopg_pool"] = pool_stub
 
 if "dotenv" not in sys.modules:
+    print("dotenv not found, using stub")
     dotenv_stub = types.ModuleType("dotenv")
 
     def load_dotenv(*args, **kwargs):  # pragma: no cover - テストで副作用なし
@@ -58,33 +63,42 @@ if "dotenv" not in sys.modules:
     sys.modules["dotenv"] = dotenv_stub
 
 
-from app.services.projects_service import ProjectsService
-
-
 class FakeProjectsRepository:
-    def __init__(self, projects=None):
-        if projects is None:
-            projects = [
-                {
-                    "projectId": "100",
-                    "circleName": "Circle A",
-                    "name": "Project A",
-                }
-            ]
+    def __init__(self):
+        p = {
+            "projectId": "100",
+            "circleName": "Circle A",
+            "circleNameKana": "サークルエー",
+            "name": "Project A",
+            "category": "展示",
+            "firstDay": True,
+            "secondDay": False,
+            "thirdDay": True,
+            "location": "Room 1",
+            "description": "Description",
+            "prComment": "PR",
+            "prCommentLong": "Long PR",
+            "note": None,
+            "imageName": "img.png",
+            "optionalImageName1": None,
+            "optionalImageName2": None,
+            "optionalImageName3": None,
+            "optionalImageName4": None,
+            "optionalImageName5": None,
+            "urlX": "https://x.com",
+            "urlInstagram": None,
+            "urlOfficialWebsite": None,
+            "urlYoutube": None,
+            "urlOthers": None,
+        }
+        projects = [Project(**p)]
         self._projects = projects
         self.list_calls = 0
         self.get_calls = 0
 
     def list_projects(self):
         self.list_calls += 1
-        return [dict(item) for item in self._projects]
-
-    def get_project(self, project_id):
-        self.get_calls += 1
-        for item in self._projects:
-            if item["projectId"] == project_id:
-                return dict(item)
-        return None
+        return [item.model_copy() for item in self._projects]
 
 
 class ProjectsServiceTestCase(unittest.TestCase):
@@ -106,28 +120,27 @@ class ProjectsServiceTestCase(unittest.TestCase):
         service = ProjectsService(repo, cache_ttl_seconds=60)
 
         cached = service.list_projects()
-        cached[0]["name"] = "mutated"
+        cached[0].name = "modified"
         fresh = service.list_projects()
 
-        self.assertNotEqual(cached[0]["name"], fresh[0]["name"])
+        self.assertNotEqual(cached[0].name, fresh[0].name)
 
     def test_get_project_returns_none_when_not_found(self):
-        repo = FakeProjectsRepository(projects=[])
+        repo = FakeProjectsRepository()
         service = ProjectsService(repo)
 
-        self.assertIsNone(service.get_project("missing"))
-        self.assertEqual(repo.get_calls, 1)
+        self.assertIsNone(service.get_project(project_id="missing"))
 
     def test_get_project_returns_copy(self):
         repo = FakeProjectsRepository()
         service = ProjectsService(repo)
 
-        project = service.get_project("100")
+        project = service.get_project(project_id="100")
         self.assertIsNotNone(project)
-        project["name"] = "mutated"
+        project.name = "modified"
 
-        again = service.get_project("100")
-        self.assertEqual(again["name"], "Project A")
+        again = service.get_project(project_id="100")
+        self.assertEqual(again.name, "Project A")
 
 
 if __name__ == "__main__":