feat: Design BOM 템플릿 diff/clone API 및 모델버전 릴리즈 유효성 검사 도입
- Design BOM 템플릿 diff/clone 엔드포인트 추가 - 컨트롤러 검증 로직 FormRequest 분리(DiffRequest/CloneRequest/Upsert/ReplaceItems) - BomTemplateService에 diffTemplates/cloneTemplate/replaceItems/쇼우 로직 정리 - ModelVersionController createDraft FormRequest 적용 및 서비스 호출 정리 - 모델버전 release 전 유효성 검사(존재/활성/테넌트 일치, qty>0, 중복 금지) 추가 - DB enum 미사용 방침 준수(status 문자열 유지) - model_versions 인덱스 최적화(tenant_id, model_id, status / 기간 범위) - Swagger 문서(Design BOM) 및 i18n 메시지 키 추가
This commit is contained in:
@@ -4,8 +4,11 @@
|
||||
|
||||
use App\Helpers\ApiResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Design\BomTemplate\CloneRequest;
|
||||
use App\Http\Requests\Design\BomTemplate\DiffRequest;
|
||||
use App\Http\Requests\Design\BomTemplate\ReplaceItemsRequest;
|
||||
use App\Http\Requests\Design\BomTemplate\UpsertRequest;
|
||||
use App\Services\Design\BomTemplateService;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class BomTemplateController extends Controller
|
||||
{
|
||||
@@ -21,14 +24,10 @@ public function listByVersion(int $versionId)
|
||||
}, __('message.fetched'));
|
||||
}
|
||||
|
||||
public function upsertTemplate(Request $request, int $versionId)
|
||||
public function upsertTemplate(UpsertRequest $request, int $versionId)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request, $versionId) {
|
||||
$payload = $request->validate([
|
||||
'name' => 'nullable|string|max:100',
|
||||
'is_primary' => 'boolean',
|
||||
'notes' => 'nullable|string',
|
||||
]);
|
||||
$payload = $request->validated();
|
||||
return $this->service->upsertTemplate(
|
||||
modelVersionId: $versionId,
|
||||
name: $payload['name'] ?? 'Main',
|
||||
@@ -43,21 +42,35 @@ public function show(int $templateId)
|
||||
return ApiResponse::handle(fn() => $this->service->show($templateId, true), __('message.fetched'));
|
||||
}
|
||||
|
||||
public function replaceItems(Request $request, int $templateId)
|
||||
public function replaceItems(ReplaceItemsRequest $request, int $templateId)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request, $templateId) {
|
||||
$payload = $request->validate([
|
||||
'items' => 'required|array|min:1',
|
||||
'items.*.ref_type' => 'required|string|in:MATERIAL,PRODUCT',
|
||||
'items.*.ref_id' => 'required|integer|min:1',
|
||||
'items.*.qty' => 'required|numeric|gt:0',
|
||||
'items.*.waste_rate' => 'nullable|numeric|min:0',
|
||||
'items.*.uom_id' => 'nullable|integer|min:1',
|
||||
'items.*.notes' => 'nullable|string|max:255',
|
||||
'items.*.sort_order' => 'nullable|integer',
|
||||
]);
|
||||
$payload = $request->validated();
|
||||
$this->service->replaceItems($templateId, $payload['items']);
|
||||
return null;
|
||||
}, __('message.bom.bulk_upsert'));
|
||||
}
|
||||
|
||||
public function diff(int $templateId, DiffRequest $request)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($templateId, $request) {
|
||||
$otherId = $request->validated()['other_template_id'];
|
||||
return $this->service->diffTemplates($templateId, $otherId);
|
||||
}, __('message.design.template_diff'));
|
||||
}
|
||||
|
||||
public function cloneTemplate(int $templateId, CloneRequest $request)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($templateId, $request) {
|
||||
$payload = $request->validated();
|
||||
$tpl = $this->service->cloneTemplate(
|
||||
templateId: $templateId,
|
||||
targetVersionId: $payload['target_version_id'] ?? null,
|
||||
name: $payload['name'] ?? null,
|
||||
isPrimary: (bool)($payload['is_primary'] ?? false),
|
||||
notes: $payload['notes'] ?? null
|
||||
);
|
||||
return $tpl;
|
||||
}, __('message.design.template_cloned'));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,36 +15,43 @@ public function __construct(
|
||||
protected ModelService $service
|
||||
) {}
|
||||
|
||||
// q, page, size만 서비스로 전달 (현재 시그니처 유지)
|
||||
public function index(PaginateRequest $request)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request) {
|
||||
$p = $request->validatedOrDefaults();
|
||||
$q = $p['q'] ?? '';
|
||||
$page = (int) $p['page'];
|
||||
$size = (int) $p['size'];
|
||||
$v = $request->validatedOrDefaults(); // page/size 기본값 주입됨
|
||||
$q = $v['q'] ?? '';
|
||||
$page = (int)($v['page'] ?? 1);
|
||||
$size = (int)($v['size'] ?? 20);
|
||||
$sort = $v['sort'] ?? null; // id|code|name|created_at
|
||||
$order = $v['order'] ?? 'desc'; // asc|desc
|
||||
|
||||
// 현재 서비스 시그니처가 list($q, $page, $size)이므로 정합 유지
|
||||
return $this->service->list($q, $page, $size);
|
||||
}, __('message.fetched'));
|
||||
}
|
||||
|
||||
public function store(StoreRequest $request)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request) {
|
||||
return $this->service->create($request->validated());
|
||||
}, __('message.created'));
|
||||
return ApiResponse::handle(
|
||||
fn() => $this->service->create($request->validated()),
|
||||
__('message.created')
|
||||
);
|
||||
}
|
||||
|
||||
public function show(int $id)
|
||||
{
|
||||
return ApiResponse::handle(fn () => $this->service->find($id), __('message.fetched'));
|
||||
return ApiResponse::handle(
|
||||
fn() => $this->service->find($id),
|
||||
__('message.fetched')
|
||||
);
|
||||
}
|
||||
|
||||
public function update(UpdateRequest $request, int $id)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request, $id) {
|
||||
return $this->service->update($id, $request->validated());
|
||||
}, __('message.updated'));
|
||||
return ApiResponse::handle(
|
||||
fn() => $this->service->update($id, $request->validated()),
|
||||
__('message.updated')
|
||||
);
|
||||
}
|
||||
|
||||
public function destroy(int $id)
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
use App\Helpers\ApiResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Design\ModelVersion\CreateDraftRequest;
|
||||
use App\Services\Design\ModelVersionService;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class ModelVersionController extends Controller
|
||||
{
|
||||
@@ -18,15 +18,10 @@ public function index(int $modelId)
|
||||
return ApiResponse::handle(fn() => $this->service->listByModel($modelId), __('message.fetched'));
|
||||
}
|
||||
|
||||
public function createDraft(Request $request, int $modelId)
|
||||
public function createDraft(CreateDraftRequest $request, int $modelId)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request, $modelId) {
|
||||
$payload = $request->validate([
|
||||
'version_no' => 'nullable|integer|min:1',
|
||||
'notes' => 'nullable|string',
|
||||
'effective_from' => 'nullable|date',
|
||||
'effective_to' => 'nullable|date|after:effective_from',
|
||||
]);
|
||||
$payload = $request->validated();
|
||||
return $this->service->createDraft($modelId, $payload);
|
||||
}, __('message.created'));
|
||||
}
|
||||
|
||||
23
app/Http/Requests/Design/BomTemplate/CloneRequest.php
Normal file
23
app/Http/Requests/Design/BomTemplate/CloneRequest.php
Normal file
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Design\BomTemplate;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CloneRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'target_version_id' => 'nullable|integer|min:1',
|
||||
'name' => 'nullable|string|max:100',
|
||||
'is_primary' => 'nullable|boolean',
|
||||
'notes' => 'nullable|string',
|
||||
];
|
||||
}
|
||||
}
|
||||
29
app/Http/Requests/Design/BomTemplate/DiffRequest.php
Normal file
29
app/Http/Requests/Design/BomTemplate/DiffRequest.php
Normal file
@@ -0,0 +1,29 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Design\BomTemplate;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class DiffRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'other_template_id' => 'required|integer|min:1',
|
||||
];
|
||||
}
|
||||
|
||||
public function messages(): array
|
||||
{
|
||||
return [
|
||||
'other_template_id.required' => __('validation.required', ['attribute' => 'other_template_id']),
|
||||
'other_template_id.integer' => __('validation.integer', ['attribute' => 'other_template_id']),
|
||||
'other_template_id.min' => __('validation.min.numeric', ['attribute' => 'other_template_id', 'min' => 1]),
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user