feat(chat,board): file/image attachments on chat, board threads and comments
チャット・掲示板(スレッド/コメント)へファイル/画像添付を追加。 - lib/db/migrations/002_attachments.sql: attachments テーブル + file_assets.source 列 - repositories/AttachmentRepository + services/AttachmentService: 添付紐付け(プロジェクト/アップロード者チェック) - FileStorageService.uploadForAttachment: 通知/SSE/アクティビティを行わない添付専用アップロード(source='attachment') - ChatService/BoardService: fileIds 受理・添付紐付け・履歴/詳細表示・削除クリーンアップ(トランザクション) - API: POST /attachments + chat/board の fileIds 受理 - UI: AttachmentList(画像サムネイル+Lightbox/ダウンロード) + AttachmentPicker(複数アップロード・送信中は送信不可) をチャット/スレッド/コメントに統合 - 添付ファイルは既存の /api/files/[fileId]/download(権限チェック済)で配信
This commit is contained in:
41
app/api/projects/[projectId]/attachments/route.ts
Normal file
41
app/api/projects/[projectId]/attachments/route.ts
Normal file
@ -0,0 +1,41 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { getCurrentUser } from '@/lib/auth/getCurrentUser';
|
||||
import { createFileStorageService } from '@/lib/api/services';
|
||||
import { UnauthorizedError, ValidationError } from '@/lib/errors';
|
||||
import { handleApiError } from '@/lib/api/handleError';
|
||||
|
||||
export const runtime = 'nodejs';
|
||||
|
||||
/**
|
||||
* チャット/掲示板添付用のファイルアップロード。
|
||||
* Files一覧公開用の通知/SSE/アクティビティを行わず、source='attachment'で保存する。
|
||||
*/
|
||||
export async function POST(
|
||||
request: NextRequest,
|
||||
{ params }: { params: Promise<{ projectId: string }> }
|
||||
) {
|
||||
const user = await getCurrentUser();
|
||||
if (!user) return handleApiError(new UnauthorizedError());
|
||||
const { projectId } = await params;
|
||||
|
||||
const formData = await request.formData();
|
||||
const file = formData.get('file');
|
||||
if (!(file instanceof File)) {
|
||||
return handleApiError(
|
||||
new ValidationError('ファイルを指定してください', 'file')
|
||||
);
|
||||
}
|
||||
|
||||
const data = Buffer.from(await file.arrayBuffer());
|
||||
const service = createFileStorageService();
|
||||
try {
|
||||
const fileAsset = service.uploadForAttachment(user.id, Number(projectId), {
|
||||
originalName: file.name,
|
||||
mimeType: file.type || 'application/octet-stream',
|
||||
data,
|
||||
});
|
||||
return NextResponse.json({ file: fileAsset }, { status: 201 });
|
||||
} catch (error) {
|
||||
return handleApiError(error);
|
||||
}
|
||||
}
|
||||
@ -22,10 +22,16 @@ export async function POST(
|
||||
|
||||
const service = createBoardService();
|
||||
try {
|
||||
const fileIds = Array.isArray(body.fileIds)
|
||||
? body.fileIds
|
||||
.map((n) => Number(n))
|
||||
.filter((n) => Number.isFinite(n) && n > 0)
|
||||
: [];
|
||||
const comment = service.createComment(
|
||||
user.id,
|
||||
Number(threadId),
|
||||
String(body.bodyMd ?? '')
|
||||
String(body.bodyMd ?? ''),
|
||||
fileIds
|
||||
);
|
||||
return NextResponse.json({ comment }, { status: 201 });
|
||||
} catch (error) {
|
||||
|
||||
@ -42,6 +42,11 @@ export async function POST(
|
||||
|
||||
const service = createBoardService();
|
||||
try {
|
||||
const fileIds = Array.isArray(body.fileIds)
|
||||
? body.fileIds
|
||||
.map((n) => Number(n))
|
||||
.filter((n) => Number.isFinite(n) && n > 0)
|
||||
: [];
|
||||
const thread = service.createThread(user.id, Number(projectId), {
|
||||
title: String(body.title ?? ''),
|
||||
bodyMd: String(body.bodyMd ?? ''),
|
||||
@ -49,6 +54,7 @@ export async function POST(
|
||||
typeof body.category === 'string'
|
||||
? (body.category as never)
|
||||
: undefined,
|
||||
fileIds,
|
||||
});
|
||||
return NextResponse.json({ thread }, { status: 201 });
|
||||
} catch (error) {
|
||||
|
||||
@ -42,10 +42,16 @@ export async function POST(
|
||||
|
||||
const service = createChatService();
|
||||
try {
|
||||
const fileIds = Array.isArray(body.fileIds)
|
||||
? body.fileIds
|
||||
.map((n) => Number(n))
|
||||
.filter((n) => Number.isFinite(n) && n > 0)
|
||||
: [];
|
||||
const message = service.sendMessage(
|
||||
user.id,
|
||||
Number(projectId),
|
||||
String(body.body ?? '')
|
||||
String(body.body ?? ''),
|
||||
fileIds
|
||||
);
|
||||
return NextResponse.json({ message }, { status: 201 });
|
||||
} catch (error) {
|
||||
|
||||
@ -5,6 +5,8 @@ import { Header } from '@/components/layout/Header';
|
||||
import { ProjectNav } from '@/components/layout/ProjectNav';
|
||||
import { MarkdownBody } from '@/components/board/MarkdownBody';
|
||||
import { CommentForm } from '@/components/board/CommentForm';
|
||||
import { AttachmentList } from '@/components/files/AttachmentList';
|
||||
import type { AttachmentView } from '@/lib/types';
|
||||
import { ForbiddenError, NotFoundError } from '@/lib/errors';
|
||||
|
||||
export const dynamic = 'force-dynamic';
|
||||
@ -21,9 +23,15 @@ export default async function ThreadDetailPage({
|
||||
const boardService = createBoardService();
|
||||
let thread;
|
||||
let comments;
|
||||
let attachments: { thread: AttachmentView[]; comments: AttachmentView[] };
|
||||
try {
|
||||
thread = boardService.getThread(user.id, Number(threadId));
|
||||
comments = boardService.listComments(user.id, Number(threadId));
|
||||
attachments = boardService.getAttachments(
|
||||
user.id,
|
||||
thread.id,
|
||||
comments.items.map((c) => c.id)
|
||||
);
|
||||
} catch (error) {
|
||||
if (error instanceof ForbiddenError || error instanceof NotFoundError) {
|
||||
redirect(`/projects/${projectId}/board`);
|
||||
@ -31,6 +39,18 @@ export default async function ThreadDetailPage({
|
||||
throw error;
|
||||
}
|
||||
|
||||
// コメントIDごとに添付をグループ化
|
||||
const commentAttachments = new Map(
|
||||
attachments.comments.map((a) => [
|
||||
a.targetId,
|
||||
[] as typeof attachments.comments,
|
||||
])
|
||||
);
|
||||
for (const a of attachments.comments) {
|
||||
const list = commentAttachments.get(a.targetId);
|
||||
if (list) list.push(a);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-gray-50">
|
||||
<Header user={toPublicUser(user)} />
|
||||
@ -54,6 +74,14 @@ export default async function ThreadDetailPage({
|
||||
<div className="mt-4">
|
||||
<MarkdownBody bodyMd={thread.bodyMd} />
|
||||
</div>
|
||||
{attachments.thread.length > 0 && (
|
||||
<div className="mt-4">
|
||||
<p className="mb-1 text-xs font-medium text-gray-500">
|
||||
添付ファイル
|
||||
</p>
|
||||
<AttachmentList attachments={attachments.thread} />
|
||||
</div>
|
||||
)}
|
||||
<p className="mt-4 text-xs text-gray-400">
|
||||
投稿: {thread.createdAt} / 更新: {thread.updatedAt}
|
||||
</p>
|
||||
@ -67,6 +95,14 @@ export default async function ThreadDetailPage({
|
||||
className="rounded-lg border bg-white p-4 shadow-sm"
|
||||
>
|
||||
<MarkdownBody bodyMd={comment.bodyMd} />
|
||||
{commentAttachments.has(comment.id) &&
|
||||
commentAttachments.get(comment.id)!.length > 0 && (
|
||||
<div className="mt-2">
|
||||
<AttachmentList
|
||||
attachments={commentAttachments.get(comment.id)!}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
<p className="mt-2 text-xs text-gray-400">{comment.createdAt}</p>
|
||||
</div>
|
||||
))}
|
||||
|
||||
Reference in New Issue
Block a user