refactor: [approval] SAM API 규칙 준수 코드 리뷰 반영

- ApprovalStep에 BelongsToTenant, SoftDeletes 추가 (마이그레이션 포함)
- ApprovalForm, ApprovalDelegation에 ModelTrait 추가 (중복 scopeActive 제거)
- ApprovalDelegation에 Auditable 추가
- 모든 결재 액션에 FormRequest 적용 (approve, cancel, hold, preDecide)
- 위임 CRUD에 DelegationStoreRequest, DelegationUpdateRequest 적용
- ApprovalStep 생성 시 tenant_id 포함
This commit is contained in:
김보곤
2026-03-11 17:13:08 +09:00
parent 3fd412f89d
commit 0be88f95ca
12 changed files with 204 additions and 33 deletions

View File

@@ -3,14 +3,16 @@
namespace App\Models\Tenants;
use App\Models\Members\User;
use App\Traits\Auditable;
use App\Traits\BelongsToTenant;
use App\Traits\ModelTrait;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes;
class ApprovalDelegation extends Model
{
use BelongsToTenant, SoftDeletes;
use Auditable, BelongsToTenant, ModelTrait, SoftDeletes;
protected $table = 'approval_delegations';
@@ -59,11 +61,6 @@ public function delegate(): BelongsTo
// 스코프
// =========================================================================
public function scopeActive($query)
{
return $query->where('is_active', true);
}
public function scopeForDelegator($query, int $userId)
{
return $query->where('delegator_id', $userId);

View File

@@ -5,6 +5,7 @@
use App\Models\Members\User;
use App\Traits\Auditable;
use App\Traits\BelongsToTenant;
use App\Traits\ModelTrait;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -26,7 +27,7 @@
*/
class ApprovalForm extends Model
{
use Auditable, BelongsToTenant, SoftDeletes;
use Auditable, BelongsToTenant, ModelTrait, SoftDeletes;
protected $table = 'approval_forms';
@@ -100,14 +101,6 @@ public function updater(): BelongsTo
// 스코프
// =========================================================================
/**
* 활성 양식만
*/
public function scopeActive($query)
{
return $query->where('is_active', true);
}
/**
* 특정 카테고리
*/

View File

@@ -4,13 +4,16 @@
use App\Models\Members\User;
use App\Traits\Auditable;
use App\Traits\BelongsToTenant;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* 결재 단계 모델
*
* @property int $id
* @property int $tenant_id
* @property int $approval_id
* @property int $step_order
* @property string $step_type
@@ -23,7 +26,7 @@
*/
class ApprovalStep extends Model
{
use Auditable;
use Auditable, BelongsToTenant, SoftDeletes;
protected $table = 'approval_steps';
@@ -36,6 +39,7 @@ class ApprovalStep extends Model
];
protected $fillable = [
'tenant_id',
'approval_id',
'step_order',
'step_type',