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

fix(API): FormRequest 타입 및 검증 수정

Browse Source 
- SendFcmRequest, PositionReorderRequest 수정
- TenantLogoUploadRequest, Salary Requests 수정
- StructureReview Requests 수정
- HandoverReport, SiteBriefing Requests 추가

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
권혁성
2026-01-13 19:49:17 +09:00
parent b7c635fb4f
commit 4764eeb9d4
9 changed files with 367 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Admin/SendFcmRequest.php
View File

@@ -34,4 +34,4 @@ public function messages(): array
'platform.in' => __('validation.in', ['attribute' => '플랫폼']),
];
}
}
}

97
app/Http/Requests/Construction/HandoverReportStoreRequest.php Normal file
View File

@@ -0,0 +1,97 @@
<?php
namespace App\Http\Requests\Construction;
use App\Models\Construction\HandoverReport;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class HandoverReportStoreRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
return [
// 기본 정보
'report_number' => 'required|string|max:50',
'contract_id' => 'nullable|integer',
'site_name' => 'required|string|max:255',
// 거래처 정보
'partner_id' => 'nullable|integer',
'partner_name' => 'nullable|string|max:255',
// 담당자 정보
'contract_manager_id' => 'nullable|integer',
'contract_manager_name' => 'nullable|string|max:100',
'construction_pm_id' => 'nullable|integer',
'construction_pm_name' => 'nullable|string|max:100',
// 계약 상세
'total_sites' => 'nullable|integer|min:0',
'contract_amount' => 'nullable|numeric|min:0',
'contract_date' => 'nullable|date',
'contract_start_date' => 'nullable|date',
'contract_end_date' => 'nullable|date|after_or_equal:contract_start_date',
'completion_date' => 'nullable|date',
// 상태 정보
'status' => [
'nullable',
Rule::in([HandoverReport::STATUS_PENDING, HandoverReport::STATUS_COMPLETED]),
],
// 2차 배관
'has_secondary_piping' => 'nullable|boolean',
'secondary_piping_amount' => 'nullable|numeric|min:0',
'secondary_piping_note' => 'nullable|string',
// 도장 & 코킹
'has_coating' => 'nullable|boolean',
'coating_amount' => 'nullable|numeric|min:0',
'coating_note' => 'nullable|string',
// 장비 외 실행금액
'external_equipment_cost' => 'nullable|array',
'external_equipment_cost.shipping_cost' => 'nullable|numeric|min:0',
'external_equipment_cost.high_altitude_work' => 'nullable|numeric|min:0',
'external_equipment_cost.public_expense' => 'nullable|numeric|min:0',
// 특이사항
'special_notes' => 'nullable|string',
// 공사담당자 목록
'managers' => 'nullable|array',
'managers.*.name' => 'required_with:managers|string|max:100',
'managers.*.non_performance_reason' => 'nullable|string',
'managers.*.signature' => 'nullable|string',
// 계약 ITEM 목록
'items' => 'nullable|array',
'items.*.item_no' => 'nullable|integer|min:0',
'items.*.name' => 'required_with:items|string|max:255',
'items.*.product' => 'nullable|string|max:255',
'items.*.quantity' => 'nullable|integer|min:0',
'items.*.remark' => 'nullable|string',
// 기타
'is_active' => 'nullable|boolean',
];
}
public function messages(): array
{
return [
'report_number.required' => __('validation.required', ['attribute' => '보고서번호']),
'report_number.max' => __('validation.max.string', ['attribute' => '보고서번호', 'max' => 50]),
'site_name.required' => __('validation.required', ['attribute' => '현장명']),
'contract_end_date.after_or_equal' => __('validation.after_or_equal', ['attribute' => '계약종료일', 'date' => '계약시작일']),
'managers.*.name.required_with' => __('validation.required', ['attribute' => '담당자명']),
'items.*.name.required_with' => __('validation.required', ['attribute' => 'ITEM 명칭']),
];
}
}

95
app/Http/Requests/Construction/HandoverReportUpdateRequest.php Normal file
View File

@@ -0,0 +1,95 @@
<?php
namespace App\Http\Requests\Construction;
use App\Models\Construction\HandoverReport;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class HandoverReportUpdateRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
return [
// 기본 정보
'report_number' => 'sometimes|string|max:50',
'contract_id' => 'nullable|integer',
'site_name' => 'sometimes|string|max:255',
// 거래처 정보
'partner_id' => 'nullable|integer',
'partner_name' => 'nullable|string|max:255',
// 담당자 정보
'contract_manager_id' => 'nullable|integer',
'contract_manager_name' => 'nullable|string|max:100',
'construction_pm_id' => 'nullable|integer',
'construction_pm_name' => 'nullable|string|max:100',
// 계약 상세
'total_sites' => 'nullable|integer|min:0',
'contract_amount' => 'nullable|numeric|min:0',
'contract_date' => 'nullable|date',
'contract_start_date' => 'nullable|date',
'contract_end_date' => 'nullable|date|after_or_equal:contract_start_date',
'completion_date' => 'nullable|date',
// 상태 정보
'status' => [
'nullable',
Rule::in([HandoverReport::STATUS_PENDING, HandoverReport::STATUS_COMPLETED]),
],
// 2차 배관
'has_secondary_piping' => 'nullable|boolean',
'secondary_piping_amount' => 'nullable|numeric|min:0',
'secondary_piping_note' => 'nullable|string',
// 도장 & 코킹
'has_coating' => 'nullable|boolean',
'coating_amount' => 'nullable|numeric|min:0',
'coating_note' => 'nullable|string',
// 장비 외 실행금액
'external_equipment_cost' => 'nullable|array',
'external_equipment_cost.shipping_cost' => 'nullable|numeric|min:0',
'external_equipment_cost.high_altitude_work' => 'nullable|numeric|min:0',
'external_equipment_cost.public_expense' => 'nullable|numeric|min:0',
// 특이사항
'special_notes' => 'nullable|string',
// 공사담당자 목록
'managers' => 'nullable|array',
'managers.*.name' => 'required_with:managers|string|max:100',
'managers.*.non_performance_reason' => 'nullable|string',
'managers.*.signature' => 'nullable|string',
// 계약 ITEM 목록
'items' => 'nullable|array',
'items.*.item_no' => 'nullable|integer|min:0',
'items.*.name' => 'required_with:items|string|max:255',
'items.*.product' => 'nullable|string|max:255',
'items.*.quantity' => 'nullable|integer|min:0',
'items.*.remark' => 'nullable|string',
// 기타
'is_active' => 'nullable|boolean',
];
}
public function messages(): array
{
return [
'report_number.max' => __('validation.max.string', ['attribute' => '보고서번호', 'max' => 50]),
'contract_end_date.after_or_equal' => __('validation.after_or_equal', ['attribute' => '계약종료일', 'date' => '계약시작일']),
'managers.*.name.required_with' => __('validation.required', ['attribute' => '담당자명']),
'items.*.name.required_with' => __('validation.required', ['attribute' => 'ITEM 명칭']),
];
}
}

2
app/Http/Requests/Construction/StructureReviewStoreRequest.php
View File

@@ -56,4 +56,4 @@ public function messages(): array
'completion_date.after_or_equal' => __('validation.after_or_equal', ['attribute' => '완료일', 'date' => '의뢰일']),
];
}
}
}

2
app/Http/Requests/Construction/StructureReviewUpdateRequest.php
View File

@@ -56,4 +56,4 @@ public function messages(): array
'completion_date.after_or_equal' => __('validation.after_or_equal', ['attribute' => '완료일', 'date' => '의뢰일']),
];
}
}
}

2
app/Http/Requests/PositionReorderRequest.php
View File

@@ -29,4 +29,4 @@ public function messages(): array
'items.*.sort_order.required' => __('validation.required', ['attribute' => '정렬순서']),
];
}
}
}

86
app/Http/Requests/SiteBriefing/StoreSiteBriefingRequest.php Normal file
View File

@@ -0,0 +1,86 @@
<?php
namespace App\Http\Requests\SiteBriefing;
use App\Models\Tenants\SiteBriefing;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class StoreSiteBriefingRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
return [
// 기본 정보
'title' => 'required|string|max:200',
'description' => 'nullable|string|max:5000',
// 거래처/현장 연결
'partner_id' => 'nullable|integer|exists:clients,id',
'site_id' => 'nullable|integer|exists:sites,id',
// 일정 정보
'briefing_date' => 'required|date',
'briefing_time' => 'nullable|string|max:10',
'briefing_type' => ['nullable', 'string', Rule::in(SiteBriefing::TYPES)],
'location' => 'nullable|string|max:200',
'address' => 'nullable|string|max:255',
// 상태 정보
'status' => ['nullable', 'string', Rule::in(SiteBriefing::STATUSES)],
'bid_status' => ['nullable', 'string', Rule::in(SiteBriefing::BID_STATUSES)],
'bid_date' => 'nullable|date',
// 참석자 정보 (JSON)
'attendees' => 'nullable|array',
'attendees.*.user_id' => 'nullable|integer|exists:users,id',
'attendees.*.name' => 'required|string|max:50',
'attendees.*.type' => 'required|string|in:internal,external',
'attendees.*.company' => 'nullable|string|max:100',
'attendees.*.phone' => 'nullable|string|max:20',
'attendees.*.email' => 'nullable|email|max:100',
'attendees.*.position' => 'nullable|string|max:50',
'attendance_status' => ['nullable', 'string', Rule::in(SiteBriefing::ATTENDANCE_STATUSES)],
// 공사 정보
'site_count' => 'nullable|integer|min:0',
'construction_start_date' => 'nullable|date',
'construction_end_date' => 'nullable|date|after_or_equal:construction_start_date',
'vat_type' => ['nullable', 'string', Rule::in(SiteBriefing::VAT_TYPES)],
// 프론트엔드 호환성을 위한 필드 매핑
'project_name' => 'nullable|string|max:200', // title로 매핑
'work_report' => 'nullable|string|max:5000', // description으로 매핑
];
}
/**
* 검증 데이터 준비
*/
protected function prepareForValidation(): void
{
// project_name이 있고 title이 없으면 project_name을 title로 사용
if ($this->filled('project_name') && ! $this->filled('title')) {
$this->merge(['title' => $this->project_name]);
}
// work_report가 있고 description이 없으면 work_report를 description으로 사용
if ($this->filled('work_report') && ! $this->filled('description')) {
$this->merge(['description' => $this->work_report]);
}
}
public function messages(): array
{
return [
'title.required' => __('validation.required', ['attribute' => '현장설명회명']),
'briefing_date.required' => __('validation.required', ['attribute' => '현장설명회 일자']),
'construction_end_date.after_or_equal' => '공사 종료일은 시작일 이후여야 합니다.',
];
}
}

84
app/Http/Requests/SiteBriefing/UpdateSiteBriefingRequest.php Normal file
View File

@@ -0,0 +1,84 @@
<?php
namespace App\Http\Requests\SiteBriefing;
use App\Models\Tenants\SiteBriefing;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class UpdateSiteBriefingRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
return [
// 기본 정보
'title' => 'sometimes|string|max:200',
'description' => 'nullable|string|max:5000',
// 거래처/현장 연결
'partner_id' => 'nullable|integer|exists:clients,id',
'site_id' => 'nullable|integer|exists:sites,id',
// 일정 정보
'briefing_date' => 'sometimes|date',
'briefing_time' => 'nullable|string|max:10',
'briefing_type' => ['nullable', 'string', Rule::in(SiteBriefing::TYPES)],
'location' => 'nullable|string|max:200',
'address' => 'nullable|string|max:255',
// 상태 정보
'status' => ['nullable', 'string', Rule::in(SiteBriefing::STATUSES)],
'bid_status' => ['nullable', 'string', Rule::in(SiteBriefing::BID_STATUSES)],
'bid_date' => 'nullable|date',
// 참석자 정보 (JSON)
'attendees' => 'nullable|array',
'attendees.*.user_id' => 'nullable|integer|exists:users,id',
'attendees.*.name' => 'required|string|max:50',
'attendees.*.type' => 'required|string|in:internal,external',
'attendees.*.company' => 'nullable|string|max:100',
'attendees.*.phone' => 'nullable|string|max:20',
'attendees.*.email' => 'nullable|email|max:100',
'attendees.*.position' => 'nullable|string|max:50',
'attendance_status' => ['nullable', 'string', Rule::in(SiteBriefing::ATTENDANCE_STATUSES)],
// 공사 정보
'site_count' => 'nullable|integer|min:0',
'construction_start_date' => 'nullable|date',
'construction_end_date' => 'nullable|date|after_or_equal:construction_start_date',
'vat_type' => ['nullable', 'string', Rule::in(SiteBriefing::VAT_TYPES)],
// 프론트엔드 호환성을 위한 필드 매핑
'project_name' => 'nullable|string|max:200',
'work_report' => 'nullable|string|max:5000',
];
}
/**
* 검증 데이터 준비
*/
protected function prepareForValidation(): void
{
// project_name이 있고 title이 없으면 project_name을 title로 사용
if ($this->filled('project_name') && ! $this->filled('title')) {
$this->merge(['title' => $this->project_name]);
}
// work_report가 있고 description이 없으면 work_report를 description으로 사용
if ($this->filled('work_report') && ! $this->filled('description')) {
$this->merge(['description' => $this->work_report]);
}
}
public function messages(): array
{
return [
'construction_end_date.after_or_equal' => '공사 종료일은 시작일 이후여야 합니다.',
];
}
}

2
app/Http/Requests/Tenant/TenantLogoUploadRequest.php
View File

@@ -27,4 +27,4 @@ public function messages(): array
'logo.max' => __('validation.max.file', ['attribute' => '로고', 'max' => '5MB']),
];
}
}
}