Merge branch 'develop' of http://114.203.209.83:3000/SamProject/sam-api into develop
This commit is contained in:
@@ -4,8 +4,14 @@
|
||||
|
||||
use App\Helpers\ApiResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Approval\ApproveRequest;
|
||||
use App\Http\Requests\Approval\CancelRequest;
|
||||
use App\Http\Requests\Approval\DelegationStoreRequest;
|
||||
use App\Http\Requests\Approval\DelegationUpdateRequest;
|
||||
use App\Http\Requests\Approval\HoldRequest;
|
||||
use App\Http\Requests\Approval\InboxIndexRequest;
|
||||
use App\Http\Requests\Approval\IndexRequest;
|
||||
use App\Http\Requests\Approval\PreDecideRequest;
|
||||
use App\Http\Requests\Approval\ReferenceIndexRequest;
|
||||
use App\Http\Requests\Approval\RejectRequest;
|
||||
use App\Http\Requests\Approval\StoreRequest;
|
||||
@@ -133,10 +139,10 @@ public function submit(int $id, SubmitRequest $request): JsonResponse
|
||||
* 결재 승인
|
||||
* POST /v1/approvals/{id}/approve
|
||||
*/
|
||||
public function approve(int $id, Request $request): JsonResponse
|
||||
public function approve(int $id, ApproveRequest $request): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id, $request) {
|
||||
return $this->service->approve($id, $request->input('comment'));
|
||||
return $this->service->approve($id, $request->validated()['comment'] ?? null);
|
||||
}, __('message.approval.approved'));
|
||||
}
|
||||
|
||||
@@ -155,11 +161,99 @@ public function reject(int $id, RejectRequest $request): JsonResponse
|
||||
* 결재 회수 (기안자만)
|
||||
* POST /v1/approvals/{id}/cancel
|
||||
*/
|
||||
public function cancel(int $id): JsonResponse
|
||||
public function cancel(int $id, CancelRequest $request): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id, $request) {
|
||||
return $this->service->cancel($id, $request->validated()['recall_reason'] ?? null);
|
||||
}, __('message.approval.cancelled'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 보류 (현재 결재자만)
|
||||
* POST /v1/approvals/{id}/hold
|
||||
*/
|
||||
public function hold(int $id, HoldRequest $request): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id, $request) {
|
||||
return $this->service->hold($id, $request->validated()['comment']);
|
||||
}, __('message.approval.held'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 보류 해제 (보류한 결재자만)
|
||||
* POST /v1/approvals/{id}/release-hold
|
||||
*/
|
||||
public function releaseHold(int $id): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id) {
|
||||
return $this->service->cancel($id);
|
||||
}, __('message.approval.cancelled'));
|
||||
return $this->service->releaseHold($id);
|
||||
}, __('message.approval.hold_released'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 전결 (현재 결재자가 이후 모든 결재를 건너뛰고 최종 승인)
|
||||
* POST /v1/approvals/{id}/pre-decide
|
||||
*/
|
||||
public function preDecide(int $id, PreDecideRequest $request): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id, $request) {
|
||||
return $this->service->preDecide($id, $request->validated()['comment'] ?? null);
|
||||
}, __('message.approval.pre_decided'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 복사 재기안
|
||||
* POST /v1/approvals/{id}/copy
|
||||
*/
|
||||
public function copyForRedraft(int $id): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id) {
|
||||
return $this->service->copyForRedraft($id);
|
||||
}, __('message.approval.copied'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 완료함 목록
|
||||
* GET /v1/approvals/completed
|
||||
*/
|
||||
public function completed(IndexRequest $request): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request) {
|
||||
return $this->service->completed($request->validated());
|
||||
}, __('message.fetched'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 완료함 현황 카드
|
||||
* GET /v1/approvals/completed/summary
|
||||
*/
|
||||
public function completedSummary(): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () {
|
||||
return $this->service->completedSummary();
|
||||
}, __('message.fetched'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 미처리 건수 (뱃지용)
|
||||
* GET /v1/approvals/badge-counts
|
||||
*/
|
||||
public function badgeCounts(): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () {
|
||||
return $this->service->badgeCounts();
|
||||
}, __('message.fetched'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 완료함 미읽음 일괄 읽음 처리
|
||||
* POST /v1/approvals/completed/mark-read
|
||||
*/
|
||||
public function markCompletedAsRead(): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () {
|
||||
return $this->service->markCompletedAsRead();
|
||||
}, __('message.approval.marked_read'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -183,4 +277,52 @@ public function markUnread(int $id): JsonResponse
|
||||
return $this->service->markUnread($id);
|
||||
}, __('message.approval.marked_unread'));
|
||||
}
|
||||
|
||||
// =========================================================================
|
||||
// 위임 관리
|
||||
// =========================================================================
|
||||
|
||||
/**
|
||||
* 위임 목록
|
||||
* GET /v1/approvals/delegations
|
||||
*/
|
||||
public function delegationIndex(Request $request): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request) {
|
||||
return $this->service->delegationIndex($request->all());
|
||||
}, __('message.fetched'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 위임 생성
|
||||
* POST /v1/approvals/delegations
|
||||
*/
|
||||
public function delegationStore(DelegationStoreRequest $request): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request) {
|
||||
return $this->service->delegationStore($request->validated());
|
||||
}, __('message.created'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 위임 수정
|
||||
* PATCH /v1/approvals/delegations/{id}
|
||||
*/
|
||||
public function delegationUpdate(int $id, DelegationUpdateRequest $request): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id, $request) {
|
||||
return $this->service->delegationUpdate($id, $request->validated());
|
||||
}, __('message.updated'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 위임 삭제
|
||||
* DELETE /v1/approvals/delegations/{id}
|
||||
*/
|
||||
public function delegationDestroy(int $id): JsonResponse
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id) {
|
||||
return $this->service->delegationDestroy($id);
|
||||
}, __('message.deleted'));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user