SamProject/sam-api
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Phase 5.1-1 사용자 초대 + Phase 5.2 알림 설정 API 연동

Browse Source 
- 사용자 초대 API: role 문자열 지원 추가 (React 호환)
- 알림 설정 API: 그룹 기반 계층 구조 구현
  - notification_setting_groups 테이블 추가
  - notification_setting_group_items 테이블 추가
  - notification_setting_group_states 테이블 추가
  - GET/PUT /api/v1/settings/notifications 엔드포인트 추가
- Pint 코드 스타일 정리
This commit is contained in:
권혁성
2025-12-22 17:42:59 +09:00
parent eeca8d3e0f
commit a27b1b2091
43 changed files with 2980 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/V1/CommonController.php
View File

@@ -57,4 +57,4 @@ public function destroy(Request $request, int $id)
return [];
}, __('message.deleted'));
}
}
}

53
app/Http/Controllers/Api/V1/CompanyController.php
View File

@@ -2,12 +2,12 @@
namespace App\Http\Controllers\Api\V1;
use App\Helpers\ApiResponse;
use App\Http\Controllers\Controller;
use App\Http\Requests\V1\Company\CheckBusinessNumberRequest;
use App\Http\Requests\V1\Company\CompanyRequestActionRequest;
use App\Http\Requests\V1\Company\CompanyRequestIndexRequest;
use App\Http\Requests\V1\Company\CompanyRequestStoreRequest;
use App\Http\Response\ApiResponse;
use App\Services\CompanyService;
use Illuminate\Http\JsonResponse;
@@ -22,11 +22,12 @@ public function __construct(
*/
public function check(CheckBusinessNumberRequest $request): JsonResponse
{
$result = $this->companyService->checkBusinessNumber(
$request->validated()['business_number']
return ApiResponse::handle(
fn () => $this->companyService->checkBusinessNumber(
$request->validated()['business_number']
),
__('message.company.checked')
);
return ApiResponse::handle('message.company.checked', $result);
}
/**
@@ -34,9 +35,10 @@ public function check(CheckBusinessNumberRequest $request): JsonResponse
*/
public function request(CompanyRequestStoreRequest $request): JsonResponse
{
$result = $this->companyService->createRequest($request->validated());
return ApiResponse::handle('message.company.request_created', $result, 201);
return ApiResponse::handle(
fn () => $this->companyService->createRequest($request->validated()),
__('message.company.request_created')
);
}
/**
@@ -44,9 +46,10 @@ public function request(CompanyRequestStoreRequest $request): JsonResponse
*/
public function requests(CompanyRequestIndexRequest $request): JsonResponse
{
$result = $this->companyService->getRequests($request->validated());
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->companyService->getRequests($request->validated()),
__('message.fetched')
);
}
/**
@@ -54,9 +57,10 @@ public function requests(CompanyRequestIndexRequest $request): JsonResponse
*/
public function showRequest(int $id): JsonResponse
{
$result = $this->companyService->getRequest($id);
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->companyService->getRequest($id),
__('message.fetched')
);
}
/**
@@ -64,9 +68,10 @@ public function showRequest(int $id): JsonResponse
*/
public function approve(int $id): JsonResponse
{
$result = $this->companyService->approveRequest($id);
return ApiResponse::handle('message.company.request_approved', $result);
return ApiResponse::handle(
fn () => $this->companyService->approveRequest($id),
__('message.company.request_approved')
);
}
/**
@@ -74,9 +79,10 @@ public function approve(int $id): JsonResponse
*/
public function reject(CompanyRequestActionRequest $request, int $id): JsonResponse
{
$result = $this->companyService->rejectRequest($id, $request->validated()['reason'] ?? null);
return ApiResponse::handle('message.company.request_rejected', $result);
return ApiResponse::handle(
fn () => $this->companyService->rejectRequest($id, $request->validated()['reason'] ?? null),
__('message.company.request_rejected')
);
}
/**
@@ -84,8 +90,9 @@ public function reject(CompanyRequestActionRequest $request, int $id): JsonRespo
*/
public function myRequests(CompanyRequestIndexRequest $request): JsonResponse
{
$result = $this->companyService->getMyRequests($request->validated());
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->companyService->getMyRequests($request->validated()),
__('message.fetched')
);
}
}

1
app/Http/Controllers/Api/V1/ItemsBomController.php
View File

@@ -44,6 +44,7 @@ public function listAll(Request $request)
// BOM 개수 추가
$items->getCollection()->transform(function ($item) {
$bom = $item->bom ?? [];
return [
'id' => $item->id,
'code' => $item->code,

2
app/Http/Controllers/Api/V1/LoanController.php
View File

@@ -8,7 +8,7 @@
use App\Http\Requests\Loan\LoanSettleRequest;
use App\Http\Requests\Loan\LoanStoreRequest;
use App\Http\Requests\Loan\LoanUpdateRequest;
use App\Http\Response\ApiResponse;
use App\Helpers\ApiResponse;
use App\Services\LoanService;
use Illuminate\Http\JsonResponse;

23
app/Http/Controllers/Api/V1/NotificationSettingController.php
View File

@@ -5,6 +5,7 @@
use App\Helpers\ApiResponse;
use App\Http\Controllers\Controller;
use App\Http\Requests\NotificationSetting\BulkUpdateSettingRequest;
use App\Http\Requests\NotificationSetting\UpdateGroupedSettingRequest;
use App\Http\Requests\NotificationSetting\UpdateSettingRequest;
use App\Services\NotificationSettingService;
use Illuminate\Http\JsonResponse;
@@ -47,4 +48,26 @@ public function bulkUpdate(BulkUpdateSettingRequest $request): JsonResponse
__('message.bulk_upsert')
);
}
/**
* 그룹 기반 알림 설정 조회 (React 호환)
*/
public function indexGrouped(): JsonResponse
{
return ApiResponse::handle(
fn () => $this->service->getGroupedSettings(),
__('message.fetched')
);
}
/**
* 그룹 기반 알림 설정 업데이트 (React 호환)
*/
public function updateGrouped(UpdateGroupedSettingRequest $request): JsonResponse
{
return ApiResponse::handle(
fn () => $this->service->updateGroupedSettings($request->validated()),
__('message.updated')
);
}
}

58
app/Http/Controllers/Api/V1/PaymentController.php
View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers\Api\V1;
use App\Helpers\ApiResponse;
use App\Http\Controllers\Controller;
use App\Http\Requests\V1\Payment\PaymentActionRequest;
use App\Http\Requests\V1\Payment\PaymentIndexRequest;
use App\Http\Requests\V1\Payment\PaymentStoreRequest;
use App\Http\Response\ApiResponse;
use App\Services\PaymentService;
use Illuminate\Http\JsonResponse;
@@ -21,9 +21,10 @@ public function __construct(
*/
public function index(PaymentIndexRequest $request): JsonResponse
{
$result = $this->paymentService->index($request->validated());
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->paymentService->index($request->validated()),
__('message.fetched')
);
}
/**
@@ -31,9 +32,10 @@ public function index(PaymentIndexRequest $request): JsonResponse
*/
public function summary(PaymentIndexRequest $request): JsonResponse
{
$result = $this->paymentService->summary($request->validated());
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->paymentService->summary($request->validated()),
__('message.fetched')
);
}
/**
@@ -41,9 +43,10 @@ public function summary(PaymentIndexRequest $request): JsonResponse
*/
public function show(int $id): JsonResponse
{
$result = $this->paymentService->show($id);
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->paymentService->show($id),
__('message.fetched')
);
}
/**
@@ -51,9 +54,10 @@ public function show(int $id): JsonResponse
*/
public function store(PaymentStoreRequest $request): JsonResponse
{
$result = $this->paymentService->store($request->validated());
return ApiResponse::handle('message.created', $result, 201);
return ApiResponse::handle(
fn () => $this->paymentService->store($request->validated()),
__('message.created')
);
}
/**
@@ -61,9 +65,10 @@ public function store(PaymentStoreRequest $request): JsonResponse
*/
public function complete(PaymentActionRequest $request, int $id): JsonResponse
{
$result = $this->paymentService->complete($id, $request->validated()['transaction_id'] ?? null);
return ApiResponse::handle('message.payment.completed', $result);
return ApiResponse::handle(
fn () => $this->paymentService->complete($id, $request->validated()['transaction_id'] ?? null),
__('message.payment.completed')
);
}
/**
@@ -71,9 +76,10 @@ public function complete(PaymentActionRequest $request, int $id): JsonResponse
*/
public function cancel(PaymentActionRequest $request, int $id): JsonResponse
{
$result = $this->paymentService->cancel($id, $request->validated()['reason'] ?? null);
return ApiResponse::handle('message.payment.cancelled', $result);
return ApiResponse::handle(
fn () => $this->paymentService->cancel($id, $request->validated()['reason'] ?? null),
__('message.payment.cancelled')
);
}
/**
@@ -81,9 +87,10 @@ public function cancel(PaymentActionRequest $request, int $id): JsonResponse
*/
public function refund(PaymentActionRequest $request, int $id): JsonResponse
{
$result = $this->paymentService->refund($id, $request->validated()['reason'] ?? null);
return ApiResponse::handle('message.payment.refunded', $result);
return ApiResponse::handle(
fn () => $this->paymentService->refund($id, $request->validated()['reason'] ?? null),
__('message.payment.refunded')
);
}
/**
@@ -91,8 +98,9 @@ public function refund(PaymentActionRequest $request, int $id): JsonResponse
*/
public function statement(int $id): JsonResponse
{
$result = $this->paymentService->statement($id);
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->paymentService->statement($id),
__('message.fetched')
);
}
}

2
app/Http/Controllers/Api/V1/PlanController.php
View File

@@ -6,7 +6,7 @@
use App\Http\Requests\V1\Plan\PlanIndexRequest;
use App\Http\Requests\V1\Plan\PlanStoreRequest;
use App\Http\Requests\V1\Plan\PlanUpdateRequest;
use App\Http\Response\ApiResponse;
use App\Helpers\ApiResponse;
use App\Services\PlanService;
use Illuminate\Http\JsonResponse;

79
app/Http/Controllers/Api/V1/SubscriptionController.php
View File

@@ -2,12 +2,12 @@
namespace App\Http\Controllers\Api\V1;
use App\Helpers\ApiResponse;
use App\Http\Controllers\Controller;
use App\Http\Requests\V1\Subscription\ExportStoreRequest;
use App\Http\Requests\V1\Subscription\SubscriptionCancelRequest;
use App\Http\Requests\V1\Subscription\SubscriptionIndexRequest;
use App\Http\Requests\V1\Subscription\SubscriptionStoreRequest;
use App\Http\Response\ApiResponse;
use App\Services\SubscriptionService;
use Illuminate\Http\JsonResponse;
@@ -22,9 +22,10 @@ public function __construct(
*/
public function index(SubscriptionIndexRequest $request): JsonResponse
{
$result = $this->subscriptionService->index($request->validated());
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->index($request->validated()),
__('message.fetched')
);
}
/**
@@ -32,9 +33,10 @@ public function index(SubscriptionIndexRequest $request): JsonResponse
*/
public function current(): JsonResponse
{
$result = $this->subscriptionService->current();
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->current(),
__('message.fetched')
);
}
/**
@@ -42,9 +44,10 @@ public function current(): JsonResponse
*/
public function store(SubscriptionStoreRequest $request): JsonResponse
{
$result = $this->subscriptionService->store($request->validated());
return ApiResponse::handle('message.created', $result, 201);
return ApiResponse::handle(
fn () => $this->subscriptionService->store($request->validated()),
__('message.created')
);
}
/**
@@ -52,9 +55,10 @@ public function store(SubscriptionStoreRequest $request): JsonResponse
*/
public function show(int $id): JsonResponse
{
$result = $this->subscriptionService->show($id);
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->show($id),
__('message.fetched')
);
}
/**
@@ -62,9 +66,10 @@ public function show(int $id): JsonResponse
*/
public function cancel(SubscriptionCancelRequest $request, int $id): JsonResponse
{
$result = $this->subscriptionService->cancel($id, $request->validated()['reason'] ?? null);
return ApiResponse::handle('message.subscription.cancelled', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->cancel($id, $request->validated()['reason'] ?? null),
__('message.subscription.cancelled')
);
}
/**
@@ -72,9 +77,10 @@ public function cancel(SubscriptionCancelRequest $request, int $id): JsonRespons
*/
public function renew(SubscriptionStoreRequest $request, int $id): JsonResponse
{
$result = $this->subscriptionService->renew($id, $request->validated());
return ApiResponse::handle('message.subscription.renewed', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->renew($id, $request->validated()),
__('message.subscription.renewed')
);
}
/**
@@ -82,9 +88,10 @@ public function renew(SubscriptionStoreRequest $request, int $id): JsonResponse
*/
public function suspend(int $id): JsonResponse
{
$result = $this->subscriptionService->suspend($id);
return ApiResponse::handle('message.subscription.suspended', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->suspend($id),
__('message.subscription.suspended')
);
}
/**
@@ -92,9 +99,10 @@ public function suspend(int $id): JsonResponse
*/
public function resume(int $id): JsonResponse
{
$result = $this->subscriptionService->resume($id);
return ApiResponse::handle('message.subscription.resumed', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->resume($id),
__('message.subscription.resumed')
);
}
/**
@@ -102,9 +110,10 @@ public function resume(int $id): JsonResponse
*/
public function usage(): JsonResponse
{
$result = $this->subscriptionService->usage();
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->usage(),
__('message.fetched')
);
}
/**
@@ -112,9 +121,10 @@ public function usage(): JsonResponse
*/
public function export(ExportStoreRequest $request): JsonResponse
{
$result = $this->subscriptionService->createExport($request->validated());
return ApiResponse::handle('message.export.requested', $result, 201);
return ApiResponse::handle(
fn () => $this->subscriptionService->createExport($request->validated()),
__('message.export.requested')
);
}
/**
@@ -122,8 +132,9 @@ public function export(ExportStoreRequest $request): JsonResponse
*/
public function exportStatus(int $id): JsonResponse
{
$result = $this->subscriptionService->getExport($id);
return ApiResponse::handle('message.fetched', $result);
return ApiResponse::handle(
fn () => $this->subscriptionService->getExport($id),
__('message.fetched')
);
}
}

2
app/Http/Controllers/Api/V1/TenantFieldSettingController.php
View File

@@ -29,4 +29,4 @@ public function updateOne(Request $request, string $key)
return TenantFieldSettingService::updateOne($key, $request->all());
}, '테넌트 필드 설정 단건 수정');
}
}
}

99
app/Http/Requests/NotificationSetting/UpdateGroupedSettingRequest.php Normal file
View File

@@ -0,0 +1,99 @@
<?php
namespace App\Http\Requests\NotificationSetting;
use Illuminate\Foundation\Http\FormRequest;
class UpdateGroupedSettingRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
// React 구조 검증:
// {
// "notice": { "enabled": true, "notice": { "enabled": true, "email": false }, ... },
// "schedule": { "enabled": false, ... },
// ...
// }
return [
'notice' => ['sometimes', 'array'],
'notice.enabled' => ['sometimes', 'boolean'],
'notice.notice' => ['sometimes', 'array'],
'notice.notice.enabled' => ['sometimes', 'boolean'],
'notice.notice.email' => ['sometimes', 'boolean'],
'notice.event' => ['sometimes', 'array'],
'notice.event.enabled' => ['sometimes', 'boolean'],
'notice.event.email' => ['sometimes', 'boolean'],
'schedule' => ['sometimes', 'array'],
'schedule.enabled' => ['sometimes', 'boolean'],
'schedule.vatReport' => ['sometimes', 'array'],
'schedule.vatReport.enabled' => ['sometimes', 'boolean'],
'schedule.vatReport.email' => ['sometimes', 'boolean'],
'schedule.incomeTaxReport' => ['sometimes', 'array'],
'schedule.incomeTaxReport.enabled' => ['sometimes', 'boolean'],
'schedule.incomeTaxReport.email' => ['sometimes', 'boolean'],
'vendor' => ['sometimes', 'array'],
'vendor.enabled' => ['sometimes', 'boolean'],
'vendor.newVendor' => ['sometimes', 'array'],
'vendor.newVendor.enabled' => ['sometimes', 'boolean'],
'vendor.newVendor.email' => ['sometimes', 'boolean'],
'vendor.creditRating' => ['sometimes', 'array'],
'vendor.creditRating.enabled' => ['sometimes', 'boolean'],
'vendor.creditRating.email' => ['sometimes', 'boolean'],
'attendance' => ['sometimes', 'array'],
'attendance.enabled' => ['sometimes', 'boolean'],
'attendance.annualLeave' => ['sometimes', 'array'],
'attendance.annualLeave.enabled' => ['sometimes', 'boolean'],
'attendance.annualLeave.email' => ['sometimes', 'boolean'],
'attendance.clockIn' => ['sometimes', 'array'],
'attendance.clockIn.enabled' => ['sometimes', 'boolean'],
'attendance.clockIn.email' => ['sometimes', 'boolean'],
'attendance.late' => ['sometimes', 'array'],
'attendance.late.enabled' => ['sometimes', 'boolean'],
'attendance.late.email' => ['sometimes', 'boolean'],
'attendance.absent' => ['sometimes', 'array'],
'attendance.absent.enabled' => ['sometimes', 'boolean'],
'attendance.absent.email' => ['sometimes', 'boolean'],
'order' => ['sometimes', 'array'],
'order.enabled' => ['sometimes', 'boolean'],
'order.salesOrder' => ['sometimes', 'array'],
'order.salesOrder.enabled' => ['sometimes', 'boolean'],
'order.salesOrder.email' => ['sometimes', 'boolean'],
'order.purchaseOrder' => ['sometimes', 'array'],
'order.purchaseOrder.enabled' => ['sometimes', 'boolean'],
'order.purchaseOrder.email' => ['sometimes', 'boolean'],
'approval' => ['sometimes', 'array'],
'approval.enabled' => ['sometimes', 'boolean'],
'approval.approvalRequest' => ['sometimes', 'array'],
'approval.approvalRequest.enabled' => ['sometimes', 'boolean'],
'approval.approvalRequest.email' => ['sometimes', 'boolean'],
'approval.draftApproved' => ['sometimes', 'array'],
'approval.draftApproved.enabled' => ['sometimes', 'boolean'],
'approval.draftApproved.email' => ['sometimes', 'boolean'],
'approval.draftRejected' => ['sometimes', 'array'],
'approval.draftRejected.enabled' => ['sometimes', 'boolean'],
'approval.draftRejected.email' => ['sometimes', 'boolean'],
'approval.draftCompleted' => ['sometimes', 'array'],
'approval.draftCompleted.enabled' => ['sometimes', 'boolean'],
'approval.draftCompleted.email' => ['sometimes', 'boolean'],
'production' => ['sometimes', 'array'],
'production.enabled' => ['sometimes', 'boolean'],
'production.safetyStock' => ['sometimes', 'array'],
'production.safetyStock.enabled' => ['sometimes', 'boolean'],
'production.safetyStock.email' => ['sometimes', 'boolean'],
'production.productionComplete' => ['sometimes', 'array'],
'production.productionComplete.enabled' => ['sometimes', 'boolean'],
'production.productionComplete.email' => ['sometimes', 'boolean'],
];
}
}

13
app/Http/Requests/UserInvitation/InviteUserRequest.php
View File

@@ -15,12 +15,25 @@ public function rules(): array
{
return [
'email' => ['required', 'email', 'max:255'],
'role' => ['nullable', 'string', 'in:admin,manager,user'],
'role_id' => ['nullable', 'integer', 'exists:roles,id'],
'message' => ['nullable', 'string', 'max:1000'],
'expires_days' => ['nullable', 'integer', 'min:1', 'max:30'],
];
}
/**
* 추가 유효성 검사: role과 role_id 중 하나만 사용
*/
public function withValidator($validator): void
{
$validator->after(function ($validator) {
if ($this->filled('role') && $this->filled('role_id')) {
$validator->errors()->add('role', __('validation.custom.role_conflict'));
}
});
}
public function messages(): array
{
return [