テキスト情報を承認済みで最新のものから取ってくるように変更

SQL_IMPLEMENTATION.md

@@ -0,0 +1,77 @@
+`app/repositories/query.sql`を，以下のように変更してください。
+- 最終的に得られるカラムに「descriptionUpdates」「prSummaryUpdates」「prDetailUpdates」「remarkUpdates」を追加してください。
+  - 型：{
+      content: string,
+      updateStatus: string | null,
+      createdAt: DateTime
+    }[]
+
+なお，本変更のゴールとしては，`app/repositories/projects_repository.py`内の`_transform_row`において，「***Updates」があり，なおかつstatus=APPROVEDとなっている最新のものが存在すればそれのcontentをdescription, prSummary, prDetail, remarkとし，存在しないならば従来のdescription, prSummary, prDetail, remarkを採用することを目指します。description, prSummary, prDetail, remarkは独立に採用を決定してください。要するに，テキストデータが更新される可能性があるので最新のものをピックアップしてください。
+
+実装に当たっては以下のprismaのモデルを参考にしてください。
+
+```prisma
+enum CPUpdateRequestStatus {
+  DRAFT
+  PENDING_REVIEW
+  APPROVED
+  REJECTED
+}
+
+// 企画に関するテキスト情報（サマリー、説明、PR文）
+model ProjectText {
+  id              String                        @id @default(dbgenerated("(UUID())"))
+  circleProject   CircleProject                 @relation(name: "circle_project_texts", fields: [circleProjectId], references: [id], onDelete: Cascade)
+  circleProjectId String
+  textType        TextType // DESCRIPTION, PRSUMMARY, PRDETAIL, REMARK
+  content         String @db.Text // テキスト内容
+  updateRequest   ProjectMaterialUpdateRequest? @relation("update_request_text")
+  createdAt       DateTime                      @default(now())
+  updatedAt       DateTime                      @updatedAt @default(now())
+}
+
+// 画像情報の管理
+model Image {
+  id            String                        @id @default(dbgenerated("(UUID())"))
+  filename      String
+  extension     String
+  createdAt     DateTime                      @default(now())
+  updatedAt     DateTime                      @updatedAt @default(now())
+  cproject      CircleProject                 @relation(name: "cproject_image", fields: [cprojectId], references: [id])
+  cprojectId    String
+  order         Int
+  updateRequest ProjectMaterialUpdateRequest? @relation("update_request_image")
+}
+
+// SNSデータ
+model SnsData {
+  id              String                        @id @default(dbgenerated("(UUID())"))
+  service         String // SNSサービス名 (Twitter, Instagram, etc.)
+  url             String // ユーザー名/ハンドル
+  label           String?
+  circleProject   CircleProject                 @relation(name: "circle_project_sns", fields: [circleProjectId], references: [id], onDelete: Cascade)
+  circleProjectId String
+  updateRequest   ProjectMaterialUpdateRequest? @relation("update_request_snsdata")
+  createdAt       DateTime                      @default(now())
+  updatedAt       DateTime                      @updatedAt @default(now())
+}
+
+model ProjectMaterialUpdateRequest {
+  id            String                @id @default(dbgenerated("(UUID())"))
+  targetType    CPUpdateRequestType
+  targetSns     SnsData?              @relation(name: "update_request_snsdata", fields: [targetSnsId], references: [id])
+  targetSnsId   String?               @unique
+  targetText    ProjectText?          @relation(name: "update_request_text", fields: [targetTextId], references: [id])
+  targetTextId  String?               @unique
+  targetImage   Image?                @relation(name: "update_request_image", fields: [targetImageId], references: [id])
+  targetImageId String?               @unique
+  status        CPUpdateRequestStatus
+  requester     User                  @relation(name: "cp_update_requester", fields: [requesterId], references: [id])
+  requesterId   String
+  observer      User?                 @relation(name: "cp_update_observer", fields: [observerId], references: [id])
+  observerId    String?
+  createdAt     DateTime              @default(now())
+  updatedAt     DateTime              @updatedAt @default(now())
+}
+```
+

app/repositories/projects_repository.py

@@ -80,6 +80,25 @@ class ProjectsRepository:
                     items.append(item)
             return items
 
+        def _resolve_text(default_key: str, updates_key: str) -> str | None:
+            updates = sorted(
+                _coerce_dict_list(row.get(updates_key)),
+                key=lambda item: item.get("createdAt") or "",
+                reverse=True,
+            )
+            for update in updates:
+                status = update.get("updateStatus")
+                if isinstance(status, str) and status.upper() == "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")
+
         return Project(
             projectId=row["projectId"],
             circleName=row["circleName"],
@@ -91,10 +110,10 @@ class ProjectsRepository:
             day2=row["day2"],
             day3=row["day3"],
             location=row["location"],
-            description=row["description"],
-            prSummary=row["prSummary"],
-            prDetail=row["prDetail"],
-            remark=row.get("remark") or None,
+            description=description_value,
+            prSummary=pr_summary_value,
+            prDetail=pr_detail_value,
+            remark=remark_value or None,
             images=[Image(**img) for img in _coerce_dict_list(row.get("images"))],
             socialMedia=[
                 Sns(**url) for url in _coerce_dict_list(row.get("socialMedia"))

app/repositories/query.sql

@@ -13,6 +13,10 @@ SELECT
   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`,
+  COALESCE(textUpdates.remarkUpdates, '[]') AS `remarkUpdates`,
   COALESCE(images.`images`, '[]') AS `images`,
   COALESCE(sns.socialMedia, '[]') AS `socialMedia`,
   COALESCE(tags.tags, '[]') AS `tags`
@@ -45,6 +49,34 @@ LEFT JOIN (
 ) AS texts
   ON texts.circleProjectId = cp.id
 
+-- テキストの更新履歴を結合
+LEFT JOIN (
+  SELECT
+    typed.circleProjectId,
+    MAX(CASE WHEN typed.textType = 'DESCRIPTION' THEN typed.updates END) AS descriptionUpdates,
+    MAX(CASE WHEN typed.textType = 'PRSUMMARY'  THEN typed.updates END) AS prSummaryUpdates,
+    MAX(CASE WHEN typed.textType = 'PRDETAIL'   THEN typed.updates END) AS prDetailUpdates,
+    MAX(CASE WHEN typed.textType = 'REMARK'     THEN typed.updates END) AS remarkUpdates
+  FROM (
+    SELECT
+      pt.circleProjectId,
+      pt.textType,
+      JSON_ARRAYAGG(
+        JSON_OBJECT(
+          'content', pt.content,
+          'updateStatus', pmur.status,
+          'createdAt', pt.createdAt
+        )
+      ) AS updates
+    FROM `ProjectText` AS pt
+    LEFT JOIN `ProjectMaterialUpdateRequest` AS pmur
+      ON pmur.targetTextId = pt.id
+    GROUP BY pt.circleProjectId, pt.textType
+  ) AS typed
+  GROUP BY typed.circleProjectId
+) AS textUpdates
+  ON textUpdates.circleProjectId = cp.id
+
 -- 画像情報を結合
 LEFT JOIN (
   SELECT