v7.0.0-beta.2 release

This commit is contained in:
HeuJung committed 2026-04-20 20:37:49 +09:00
1 parent 6595fd0eb5
commit fa8eba7a0d
1165 files changed
+107118 -762127

No files matched your search

@@ -269,8 +269,6 @@ class BoardController extends AdminBaseController
$data['description'] = [$fallbackLocale => ''];
$data['categories'] = [];
$data['notify_author_channels'] = $basicDefaults['notify_author_channels'] ?? [];
$data['notify_admin_on_post_channels'] = $basicDefaults['notify_admin_on_post_channels'] ?? [];
$spamSecurity = g7_module_settings('sirsoft-board', 'spam_security', []);
$data['blocked_keywords'] = collect($spamSecurity['blocked_keywords'] ?? [])->join(',');
$data['allowed_extensions'] = collect($basicDefaults['allowed_extensions'] ?? [])->join(',');
@@ -1,176 +0,0 @@
<?php
namespace Modules\Sirsoft\Board\Http\Controllers\Admin;
use App\Helpers\ResponseHelper;
use App\Http\Controllers\Api\Base\AdminBaseController;
use App\Http\Requests\MailTemplate\MailTemplateIndexRequest;
use App\Http\Requests\MailTemplate\MailTemplatePreviewRequest;
use App\Http\Requests\MailTemplate\UpdateMailTemplateRequest;
use App\Http\Resources\MailTemplateCollection;
use App\Http\Resources\MailTemplateResource;
use Modules\Sirsoft\Board\Models\BoardMailTemplate;
use Modules\Sirsoft\Board\Services\BoardMailTemplateService;
use Illuminate\Http\JsonResponse;
/**
* 게시판 메일 템플릿 관리 컨트롤러
*/
class BoardMailTemplateController extends AdminBaseController
{
/**
* BoardMailTemplateController 생성자.
*
* @param BoardMailTemplateService $service 메일 템플릿 서비스
*/
public function __construct(
private BoardMailTemplateService $service
) {
parent::__construct();
}
/**
* 메일 템플릿 목록을 페이지네이션하여 조회합니다.
*
* @param MailTemplateIndexRequest $request 검증된 목록 조회 요청
* @return JsonResponse 페이지네이션된 템플릿 목록
*/
public function index(MailTemplateIndexRequest $request): JsonResponse
{
try {
$filters = array_filter($request->validated(), fn ($value) => $value !== null);
$perPage = (int) ($request->validated('per_page') ?? 20);
$templates = $this->service->getTemplates($filters, $perPage);
$collection = new MailTemplateCollection($templates);
return ResponseHelper::moduleSuccess(
'sirsoft-board',
'messages.mail_template_fetch_success',
$collection->toArray($request)
);
} catch (\Exception $e) {
return ResponseHelper::moduleError(
'sirsoft-board',
'messages.mail_template_fetch_failed',
500
);
}
}
/**
* 메일 템플릿을 수정합니다.
*
* @param UpdateMailTemplateRequest $request 수정 요청
* @param BoardMailTemplate $boardMailTemplate 수정 대상
* @return JsonResponse 수정 결과
*/
public function update(UpdateMailTemplateRequest $request, BoardMailTemplate $boardMailTemplate): JsonResponse
{
try {
$userId = $request->user()?->id;
$template = $this->service->updateTemplate(
$boardMailTemplate,
$request->validated(),
$userId
);
return ResponseHelper::moduleSuccess(
'sirsoft-board',
'messages.mail_template_save_success',
new MailTemplateResource($template)
);
} catch (\Exception $e) {
return ResponseHelper::moduleError(
'sirsoft-board',
'messages.mail_template_save_error',
500
);
}
}
/**
* 메일 템플릿의 활성 상태를 토글합니다.
*
* @param BoardMailTemplate $boardMailTemplate 토글 대상
* @return JsonResponse 토글 결과
*/
public function toggleActive(BoardMailTemplate $boardMailTemplate): JsonResponse
{
try {
$template = $this->service->toggleActive($boardMailTemplate);
return ResponseHelper::moduleSuccess(
'sirsoft-board',
'messages.mail_template_toggle_success',
new MailTemplateResource($template)
);
} catch (\Exception $e) {
return ResponseHelper::moduleError(
'sirsoft-board',
'messages.mail_template_toggle_failed',
500
);
}
}
/**
* 메일 템플릿 미리보기를 반환합니다.
*
* @param MailTemplatePreviewRequest $request 검증된 미리보기 요청
* @return JsonResponse 미리보기 결과
*/
public function preview(MailTemplatePreviewRequest $request): JsonResponse
{
try {
$result = $this->service->getPreview($request->validated());
return ResponseHelper::moduleSuccess(
'sirsoft-board',
'messages.mail_template_preview_success',
$result
);
} catch (\Exception $e) {
return ResponseHelper::moduleError(
'sirsoft-board',
'messages.mail_template_preview_failed',
500
);
}
}
/**
* 메일 템플릿을 시더 기본값으로 복원합니다.
*
* @param BoardMailTemplate $boardMailTemplate 복원 대상
* @return JsonResponse 복원 결과
*/
public function reset(BoardMailTemplate $boardMailTemplate): JsonResponse
{
try {
$defaultData = $this->service->getDefaultTemplateData($boardMailTemplate->type);
if (! $defaultData) {
return ResponseHelper::moduleError(
'sirsoft-board',
'messages.mail_template_reset_no_default',
404
);
}
$template = $this->service->resetToDefault($boardMailTemplate, $defaultData);
return ResponseHelper::moduleSuccess(
'sirsoft-board',
'messages.mail_template_reset_success',
new MailTemplateResource($template)
);
} catch (\Exception $e) {
return ResponseHelper::moduleError(
'sirsoft-board',
'messages.mail_template_reset_failed',
500
);
}
}
}
@@ -3,13 +3,11 @@
namespace Modules\Sirsoft\Board\Http\Controllers\Admin;
use App\Helpers\PermissionHelper;
use App\Extension\HookManager;
use App\Helpers\ResponseHelper;
use App\Http\Controllers\Api\Base\AdminBaseController;
use Exception;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Modules\Sirsoft\Board\Http\Requests\Admin\BulkApplySettingsRequest;
use Modules\Sirsoft\Board\Http\Requests\Admin\StoreBoardSettingsRequest;
use Modules\Sirsoft\Board\Services\BoardService;
@@ -172,29 +170,6 @@ class BoardSettingsController extends AdminBaseController
}
}
/**
* 사용 가능한 알림 채널 목록을 반환합니다.
*
* 기본 채널(mail, database)을 제공하며, 플러그인이
* 'sirsoft-board.notification.available_channels' Filter 훅으로 채널을 추가할 수 있습니다.
* 추후 코어에 공통 API가 생기면 이 메서드만 교체하면 됩니다.
*
* @return JsonResponse 채널 목록 JSON 응답
*/
public function notificationChannels(): JsonResponse
{
$defaultChannels = [
['value' => 'mail', 'label' => __('sirsoft-board::admin.settings.notification_channels.channel_mail')],
];
$channels = HookManager::applyFilters(
'sirsoft-board.notification.available_channels',
$defaultChannels
);
return ResponseHelper::success('messages.fetch_success', $channels);
}
/**
* 설정 캐시를 초기화합니다.
*
@@ -208,8 +183,8 @@ class BoardSettingsController extends AdminBaseController
// ModuleSettings 캐시 초기화
$this->settingsService->clearCache();
// 게시판 캐시 초기화 (boards:list)
Cache::forget('boards:list');
// 게시판 캐시 전체 초기화
$this->boardService->clearAllBoardCaches();
return ResponseHelper::moduleSuccess(
'sirsoft-board',
@@ -18,6 +18,7 @@ use Modules\Sirsoft\Board\Http\Resources\PostCollection;
use Modules\Sirsoft\Board\Http\Resources\PostResource;
use Modules\Sirsoft\Board\Services\BoardService;
use Modules\Sirsoft\Board\Services\PostService;
use Modules\Sirsoft\Board\Services\ReportService;
use Modules\Sirsoft\Board\Traits\ChecksBoardPermission;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -35,10 +36,12 @@ class PostController extends AdminBaseController
*
* @param PostService $postService 게시글 서비스
* @param BoardService $boardService 게시판 서비스
* @param ReportService $reportService 신고 서비스
*/
public function __construct(
private PostService $postService,
private BoardService $boardService
private BoardService $boardService,
private ReportService $reportService
) {
parent::__construct();
}
@@ -69,9 +72,11 @@ class PostController extends AdminBaseController
// 삭제된 게시글 포함 여부 (admin.manage 또는 admin.control 권한)
$canViewDeleted = $this->checkBoardPermission($slug, 'admin.manage');
// 게시글 목록 조회
$posts = $this->postService->getPosts($slug, $listParams['filters'], $listParams['perPage'], withTrashed: $canViewDeleted);
$totalNormalPosts = $this->postService->getTotalNormalPosts($slug, $listParams['filters'], $canViewDeleted);
// 게시글 목록 조회 (simplePaginate — COUNT 쿼리 제거)
$posts = $this->postService->getPosts($slug, $listParams['filters'], $listParams['perPage'], withTrashed: $canViewDeleted, board: $board);
// 일반 게시글 총 건수는 캐시에서 조회 (simplePaginate는 total 미제공)
$totalNormalPosts = $this->postService->getCachedNormalPostCount($slug, $board->id, $listParams['filters'], $canViewDeleted, 'admin');
// PostCollection 구성
$collection = new PostCollection($posts);
@@ -123,6 +128,21 @@ class PostController extends AdminBaseController
// 상세 정보 로드 (조회수 증가, 댓글 로드, 이전/다음 게시글 조회)
$post = $this->postService->loadPostDetail($slug, $id, $canViewDeleted);
// 댓글 신고 여부 일괄 사전 로드 (N+1 방지: 댓글별 개별 쿼리 → 1회 일괄 쿼리)
$user = Auth::user();
if ($user && $post->relationLoaded('comments')) {
$comments = $post->comments;
$board = $post->board;
$commentIds = $comments->pluck('id')->all();
$reportedCommentIds = ! empty($commentIds)
? $this->reportService->getReportedTargetIds($user->id, $board->id, 'comment', $commentIds)
: [];
foreach ($comments as $comment) {
$comment->is_already_reported_preloaded = in_array($comment->id, $reportedCommentIds);
}
}
return $this->successWithResource(
'sirsoft-board::messages.posts.fetch_success',
new PostResource($post)
@@ -3,13 +3,10 @@
namespace Modules\Sirsoft\Board\Http\Controllers\User;
use App\Http\Controllers\Api\Base\PublicBaseController;
use App\Models\User;
use App\Services\CacheService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Modules\Sirsoft\Board\Http\Resources\BoardMenuResource;
use Modules\Sirsoft\Board\Http\Resources\BoardResource;
use Modules\Sirsoft\Board\Models\Board;
use Modules\Sirsoft\Board\Services\BoardService;
/**
@@ -28,7 +25,9 @@ class BoardController extends PublicBaseController
*/
public function __construct(
protected BoardService $boardService
) {}
) {
parent::__construct();
}
/**
* 활성화된 게시판 목록 조회 (경량)
@@ -53,9 +52,9 @@ class BoardController extends PublicBaseController
$data = $boards->map(function ($board) use ($recentPostsLimit) {
$boardData = (new BoardResource($board))->toListArray();
// limit가 0보다 크면 최신글 조회
// limit가 0보다 크면 최신글 조회 (board_id 직접 전달로 slug 재조회 방지)
if ($recentPostsLimit > 0) {
$boardData['recent_posts'] = $this->boardService->getBoardRecentPosts($board->slug, $recentPostsLimit);
$boardData['recent_posts'] = $this->boardService->getBoardRecentPostsById($board->id, $recentPostsLimit);
}
return $boardData;
@@ -100,10 +99,8 @@ class BoardController extends PublicBaseController
*/
public function boardMenu(): JsonResponse
{
// 활성화된 게시판을 오래된 순으로 조회
$boards = $this->boardService->getActiveBoards(orderBy: 'created_at', orderDirection: 'asc');
$boards = $this->boardService->getCachedActiveBoardsForMenu();
// 경량 리소스로 변환하여 반환
return $this->success(
'common.success',
BoardMenuResource::collection($boards)->resolve()
@@ -122,14 +119,7 @@ class BoardController extends PublicBaseController
*/
public function stats(): JsonResponse
{
$stats = CacheService::remember(
'sirsoft-board',
'stats',
fn () => $this->calculateStats(),
config('sirsoft-board.cache.ttl', 60)
);
return $this->success('common.success', $stats);
return $this->success('common.success', $this->boardService->getCachedStats());
}
/**
@@ -145,14 +135,7 @@ class BoardController extends PublicBaseController
{
$limit = min((int) $request->input('limit', 5), 20);
$posts = CacheService::remember(
'sirsoft-board',
"recent_posts_{$limit}",
fn () => $this->boardService->getRecentPosts($limit),
config('sirsoft-board.cache.ttl', 60)
);
return $this->success('common.success', $posts);
return $this->success('common.success', $this->boardService->getCachedRecentPosts($limit));
}
/**
@@ -160,26 +143,22 @@ class BoardController extends PublicBaseController
*
* 조회수가 많은 순으로 게시글 목록을 반환합니다.
* - 기본 20개, 최대 50개까지 조회 가능
* - 기간별 필터링: today, week, month, all (기본: week)
* - 기간별 필터링: today, week, month, year (기본: week)
* - period=all은 하위 호환을 위해 year로 매핑
*
* @param Request $request
* @return JsonResponse
*/
public function popular(Request $request): JsonResponse
{
$period = $request->input('period', 'week'); // today, week, month, all
$period = $request->input('period', 'week');
// all → year 매핑 (하위 호환)
if ($period === 'all') {
$period = 'year';
}
$limit = min((int) $request->input('limit', 20), 50);
$locale = app()->getLocale();
// 캐시 키에 period, locale 포함
$posts = CacheService::remember(
'sirsoft-board',
"popular_posts_{$locale}_{$period}_{$limit}",
fn () => $this->boardService->getPopularPosts($period, $limit),
config('sirsoft-board.cache.ttl', 60)
);
return $this->success('common.success', $posts);
return $this->success('common.success', $this->boardService->getCachedPopularPosts($period, $limit));
}
/**
@@ -194,30 +173,7 @@ class BoardController extends PublicBaseController
public function popularBoards(Request $request): JsonResponse
{
$limit = min((int) $request->input('limit', 4), 20);
$locale = app()->getLocale();
$boards = CacheService::remember(
'sirsoft-board',
"popular_boards_{$locale}_{$limit}",
fn () => $this->boardService->getPopularBoards($limit),
config('sirsoft-board.cache.ttl', 60)
);
return $this->success('common.success', $boards);
}
/**
* 통계 계산 (홈페이지용)
*
* @return array{users: int, boards: int, posts: int, comments: int}
*/
private function calculateStats(): array
{
return [
'users' => User::count(),
'boards' => Board::where('is_active', true)->count(),
'posts' => $this->boardService->getTotalPostsCount(),
'comments' => $this->boardService->getTotalCommentsCount(),
];
return $this->success('common.success', $this->boardService->getCachedPopularBoards($limit));
}
}
@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use Modules\Sirsoft\Board\Http\Requests\StoreCommentRequest;
@@ -93,7 +92,7 @@ class CommentController extends PublicBaseController
$cooldown = (int) ($spamSecurity['comment_cooldown_seconds'] ?? 0);
if ($cooldown > 0) {
$identifier = Auth::id() ?? $request->ip();
Cache::put("comment_cooldown_{$slug}_{$identifier}", true, $cooldown);
$this->commentService->recordCommentCooldown($slug, $identifier, $cooldown);
}
return $this->successWithResource(
@@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use App\Enums\PermissionType;
@@ -24,6 +23,7 @@ use Modules\Sirsoft\Board\Http\Resources\PostResource;
use Modules\Sirsoft\Board\Services\BoardService;
use Modules\Sirsoft\Board\Services\CommentService;
use Modules\Sirsoft\Board\Services\PostService;
use Modules\Sirsoft\Board\Services\ReportService;
use Modules\Sirsoft\Board\Traits\ChecksBoardPermission;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -46,11 +46,13 @@ class PostController extends PublicBaseController
* @param PostService $postService 게시글 서비스
* @param BoardService $boardService 게시판 서비스
* @param CommentService $commentService 댓글 서비스
* @param ReportService $reportService 신고 서비스
*/
public function __construct(
private PostService $postService,
private BoardService $boardService,
private CommentService $commentService
private CommentService $commentService,
private ReportService $reportService
) {}
/**
@@ -80,9 +82,12 @@ class PostController extends PublicBaseController
$canViewDeleted = $this->checkBoardPermission($slug, 'manager', PermissionType::User);
$withTrashed = $canViewDeleted && $request->boolean('del');
// 게시글 목록 조회
$posts = $this->postService->getPosts($slug, $listParams['filters'], $listParams['perPage'], withTrashed: $withTrashed, context: 'user');
$totalNormalPosts = $this->postService->getTotalNormalPosts($slug, $listParams['filters'], $withTrashed, context: 'user');
// 게시글 목록 조회 (simplePaginate — COUNT 쿼리 제거)
// board 객체 전달로 Service/Repository의 중복 Board 조회 방지
$posts = $this->postService->getPosts($slug, $listParams['filters'], $listParams['perPage'], withTrashed: $withTrashed, context: 'user', board: $board);
// 일반 게시글 총 건수는 캐시에서 조회 (simplePaginate는 total 미제공)
$totalNormalPosts = $this->postService->getCachedNormalPostCount($slug, $board->id, $listParams['filters'], $withTrashed, 'user');
// PostCollection 구성
$collection = new PostCollection($posts);
@@ -122,7 +127,7 @@ class PostController extends PublicBaseController
throw new BoardNotFoundException($slug);
}
// 게시글 조회
// 게시글 조회 (스코프 접근 검사 포함)
$post = $this->postService->getPost($slug, $id, context: 'user');
// 삭제된 게시글은 manager 권한 필요
@@ -135,8 +140,8 @@ class PostController extends PublicBaseController
// 조회수 증가 (캐시 기반 중복 방지)
$this->postService->incrementViewCountOnce($slug, $id);
// 댓글/첨부파일 카운트 포함하여 게시글 조회
$post = $this->postService->getPostWithCounts($slug, $id);
// 댓글/첨부파일/답글 포함하여 게시글 조회 (boardId 전달로 Board 재조회 방지)
$post = $this->postService->getPostWithCounts($slug, $id, $board->id);
// board 관계 수동 설정
$post->setRelation('board', $board);
@@ -146,20 +151,30 @@ class PostController extends PublicBaseController
// 댓글 로드 (게시판 comment_order 설정 적용, manager 권한 + 토글 ON 시 삭제 댓글 포함)
$withTrashedComments = $canViewDeleted && $request->boolean('del_cmt');
$comments = $this->commentService->getCommentsByPostId($slug, $id, context: 'user', withTrashed: $withTrashedComments);
$comments = $this->commentService->getCommentsByPostId($slug, $id, context: 'user', withTrashed: $withTrashedComments, boardId: $board->id);
// 댓글의 post에 board 관계 수동 설정 (CommentResource의 권한 체크에 필요)
foreach ($comments as $comment) {
$comment->setRelation('post', $post);
// 신고 여부 일괄 조회 (N+1 방지: 댓글별 개별 쿼리 → 1회 일괄 쿼리)
$user = $request->user();
if ($user) {
$commentIds = $comments->pluck('id')->all();
$reportedCommentIds = $this->reportService
->getReportedTargetIds($user->id, $board->id, 'comment', $commentIds);
foreach ($comments as $comment) {
$comment->is_already_reported_preloaded = in_array($comment->id, $reportedCommentIds);
$comment->setRelation('post', $post);
}
} else {
// 비로그인: 신고 불가이므로 모두 false
foreach ($comments as $comment) {
$comment->is_already_reported_preloaded = false;
$comment->setRelation('post', $post);
}
}
// 정렬된 댓글을 post에 설정
$post->setRelation('comments', $comments);
// 이전/다음 게시글 조회 (manager 권한 + del=1 시 삭제된 게시글 포함)
$withTrashedNav = $canViewDeleted && $request->boolean('del');
$post->navigation = $this->postService->getAdjacentPosts($slug, $id, filters: [], withTrashed: $withTrashedNav);
// 비밀글 권한 체크 및 content 필터링은 PostResource에서 처리
return $this->successWithResource(
'sirsoft-board::messages.posts.fetch_success',
@@ -176,6 +191,50 @@ class PostController extends PublicBaseController
}
}
/**
* 게시글의 이전/다음 네비게이션 정보를 조회합니다.
*
* 상세 API에서 분리하여 비동기 로딩 지원.
* 게시판 정렬 설정에 따라 이전/다음글을 반환합니다.
*
* @param Request $request HTTP 요청
* @param string $slug 게시판 슬러그
* @param string|int $id 게시글 ID
* @return JsonResponse 이전/다음 게시글 정보
*/
public function navigation(Request $request, string $slug, string|int $id): JsonResponse
{
$id = (int) $id;
try {
$board = $this->boardService->getBoardBySlug($slug, checkScope: false);
if (! $board || ! $board->is_active) {
throw new BoardNotFoundException($slug);
}
// 공지글은 이전/다음 네비게이션 미제공
$post = $this->postService->getPost($slug, $id, context: 'user');
if ($post->is_notice) {
return $this->success('sirsoft-board::messages.posts.fetch_success', ['prev' => null, 'next' => null]);
}
// manager 권한 + del=1 시 삭제된 게시글 포함
$canViewDeleted = $this->checkBoardPermission($slug, 'manager', PermissionType::User);
$withTrashed = $canViewDeleted && $request->boolean('del');
$navigation = $this->postService->getAdjacentPosts($slug, $id, filters: [
'order_by' => $board->order_by instanceof \BackedEnum ? $board->order_by->value : $board->order_by,
'order_direction' => $board->order_direction instanceof \BackedEnum ? $board->order_direction->value : $board->order_direction,
], withTrashed: $withTrashed, board: $board);
return $this->success('sirsoft-board::messages.posts.fetch_success', $navigation);
} catch (BoardNotFoundException $e) {
throw $e;
} catch (\Exception $e) {
return $this->error('sirsoft-board::messages.posts.fetch_failed', 500, $e->getMessage());
}
}
/**
* 게시글을 생성합니다.
*
@@ -234,7 +293,7 @@ class PostController extends PublicBaseController
$cooldown = (int) ($spamSecurity['post_cooldown_seconds'] ?? 0);
if ($cooldown > 0) {
$identifier = Auth::id() ?? $request->ip();
Cache::put("post_cooldown_{$slug}_{$identifier}", true, $cooldown);
$this->postService->recordPostCooldown($slug, $identifier, $cooldown);
}
// board 관계 수동 설정
@@ -428,18 +487,17 @@ class PostController extends PublicBaseController
return $this->error($verifyResult['error_key'], $verifyResult['error_code']);
}
// 검증 성공 시 임시 토큰 생성 및 캐시 저장 (1시간 유효)
// 검증 성공 시 임시 토큰 생성 및 캐시 저장
$verificationToken = Str::random(32);
$expiresAt = now()->addHours(1);
Cache::put("board_post_verify_{$slug}_{$id}_{$verificationToken}", true, $expiresAt);
$tokenResult = $this->postService->storeDeleteVerifyToken($slug, $id, $verificationToken);
return $this->success(
'sirsoft-board::messages.posts.password_verified',
[
'verified' => true,
'post_id' => $id,
'verification_token' => $verificationToken,
'expires_at' => $expiresAt->toIso8601String(),
'verification_token' => $tokenResult['token'],
'expires_at' => $tokenResult['expires_at'],
]
);
} catch (ModelNotFoundException $e) {
@@ -511,8 +569,9 @@ class PostController extends PublicBaseController
// 첨부파일 관계 로드
$post->load('attachments');
// 폼용 경량 변환 (abilities/IP/신고 등 불필요한 권한 체크 생략)
$postResource = new PostResource($post);
$postData = $postResource->toArray($request);
$postData = $postResource->toFormArray($request);
$metaData['author'] = $postData['author'] ?? null;
$metaData['created_at'] = $postData['created_at'] ?? null;
@@ -533,7 +592,7 @@ class PostController extends PublicBaseController
$parentPost = $this->postService->getPost($slug, $parentId, context: 'user');
$parentPostResource = new PostResource($parentPost);
$metaData['parent_post'] = $parentPostResource->toArray($request);
$metaData['parent_post'] = $parentPostResource->toFormArray($request);
}
return $this->success('sirsoft-board::messages.posts.form_meta_retrieved', $metaData);
@@ -590,8 +649,9 @@ class PostController extends PublicBaseController
}
}
// 폼용 경량 변환 (abilities/IP/신고 등 불필요한 권한 체크 생략)
$postResource = new PostResource($post);
$postData = $postResource->toArray($request);
$postData = $postResource->toFormArray($request);
$formData = [
'id' => $postData['id'] ?? null,
@@ -699,7 +759,7 @@ class PostController extends PublicBaseController
// =========================================================================
/**
* verification_token이 유효한지 확인합니다.
* verification_token이 유효한지 확인하고 소비합니다.
*
* @param string $slug 게시판 슬러그
* @param int $postId 게시글 ID
@@ -708,7 +768,7 @@ class PostController extends PublicBaseController
*/
private function isVerificationTokenValid(string $slug, int $postId, string $token): bool
{
return (bool) Cache::get("board_post_verify_{$slug}_{$postId}_{$token}");
return $this->postService->consumeDeleteVerifyToken($slug, $postId, $token);
}
// =========================================================================
@@ -6,7 +6,6 @@ use App\Http\Controllers\Api\Base\AuthBaseController;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cache;
use Modules\Sirsoft\Board\Enums\ReportStatus;
use Modules\Sirsoft\Board\Enums\ReportType;
use Modules\Sirsoft\Board\Exceptions\DuplicateReportException;
@@ -112,7 +111,7 @@ class ReportController extends AuthBaseController
$cooldown = (int) ($security['report_cooldown_seconds'] ?? 60);
if ($cooldown > 0) {
$identifier = Auth::id() ?? $request->ip();
Cache::put("report_cooldown_{$slug}_{$identifier}", true, $cooldown);
$this->reportService->recordReportCooldown($slug, $identifier, $cooldown);
}
$this->logUserActivity('board_report.create', [