Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions src/app/(main)/project/workspace/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@ import BottomNavigation from "@/components/layout/BottomNavigation";
import { Task } from "@/types/kanban";
import { showToast } from "@/lib/utils/toast";

import {
getTasksByBoardId,
createTask,
updateTask,
deleteTask,
} from "@/app/api/tasks/tasks";
import { getTasksByBoardId } from "@/app/api/tasks/tasks";

import { useSession } from "next-auth/react";
import { supabase } from "@/lib/supabase/supabase";
Expand Down Expand Up @@ -224,9 +219,14 @@ export default function ProjectPage() {

const createTaskMutation = useMutation({
mutationFn: async (taskData: Omit<Task, "id" | "created_at" | "updated_at">) => {
const { data, error } = await createTask(taskData);
if (error) throw error;
return data;
const res = await fetch("/api/kanban/tasks", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(taskData),
});
if (!res.ok) throw new Error("Failed to create task");
const json = await res.json();
return json.data as Task;
},
onSuccess: (data) => {
if (data) {
Expand All @@ -242,8 +242,12 @@ export default function ProjectPage() {

const updateTaskMutation = useMutation({
mutationFn: async ({ taskId, updates }: { taskId: string; updates: Partial<Task> }) => {
const { error } = await updateTask(taskId, updates);
if (error) throw error;
const res = await fetch("/api/kanban/tasks", {
method: "PUT",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ id: taskId, ...updates }),
});
if (!res.ok) throw new Error("Failed to update task");
return { taskId, updates };
},
onSuccess: ({ taskId, updates }) => {
Expand All @@ -255,8 +259,8 @@ export default function ProjectPage() {

const deleteTaskMutation = useMutation({
mutationFn: async (taskId: string) => {
const { error } = await deleteTask(taskId);
if (error) throw error;
const res = await fetch(`/api/kanban/tasks?id=${taskId}`, { method: "DELETE" });
if (!res.ok) throw new Error("Failed to delete task");
return taskId;
},
onSuccess: (taskId) => {
Expand Down
155 changes: 73 additions & 82 deletions src/app/api/kanban/tasks/route.ts
Original file line number Diff line number Diff line change
@@ -1,72 +1,81 @@
import { NextRequest, NextResponse } from "next/server";
import {
getTasksByBoardId,
createTask,
updateTask,
deleteTask,
} from "@/app/api/tasks/tasks";
import { supabaseAdmin } from "@/lib/supabase/server";

const DB_TASK_FIELDS = [
"kanban_board_id",
"project_id",
"title",
"description",
"status",
"priority",
"assigned_user_id",
"started_at",
"ended_at",
"start_time",
"end_time",
"use_time",
"memo",
"subtasks",
] as const;

function sanitize(data: Record<string, unknown>): Record<string, unknown> {
const out: Record<string, unknown> = {};
DB_TASK_FIELDS.forEach((f) => {
if (f in data && data[f] !== undefined && data[f] !== "") {
out[f] = data[f];
}
});
return out;
}

export async function GET(request: NextRequest) {
try {
const { searchParams } = new URL(request.url);
const boardId = searchParams.get("boardId");

const boardId = request.nextUrl.searchParams.get("boardId");
if (!boardId) {
return NextResponse.json(
{ error: "boardId is required" },
{ status: 400 }
);
return NextResponse.json({ error: "boardId is required" }, { status: 400 });
}

const { data, error } = await getTasksByBoardId(boardId);
const { data, error } = await supabaseAdmin
.from("tasks")
.select("*, kanban_boards!inner(project_id)")
.eq("kanban_boards.project_id", boardId)
.order("created_at", { ascending: false });

if (error) {
console.error("Tasks 조회 실패:", error);
return NextResponse.json(
{ error: "Failed to fetch tasks" },
{ status: 500 }
);
}
if (error) throw error;

const tasks = (data || []).map((task: Record<string, unknown>) => {
const { kanban_boards, ...rest } = task as Record<string, unknown> & { kanban_boards: { project_id: string } };
return { ...rest, project_id: kanban_boards.project_id };
});

return NextResponse.json({ data: data || [] });
return NextResponse.json({ data: tasks });
} catch (error) {
console.error("GET /api/kanban/tasks error:", error);
return NextResponse.json(
{ error: "Internal server error" },
{ status: 500 }
);
return NextResponse.json({ error: "Internal server error" }, { status: 500 });
}
}

export async function POST(request: NextRequest) {
try {
const body = await request.json();
const { id: _id, created_at: _ca, updated_at: _ua, ...rest } = body;

Check warning on line 61 in src/app/api/kanban/tasks/route.ts

View workflow job for this annotation

GitHub Actions / quality

'_ua' is assigned a value but never used

Check warning on line 61 in src/app/api/kanban/tasks/route.ts

View workflow job for this annotation

GitHub Actions / quality

'_ca' is assigned a value but never used

Check warning on line 61 in src/app/api/kanban/tasks/route.ts

View workflow job for this annotation

GitHub Actions / quality

'_id' is assigned a value but never used
const clean = sanitize(rest);

// id, created_at, updated_at 제거 (Supabase가 자동 생성)
const {
id: _id,
created_at: _created_at,
updated_at: _updated_at,
...taskData
} = body;

const { data, error } = await createTask(taskData);

if (error) {
console.error("Task 생성 실패:", error);
return NextResponse.json(
{ error: "Failed to create task" },
{ status: 500 }
);
if (!clean.kanban_board_id || !clean.title) {
return NextResponse.json({ error: "kanban_board_id and title are required" }, { status: 400 });
}

const { data, error } = await supabaseAdmin
.from("tasks")
.insert(clean)
.select()
.single();

if (error) throw error;
return NextResponse.json({ data }, { status: 201 });
} catch (error) {
console.error("POST /api/kanban/tasks error:", error);
return NextResponse.json(
{ error: "Internal server error" },
{ status: 500 }
);
return NextResponse.json({ error: "Internal server error" }, { status: 500 });
}
}

Expand All @@ -76,60 +85,42 @@
const { id, ...updates } = body;

if (!id) {
return NextResponse.json(
{ error: "Task ID is required" },
{ status: 400 }
);
return NextResponse.json({ error: "Task ID is required" }, { status: 400 });
}

const { data, error } = await updateTask(id, updates);

if (error) {
console.error("Task 업데이트 실패:", error);
return NextResponse.json(
{ error: "Failed to update task" },
{ status: 500 }
);
const clean = sanitize(updates);
if (Object.keys(clean).length === 0) {
return NextResponse.json({ error: "No valid fields to update" }, { status: 400 });
}

const { data, error } = await supabaseAdmin
.from("tasks")
.update(clean)
.eq("id", id)
.select()
.single();

if (error) throw error;
return NextResponse.json({ data });
} catch (error) {
console.error("PUT /api/kanban/tasks error:", error);
return NextResponse.json(
{ error: "Internal server error" },
{ status: 500 }
);
return NextResponse.json({ error: "Internal server error" }, { status: 500 });
}
}

export async function DELETE(request: NextRequest) {
try {
const { searchParams } = new URL(request.url);
const id = searchParams.get("id");

const id = request.nextUrl.searchParams.get("id");
if (!id) {
return NextResponse.json(
{ error: "Task ID is required" },
{ status: 400 }
);
return NextResponse.json({ error: "Task ID is required" }, { status: 400 });
}

const { error } = await deleteTask(id);

if (error) {
console.error("Task 삭제 실패:", error);
return NextResponse.json(
{ error: "Failed to delete task" },
{ status: 500 }
);
}
const { error } = await supabaseAdmin.from("tasks").delete().eq("id", id);
if (error) throw error;

return NextResponse.json({ success: true });
} catch (error) {
console.error("DELETE /api/kanban/tasks error:", error);
return NextResponse.json(
{ error: "Internal server error" },
{ status: 500 }
);
return NextResponse.json({ error: "Internal server error" }, { status: 500 });
}
}
1 change: 1 addition & 0 deletions src/components/features/calendarView/CalendarView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ export default function CalendarView({
setShowTaskDetailModal(true);
onSelectTask?.(task);
}}
onUpdateTask={onUpdateTask}
/>
</div>
) : currentView === "day" ? (
Expand Down
Loading
Loading