# PR: プロジェクト「課題・行動・成果」の統合 と 職務経歴書 UI 改善/ # PR: プロジェクトの在籍期間を複数対応（resume_project_periods 子テーブル化）

CONTRIBUTING.md

@@ -73,3 +73,4 @@ docs/adr/XXXX-kebab-case-title.md
 | [ADR-0003](docs/adr/0003-redux-toolkit-persist.md) | Redux Toolkit + redux-persist の採用 | Accepted |
 | [ADR-0004](docs/adr/0004-llm-provider-abstraction.md) | LLM プロバイダ抽象化（Ollama/Vertex AI） | Accepted |
 | [ADR-0005](docs/adr/0005-cloudrun-single-instance.md) | Cloud Run single instance 構成の採用 | Accepted |
+| [ADR-0006](docs/adr/0006-tanstack-query.md) | TanStack Query 導入検討 | Proposed |

backend/alembic_migrations/versions/0037_merge_project_caf_into_description.py

@@ -0,0 +1,65 @@
+"""merge resume_projects challenge/action/result into description（課題・行動・成果の統合）
+
+プロジェクトの「課題」「行動」「成果」は分割する必要がないため、単一の自由記述欄
+「詳細」(description) に統合した。これに伴い resume_projects の challenge / action /
+result カラムを削除し、description カラムを新設する。
+
+統合対象の既存本番データは存在しないため、データ移行（3 カラムの連結）は行わない。
+
+libSQL (SQLite 互換) は ALTER COLUMN / DROP COLUMN を直接サポートしないため、
+batch_alter_table（テーブル再作成）でカラムを入れ替える。
+
+Revision ID: 0037_merge_project_caf_into_description
+Revises: 0036_rename_github_analysis_to_github_link
+Create Date: 2026-05-27 00:00:00.000000
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy import text
+
+# revision identifiers, used by Alembic.
+revision: str = "0037_merge_project_caf_into_description"
+down_revision: Union[str, None] = "0036_rename_github_analysis_to_github_link"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    result = conn.execute(
+        text(
+            "SELECT COUNT(*) FROM resume_projects"
+            " WHERE challenge != '' OR action != '' OR result != ''"
+        )
+    )
+    count = result.scalar() or 0
+    if count > 0:
+        raise RuntimeError(
+            f"resume_projects に challenge/action/result のデータが {count} 件残っています。"
+            "カラム削除前にデータを退避してください。"
+        )
+
+    with op.batch_alter_table("resume_projects") as batch_op:
+        batch_op.add_column(
+            sa.Column("description", sa.Text(), nullable=False, server_default=""),
+        )
+        batch_op.drop_column("challenge")
+        batch_op.drop_column("action")
+        batch_op.drop_column("result")
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("resume_projects") as batch_op:
+        batch_op.add_column(
+            sa.Column("challenge", sa.Text(), nullable=False, server_default=""),
+        )
+        batch_op.add_column(
+            sa.Column("action", sa.Text(), nullable=False, server_default=""),
+        )
+        batch_op.add_column(
+            sa.Column("result", sa.Text(), nullable=False, server_default=""),
+        )
+        batch_op.drop_column("description")

backend/alembic_migrations/versions/0038_add_project_periods_table.py

@@ -0,0 +1,102 @@
+"""resume_project_periods テーブルを追加し、プロジェクトの複数期間に対応する
+
+ResumeProject の start_date / end_date / is_current を子テーブル
+resume_project_periods に正規化して移す。これにより 1 案件で
+「2024/01〜2024/12、2025/06〜現在」のような複数の在籍期間を持てるようになる。
+
+既存データは 1 行 1 期間として resume_project_periods に移行する。
+
+libSQL (SQLite 互換) は ALTER COLUMN / DROP COLUMN を直接サポートしないため
+batch_alter_table（テーブル再作成）でカラムを削除する。
+
+Revision ID: 0038_add_project_periods_table
+Revises: 0037_merge_project_caf_into_description
+Create Date: 2026-05-28 00:00:00.000000
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "0038_add_project_periods_table"
+down_revision: Union[str, None] = "0037_merge_project_caf_into_description"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "resume_project_periods",
+        sa.Column("id", sa.String(36), primary_key=True),
+        sa.Column(
+            "project_id",
+            sa.String(36),
+            sa.ForeignKey("resume_projects.id", ondelete="CASCADE"),
+            nullable=False,
+            index=True,
+        ),
+        sa.Column("sort_order", sa.Integer(), nullable=False, default=0),
+        sa.Column("start_date", sa.Date(), nullable=False),
+        sa.Column("end_date", sa.Date(), nullable=True),
+        sa.Column("is_current", sa.Boolean(), nullable=False, default=False),
+    )
+
+    # 既存プロジェクトの start_date / end_date / is_current を 1 期間として移行する。
+    conn = op.get_bind()
+    rows = conn.execute(
+        sa.text("SELECT id, start_date, end_date, is_current FROM resume_projects")
+    ).fetchall()
+    import uuid as _uuid
+    for row in rows:
+        conn.execute(
+            sa.text(
+                "INSERT INTO resume_project_periods "
+                "(id, project_id, sort_order, start_date, end_date, is_current) "
+                "VALUES (:id, :project_id, 0, :start_date, :end_date, :is_current)"
+            ),
+            {
+                "id": str(_uuid.uuid4()),
+                "project_id": row[0],
+                "start_date": row[1],
+                "end_date": row[2],
+                "is_current": row[3],
+            },
+        )
+
+    with op.batch_alter_table("resume_projects") as batch_op:
+        batch_op.drop_column("start_date")
+        batch_op.drop_column("end_date")
+        batch_op.drop_column("is_current")
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("resume_projects") as batch_op:
+        batch_op.add_column(
+            sa.Column("start_date", sa.Date(), nullable=False, server_default="2000-01-01"),
+        )
+        batch_op.add_column(
+            sa.Column("end_date", sa.Date(), nullable=True),
+        )
+        batch_op.add_column(
+            sa.Column("is_current", sa.Boolean(), nullable=False, server_default="0"),
+        )
+
+    # 各プロジェクトの最初の期間（sort_order=0）を resume_projects に書き戻す。
+    conn = op.get_bind()
+    rows = conn.execute(
+        sa.text(
+            "SELECT project_id, start_date, end_date, is_current "
+            "FROM resume_project_periods WHERE sort_order = 0"
+        )
+    ).fetchall()
+    for row in rows:
+        conn.execute(
+            sa.text(
+                "UPDATE resume_projects SET start_date=:sd, end_date=:ed, is_current=:ic "
+                "WHERE id=:pid"
+            ),
+            {"sd": row[1], "ed": row[2], "ic": row[3], "pid": row[0]},
+        )
+
+    op.drop_table("resume_project_periods")

backend/app/models/__init__.py

@@ -9,6 +9,7 @@
     ResumeClient,
     ResumeExperience,
     ResumeProject,
+    ResumeProjectPeriod,
     ResumeProjectPhase,
     ResumeProjectTeamMember,
     ResumeProjectTechnologyStack,
@@ -28,6 +29,7 @@
     "ResumeClient",
     "ResumeExperience",
     "ResumeProject",
+    "ResumeProjectPeriod",
     "ResumeProjectPhase",
     "ResumeProjectTeamMember",
     "ResumeProjectTechnologyStack",

backend/app/models/resume.py

@@ -163,14 +163,15 @@ class ResumeProject(Base):
     )
     sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     name: Mapped[str] = mapped_column(String(200), nullable=False, default="")
-    start_date_value: Mapped[date] = mapped_column("start_date", Date, nullable=False)
-    end_date_value: Mapped[date | None] = mapped_column("end_date", Date, nullable=True)
-    is_current: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     role: Mapped[str] = mapped_column(String(200), nullable=False, default="")
-    challenge: Mapped[str] = mapped_column(Text, nullable=False, default="")
-    action: Mapped[str] = mapped_column(Text, nullable=False, default="")
-    result: Mapped[str] = mapped_column(Text, nullable=False, default="")
+    # 課題・行動・成果を統合した自由記述欄。見出しは「詳細」。
+    description: Mapped[str] = mapped_column(Text, nullable=False, default="")
     team_total: Mapped[str] = mapped_column(String(60), nullable=False, default="")
+    period_rows: Mapped[list["ResumeProjectPeriod"]] = relationship(
+        back_populates="project",
+        cascade="all, delete-orphan",
+        order_by="ResumeProjectPeriod.sort_order",
+    )
     team_member_rows: Mapped[list["ResumeProjectTeamMember"]] = relationship(
         back_populates="project",
         cascade="all, delete-orphan",
@@ -188,13 +189,34 @@ class ResumeProject(Base):
     )
     client: Mapped["ResumeClient"] = relationship(back_populates="project_rows")
 
+    @property
+    def periods(self) -> list["ResumeProjectPeriod"]:
+        return list(self.period_rows)
+
+    @property
+    def is_current(self) -> bool:
+        return any(p.is_current for p in self.period_rows)
+
+    @property
+    def start_date_value(self) -> date | None:
+        """ソート用: 全期間のうち最も新しい開始日を返す。"""
+        values = [p.start_date_value for p in self.period_rows if p.start_date_value]
+        return max(values) if values else None
+
+    @property
+    def end_date_value(self) -> date | None:
+        """ソート用: いずれかの期間が参画中なら None、それ以外は全期間の最大終了日を返す。"""
+        if self.is_current:
+            return None
+        values = [p.end_date_value for p in self.period_rows if p.end_date_value]
+        return max(values) if values else None
+
     @property
     def start_date(self) -> str:
         return format_year_month(self.start_date_value) or ""
 
     @property
     def end_date(self) -> str:
-        """DB の end_date が NULL（参画中）の場合は "" を返す（schema 契約と一致）。"""
         return format_year_month(self.end_date_value) or ""
 
     @property
@@ -213,6 +235,32 @@ def phases(self) -> list[str]:
         return [phase.name for phase in self.phase_rows]
 
 
+class ResumeProjectPeriod(Base):
+    __tablename__ = "resume_project_periods"
+
+    id: Mapped[str] = mapped_column(String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+    project_id: Mapped[str] = mapped_column(
+        String(36),
+        ForeignKey("resume_projects.id", ondelete="CASCADE"),
+        nullable=False,
+        index=True,
+    )
+    sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
+    start_date_value: Mapped[date] = mapped_column("start_date", Date, nullable=False)
+    end_date_value: Mapped[date | None] = mapped_column("end_date", Date, nullable=True)
+    is_current: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    project: Mapped["ResumeProject"] = relationship(back_populates="period_rows")
+
+    @property
+    def start_date(self) -> str:
+        return format_year_month(self.start_date_value) or ""
+
+    @property
+    def end_date(self) -> str:
+        """DB の end_date が NULL（参画中）の場合は "" を返す（schema 契約と一致）。"""
+        return format_year_month(self.end_date_value) or ""
+
+
 class ResumeProjectTeamMember(Base):
     __tablename__ = "resume_project_team_members"
 

backend/app/repositories/resume.py

@@ -6,6 +6,7 @@
     ResumeClient,
     ResumeExperience,
     ResumeProject,
+    ResumeProjectPeriod,
     ResumeProjectPhase,
     ResumeProjectTeamMember,
     ResumeProjectTechnologyStack,
@@ -22,6 +23,10 @@ class ResumeRepository(SingleUserDocumentRepository):
         selectinload(Resume.experience_rows)
         .selectinload(ResumeExperience.client_rows)
         .selectinload(ResumeClient.project_rows)
+        .selectinload(ResumeProject.period_rows),
+        selectinload(Resume.experience_rows)
+        .selectinload(ResumeExperience.client_rows)
+        .selectinload(ResumeClient.project_rows)
         .selectinload(ResumeProject.team_member_rows),
         selectinload(Resume.experience_rows)
         .selectinload(ResumeExperience.client_rows)
@@ -79,11 +84,8 @@ def _build_experience_row(self, index: int, payload: dict[str, object]) -> Resum
         )
 
     def _build_client_row(self, index: int, payload: dict[str, object]) -> ResumeClient:
-        sorted_projects = sort_by_period_desc(
-            payload.get("projects", []),
-            start_key="start_date",
-            end_key="end_date",
-        )
+        projects = list(payload.get("projects", []))
+        sorted_projects = sorted(projects, key=self._project_sort_key)
         return ResumeClient(
             sort_order=index,
             name=payload.get("name", ""),
@@ -94,21 +96,52 @@ def _build_client_row(self, index: int, payload: dict[str, object]) -> ResumeCli
             ],
         )
 
+    @staticmethod
+    def _project_sort_key(proj: dict[str, object]) -> tuple:
+        """複数期間を持つプロジェクトを sort_by_period_desc と同じ降順ロジックでソートする。"""
+        from datetime import date as _date
+
+        def _parse(val: object) -> _date | None:
+            if val is None:
+                return None
+            if isinstance(val, _date):
+                return val
+            if isinstance(val, str) and val:
+                if len(val) == 7 and val[4] == "-":
+                    return _date.fromisoformat(f"{val}-01")
+                return _date.fromisoformat(val)
+            return None
+
+        periods = proj.get("periods", [])
+        is_any_current = any(p.get("is_current") for p in periods)
+        starts = [_parse(p.get("start_date")) for p in periods]
+        effective_start = max((s for s in starts if s), default=_date.min)
+        if is_any_current:
+            return (0, _date.max - effective_start)
+        ends = [_parse(p.get("end_date")) for p in periods if p.get("end_date")]
+        effective_end = max(ends, default=_date.min)
+        return (1, _date.max - effective_end, _date.max - effective_start)
+
     def _build_project_row(self, index: int, payload: dict[str, object]) -> ResumeProject:
         team = payload.get("team", {})
+        periods = list(payload.get("periods", []))
         return ResumeProject(
             sort_order=index,
             name=payload.get("name", ""),
-            start_date_value=parse_year_month(payload["start_date"]),
-            end_date_value=(
-                parse_year_month(payload["end_date"]) if payload.get("end_date") else None
-            ),
-            is_current=payload.get("is_current", False),
             role=payload.get("role", ""),
-            challenge=payload.get("challenge", ""),
-            action=payload.get("action", ""),
-            result=payload.get("result", ""),
+            description=payload.get("description", ""),
             team_total=team.get("total", ""),
+            period_rows=[
+                ResumeProjectPeriod(
+                    sort_order=period_index,
+                    start_date_value=parse_year_month(period["start_date"]),
+                    end_date_value=(
+                        parse_year_month(period["end_date"]) if period.get("end_date") else None
+                    ),
+                    is_current=period.get("is_current", False),
+                )
+                for period_index, period in enumerate(periods)
+            ],
             team_member_rows=[
                 ResumeProjectTeamMember(
                     sort_order=member_index,