統合されたテキスト情報の取得方法を実装し、SQLクエリとリポジトリのロジックを更新

SQL_IMPLEMENTATION.md

@@ -75,3 +75,12 @@ model ProjectMaterialUpdateRequest {
 }
 ```
 
+# 修正
+## query.sqlの変更
+現状，最終的にSQLによって得られるカラムのうち，「description」「prSummary」「prDetail」「remark」ですが，これをProjectTextテーブルから取ってきています。現状のようにdescriptionカラムとdescriptionUpdatesカラムの2種類にするのではなく，ProjectTextテーブルとProjectMaterialUpdateRequestテーブルを左結合し，ProjectMaterialUpdateRequestに対応するエントリがない場合はupdateStatusをnullにしてSQLの結果としてください。つまり，descriptionカラムとdescriptionUpdatesカラムを統合し，descriptionUpdatesカラム1本にしてください。prSummary, prDetail, remarkでも同様です。
+
+## projects_repository.pyの変更
+`app/repositories/projects_repository.py`内の`_transform_row`においては，以下の優先順位で採用してdescription, prSummary, ...としてください。
+1. updateStatus="APPROVED"のうち最新のもの
+2. updateStatus=nullで最新のもの
+なお，方針としては，created_atの降順で並び替え，順に見ていき見つかれば採用すると良いでしょう。

app/repositories/projects_repository.py

@@ -80,24 +80,42 @@ class ProjectsRepository:
                     items.append(item)
             return items
 
-        def _resolve_text(default_key: str, updates_key: str) -> str | None:
+        def _resolve_text_from_updates(updates_key: str) -> str | None:
             updates = sorted(
                 _coerce_dict_list(row.get(updates_key)),
-                key=lambda item: item.get("createdAt") or "",
+                key=lambda item: str(item.get("createdAt") or ""),
                 reverse=True,
             )
+
             for update in updates:
                 status = update.get("updateStatus")
-                if isinstance(status, str) and status.upper() == "APPROVED":
+                normalized_status = (
+                    status.strip().upper() if isinstance(status, str) else None
+                )
+                if normalized_status == "APPROVED":
                     content = update.get("content")
                     if isinstance(content, str):
                         return content
-            return row.get(default_key)
 
-        description_value = _resolve_text("description", "descriptionUpdates")
-        pr_summary_value = _resolve_text("prSummary", "prSummaryUpdates")
-        pr_detail_value = _resolve_text("prDetail", "prDetailUpdates")
-        remark_value = _resolve_text("remark", "remarkUpdates")
+            for update in updates:
+                status = update.get("updateStatus")
+                if status is None:
+                    content = update.get("content")
+                    if isinstance(content, str):
+                        return content
+                if isinstance(status, str):
+                    stripped = status.strip().upper()
+                    if stripped in ("", "NULL"):
+                        content = update.get("content")
+                        if isinstance(content, str):
+                            return content
+
+            return None
+
+        description_value = _resolve_text_from_updates("descriptionUpdates")
+        pr_summary_value = _resolve_text_from_updates("prSummaryUpdates")
+        pr_detail_value = _resolve_text_from_updates("prDetailUpdates")
+        remark_value = _resolve_text_from_updates("remarkUpdates")
 
         return Project(
             projectId=row["projectId"],

app/repositories/query.sql

@@ -9,10 +9,6 @@ SELECT
   cp.`secondDay` AS `day2`,
   cp.`thirdDay` AS `day3`,
   cp.location AS `location`,
-  texts.description AS `description`,
-  texts.prSummary AS `prSummary`,
-  texts.prDetail AS `prDetail`,
-  texts.remark AS `remark`,
   COALESCE(textUpdates.descriptionUpdates, '[]') AS `descriptionUpdates`,
   COALESCE(textUpdates.prSummaryUpdates, '[]') AS `prSummaryUpdates`,
   COALESCE(textUpdates.prDetailUpdates, '[]') AS `prDetailUpdates`,
@@ -27,28 +23,6 @@ FROM `CircleProject` AS cp
 JOIN `Circle` AS c
   ON c.`circleId` = cp.`circleId`
 
--- テキスト情報を結合
-LEFT JOIN (
-  SELECT
-    pt.circleProjectId,
-    MAX(CASE WHEN pt.textType = 'DESCRIPTION' THEN pt.content END) AS description,
-    MAX(CASE WHEN pt.textType = 'PRSUMMARY'  THEN pt.content END) AS prSummary,
-    MAX(CASE WHEN pt.textType = 'PRDETAIL'   THEN pt.content END) AS prDetail,
-    MAX(CASE WHEN pt.textType = 'REMARK'     THEN pt.content END) AS remark
-  FROM (
-    SELECT
-      *,
-      ROW_NUMBER() OVER (
-        PARTITION BY circleProjectId, textType
-        ORDER BY updatedAt DESC
-      ) AS rn
-    FROM ProjectText
-  ) pt
-  WHERE pt.rn = 1
-  GROUP BY pt.circleProjectId
-) AS texts
-  ON texts.circleProjectId = cp.id
-
 -- テキストの更新履歴を結合
 LEFT JOIN (
   SELECT