From 72a74615956e60624703128bbb21e40ebd76d11c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= Date: Thu, 18 Dec 2025 15:22:05 +0900 Subject: [PATCH] dbmsv4 init...3 --- app/Config/Constants.php | 6 ++++- app/Forms/Auth/GoogleForm.php | 6 ++--- app/Forms/Auth/LocalForm.php | 6 ++--- app/Forms/BoardForm.php | 14 ++++++------ app/Forms/CommonForm.php | 28 +++++++++++------------ app/Forms/Customer/ClientForm.php | 19 ++++++++------- app/Forms/Customer/ServiceForm.php | 18 +++++++-------- app/Forms/Customer/Wallet/AccountForm.php | 10 ++++---- app/Forms/Customer/Wallet/WalletForm.php | 12 +++++----- app/Forms/Equipment/CHASSISForm.php | 8 +++---- app/Forms/Equipment/LineForm.php | 10 ++++---- app/Forms/Equipment/ServerForm.php | 22 +++++++++--------- app/Forms/Equipment/ServerPartForm.php | 14 ++++++------ app/Forms/MylogForm.php | 12 +++++----- app/Forms/Part/CPUForm.php | 8 +++---- app/Forms/Part/CSForm.php | 14 ++++++------ app/Forms/Part/DISKForm.php | 10 ++++---- app/Forms/Part/IPForm.php | 14 ++++++------ app/Forms/Part/PartForm.php | 14 ++++++------ app/Forms/Part/RAMForm.php | 8 +++---- app/Forms/Part/SOFTWAREForm.php | 6 ++--- app/Forms/Part/SWITCHForm.php | 8 +++---- app/Forms/PaymentForm.php | 16 ++++++------- app/Forms/UserForm.php | 15 ++++++------ app/Helpers/Customer/ClientHelper.php | 2 +- app/Helpers/UserHelper.php | 2 +- app/Language/ko/Customer/Client.php | 6 ++--- app/Models/Part/PartModel.php | 28 ----------------------- app/Models/UserSNSModel.php | 24 ------------------- 29 files changed, 158 insertions(+), 202 deletions(-) diff --git a/app/Config/Constants.php b/app/Config/Constants.php index df10cb9..d40e674 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -399,7 +399,11 @@ define("ROLE", [ 'DIRECTOR' => "director", 'MASTER' => "master", ], - 'CLIENT' => [], + 'CLIENT' => [ + 'USER' => 'user', + 'VIP' => 'vip', + 'RESELLER' => 'reseller', + ], ]); //Default값 정의 diff --git a/app/Forms/Auth/GoogleForm.php b/app/Forms/Auth/GoogleForm.php index 330a972..d90fe08 100644 --- a/app/Forms/Auth/GoogleForm.php +++ b/app/Forms/Auth/GoogleForm.php @@ -25,15 +25,15 @@ class GoogleForm extends CommonForm $this->setFormOptions($action, $filters); $this->setBatchjobFilters($filters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "access_code": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; default: $rule = parent::getFormRule($action, $field); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Auth/LocalForm.php b/app/Forms/Auth/LocalForm.php index 81b4756..e0e33b8 100644 --- a/app/Forms/Auth/LocalForm.php +++ b/app/Forms/Auth/LocalForm.php @@ -25,11 +25,11 @@ class LocalForm extends CommonForm $this->setFormOptions($action, $filters); $this->setBatchjobFilters($filters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "id": - $rule = sprintf("required|trim|min_length[4]|max_length[20]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|trim|min_length[4]|max_length[20]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "passwd": $rule = in_array($action, ["create", "create_form"]) ? "required|trim|string" : "permit_empty|trim|string"; @@ -38,6 +38,6 @@ class LocalForm extends CommonForm $rule = parent::getFormRule($action, $field); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/BoardForm.php b/app/Forms/BoardForm.php index 7e1b274..ca53e7c 100644 --- a/app/Forms/BoardForm.php +++ b/app/Forms/BoardForm.php @@ -72,27 +72,27 @@ class BoardForm extends CommonForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "category": case "title": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "user_uid": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "worker_uid": - $rule = "permit_empty|numeric"; + $formRules[$field] = "permit_empty|numeric"; break; case "content": - $rule = "permit_empty|string"; + $formRules[$field] = "permit_empty|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } public function getFormOption(string $action, string $field, array $formDatas = [], array $options = ['options' => [], 'atttributes' => []]): array { diff --git a/app/Forms/CommonForm.php b/app/Forms/CommonForm.php index 349a1a6..7b5678a 100644 --- a/app/Forms/CommonForm.php +++ b/app/Forms/CommonForm.php @@ -47,10 +47,10 @@ abstract class CommonForm // _formFields와 키를 비교하여 교집합을 반환합니다. $fields에 지정된 필드 정의만 추출됩니다. return array_intersect_key($this->_formFields, array_flip($fields)); } - final public function setFormRules(string $action, array $fields, $formRules = []): void + public function setFormRules(string $action, array $fields, $formRules = []): void { foreach ($fields as $field) { - $formRules[$field] = $formRules[$field] ?? $this->getFormRule($action, $field); + $formRules = $this->getFormRule($action, $field, $formRules); } $this->_formRules = $formRules; } @@ -117,7 +117,7 @@ abstract class CommonForm return $this->_batchjobButtons; } //Validation용 - final public function validate(array $formDatas): void + public function validate(array $formDatas): void { if ($this->_validation === null) { throw new RuntimeException(static::class . '->' . __FUNCTION__ . "에서 오류발생: Validation 서비스가 초기화되지 않았습니다."); @@ -163,44 +163,44 @@ abstract class CommonForm return $label; } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case $this->getAttribute('pk_field'): if (!$this->getAttribute('useAutoIncrement')) { - $rule = sprintf("required|regex_match[/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/]%s", in_array($action, ["create"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|regex_match[/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/]%s", in_array($action, ["create"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); } else { - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; } break; case $this->getAttribute('title_field'): - $rule = sprintf("required|trim|string%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|trim|string%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "code": // a-zA-Z → 영문 대소문자,0-9 → 숫자,가-힣 → 한글 완성형,\- → 하이픈 - $rule = sprintf("required|regex_match[/^[a-zA-Z0-9가-힣\-\_]+$/]|min_length[4]%s", in_array($action, ["create"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|regex_match[/^[a-zA-Z0-9가-힣\-\_]+$/]|min_length[4]%s", in_array($action, ["create"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "user_uid": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "clientinfo_uid": case "serviceinfo_uid": case "serverinfo_uid": - $rule = "permit_empty|numeric"; + $formRules[$field] = "permit_empty|numeric"; break; case 'picture': - $rule = "is_image[{$field}]|mime_in[{$field},image/jpg,image/jpeg,image/gif,image/png,image/webp]|max_size[{$field},300]|max_dims[{$field},2048,768]"; + $formRules[$field] = "is_image[{$field}]|mime_in[{$field},image/jpg,image/jpeg,image/gif,image/png,image/webp]|max_size[{$field},300]|max_dims[{$field},2048,768]"; break; case "updated_at": case "created_at": case "deleted_at": - $rule = "permit_empty|trim|valid_date"; + $formRules[$field] = "permit_empty|trim|valid_date"; break; default: - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; } - return $rule; + return $formRules; } protected function getFormOption_process($service, string $action, string $field, array $formDatas = []): array { diff --git a/app/Forms/Customer/ClientForm.php b/app/Forms/Customer/ClientForm.php index 3e72ccb..8eaaded 100644 --- a/app/Forms/Customer/ClientForm.php +++ b/app/Forms/Customer/ClientForm.php @@ -59,32 +59,35 @@ class ClientForm extends CustomerForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "name": - $rule = sprintf("required|trim|string%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|trim|string%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "site": + $formRules[$field] = "required|trim|string"; + break; case "role": - $rule = "required|trim|string"; + $formRules[$field] = 'required|is_array'; + $formRules['role.*'] = 'trim|in_list[user,vip,reseller]'; break; case "email": - $rule = "permit_empty|trim|valid_email"; + $formRules[$field] = "permit_empty|trim|valid_email"; break; case "phone": case "history": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; case "account_balance": case "coupon_balance": case "point_balance": - $rule = "permit_empty|numeric"; + $formRules[$field] = "permit_empty|numeric"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Customer/ServiceForm.php b/app/Forms/Customer/ServiceForm.php index e36d849..44f5906 100644 --- a/app/Forms/Customer/ServiceForm.php +++ b/app/Forms/Customer/ServiceForm.php @@ -76,7 +76,7 @@ class ServiceForm extends CustomerForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "clientinfo_uid": @@ -84,32 +84,32 @@ class ServiceForm extends CustomerForm case "amount": case "rack": case "line": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "sale": - $rule = "permit_empty|numeric"; + $formRules[$field] = "permit_empty|numeric"; break; case "site": case "location": case "status": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "billing_at": case "start_at": - $rule = "required|valid_date"; + $formRules[$field] = "required|valid_date"; break; case "end_at": - $rule = "permit_empty|valid_date"; + $formRules[$field] = "permit_empty|valid_date"; break; case 'title': case "history": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } public function getFormOption(string $action, string $field, array $formDatas = [], array $options = ['options' => [], 'atttributes' => []]): array diff --git a/app/Forms/Customer/Wallet/AccountForm.php b/app/Forms/Customer/Wallet/AccountForm.php index b7a3e55..284d4ea 100644 --- a/app/Forms/Customer/Wallet/AccountForm.php +++ b/app/Forms/Customer/Wallet/AccountForm.php @@ -62,20 +62,20 @@ class AccountForm extends WalletForm $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "bank": case "alias": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "issue_at": - $rule = "required|valid_date"; + $formRules[$field] = "required|valid_date"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Customer/Wallet/WalletForm.php b/app/Forms/Customer/Wallet/WalletForm.php index 1e8b570..0c2a01e 100644 --- a/app/Forms/Customer/Wallet/WalletForm.php +++ b/app/Forms/Customer/Wallet/WalletForm.php @@ -10,26 +10,26 @@ abstract class WalletForm extends CustomerForm { parent::__construct(); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "user_uid": case "clientinfo_uid": case "amount": case "balance": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "title": case "status": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "content": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Equipment/CHASSISForm.php b/app/Forms/Equipment/CHASSISForm.php index 7660a92..2070ceb 100644 --- a/app/Forms/Equipment/CHASSISForm.php +++ b/app/Forms/Equipment/CHASSISForm.php @@ -42,16 +42,16 @@ class CHASSISForm extends EquipmentForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "used": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Equipment/LineForm.php b/app/Forms/Equipment/LineForm.php index 7375065..37ccb62 100644 --- a/app/Forms/Equipment/LineForm.php +++ b/app/Forms/Equipment/LineForm.php @@ -45,21 +45,21 @@ class LineForm extends EquipmentForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "bandwith": case "type": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "start_at": case "end_at": - $rule = "permit_empty|valid_date"; + $formRules[$field] = "permit_empty|valid_date"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Equipment/ServerForm.php b/app/Forms/Equipment/ServerForm.php index 480e4c7..a29dc61 100644 --- a/app/Forms/Equipment/ServerForm.php +++ b/app/Forms/Equipment/ServerForm.php @@ -68,41 +68,41 @@ class ServerForm extends EquipmentForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "switchinfo_uid": - $rule = sprintf("permit_empty|numeric%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("permit_empty|numeric%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "code": case "title": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "chassisinfo_uid": case "price": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "type": case "status": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "ip": //ipv4 , ipv6 , both(ipv4,ipv6) - $rule = sprintf("permit_empty|trim|valid_ip[both]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("permit_empty|trim|valid_ip[both]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "os": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; case "manufactur_at": - $rule = "required|valid_date"; + $formRules[$field] = "required|valid_date"; break; case "format_at": - $rule = "permit_empty|valid_date"; + $formRules[$field] = "permit_empty|valid_date"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } protected function getFormOption_process($service, string $action, string $field, array $formDatas = []): array diff --git a/app/Forms/Equipment/ServerPartForm.php b/app/Forms/Equipment/ServerPartForm.php index 4157bd9..7c07c78 100644 --- a/app/Forms/Equipment/ServerPartForm.php +++ b/app/Forms/Equipment/ServerPartForm.php @@ -54,32 +54,32 @@ class ServerPartForm extends EquipmentForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "serverinfo_uid": case "part_uid": case "cnt": case "amount": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "clientinfo_uid": case "serviceinfo_uid": - $rule = "permit_empty|numeric"; + $formRules[$field] = "permit_empty|numeric"; break; case "title": case "type": case "billing": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "extra": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } private function getPartService(string $type): CommonService { diff --git a/app/Forms/MylogForm.php b/app/Forms/MylogForm.php index b3ac955..0c2fb55 100644 --- a/app/Forms/MylogForm.php +++ b/app/Forms/MylogForm.php @@ -37,23 +37,23 @@ class MylogForm extends CommonForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "user_uid": - $rule = "required|int"; + $formRules[$field] = "required|int"; break; case "title": case "status": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "content": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Part/CPUForm.php b/app/Forms/Part/CPUForm.php index 7783239..7c121d3 100644 --- a/app/Forms/Part/CPUForm.php +++ b/app/Forms/Part/CPUForm.php @@ -42,16 +42,16 @@ class CPUForm extends PartForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "used": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Part/CSForm.php b/app/Forms/Part/CSForm.php index 5b02594..263062e 100644 --- a/app/Forms/Part/CSForm.php +++ b/app/Forms/Part/CSForm.php @@ -69,26 +69,26 @@ class CSForm extends PartForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "type": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "ip": //ipv4 , ipv6 , both(ipv4,ipv6) - $rule = sprintf("required|trim|valid_ip[both]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|trim|valid_ip[both]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "accountid": case "domain": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; case "status": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Part/DISKForm.php b/app/Forms/Part/DISKForm.php index 2fca69b..d4d5330 100644 --- a/app/Forms/Part/DISKForm.php +++ b/app/Forms/Part/DISKForm.php @@ -43,19 +43,19 @@ class DISKForm extends PartForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "used": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "format": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Part/IPForm.php b/app/Forms/Part/IPForm.php index 47de225..96cf1c7 100644 --- a/app/Forms/Part/IPForm.php +++ b/app/Forms/Part/IPForm.php @@ -60,29 +60,29 @@ class IPForm extends PartForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "lineinfo_uid": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "old_clientinfo_uid": case "clientinfo_uid": case "serviceinfo_uid": case "serverinfo_uid": - $rule = "permit_empty|numeric"; + $formRules[$field] = "permit_empty|numeric"; break; case "ip": //ipv4 , ipv6 , both(ipv4,ipv6) - $rule = sprintf("required|trim|valid_ip[both]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|trim|valid_ip[both]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "status": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } public function getFormOption(string $action, string $field, array $formDatas = [], array $options = ['options' => [], 'atttributes' => []]): array { diff --git a/app/Forms/Part/PartForm.php b/app/Forms/Part/PartForm.php index a84cac1..7eab39f 100644 --- a/app/Forms/Part/PartForm.php +++ b/app/Forms/Part/PartForm.php @@ -10,29 +10,29 @@ abstract class PartForm extends CommonForm { parent::__construct(); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "title": - $rule = sprintf("required|trim|string%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|trim|string%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "clientinfo_uid": case "serviceinfo_uid": case "serverinfo_uid": - $rule = "permit_empty|numeric"; + $formRules[$field] = "permit_empty|numeric"; break; case "price": case "stock": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "status": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } public function getFormOption(string $action, string $field, array $formDatas = [], array $options = ['options' => [], 'atttributes' => []]): array { diff --git a/app/Forms/Part/RAMForm.php b/app/Forms/Part/RAMForm.php index b5ce09e..7a8295a 100644 --- a/app/Forms/Part/RAMForm.php +++ b/app/Forms/Part/RAMForm.php @@ -42,16 +42,16 @@ class RAMForm extends PartForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "used": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Part/SOFTWAREForm.php b/app/Forms/Part/SOFTWAREForm.php index f404877..4c04253 100644 --- a/app/Forms/Part/SOFTWAREForm.php +++ b/app/Forms/Part/SOFTWAREForm.php @@ -42,13 +42,13 @@ class SOFTWAREForm extends PartForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/Part/SWITCHForm.php b/app/Forms/Part/SWITCHForm.php index 0179cc9..d438c32 100644 --- a/app/Forms/Part/SWITCHForm.php +++ b/app/Forms/Part/SWITCHForm.php @@ -61,16 +61,16 @@ class SWITCHForm extends PartForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "status": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Forms/PaymentForm.php b/app/Forms/PaymentForm.php index 8a6e470..9e8f284 100644 --- a/app/Forms/PaymentForm.php +++ b/app/Forms/PaymentForm.php @@ -77,36 +77,36 @@ class PaymentForm extends CommonForm $this->setBatchjobFilters($batchjobFilters); $this->setBatchjobButtons($batchjobButtons); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "user_uid": case "clientinfo_uid": case "serviceinfo_uid": case "amount": - $rule = "required|numeric"; + $formRules[$field] = "required|numeric"; break; case "serverpartinfo_uid": case "billing_month": - $rule = "permit_empty|numeric"; + $formRules[$field] = "permit_empty|numeric"; break; case "title": case "billing": case "pay": case "status": - $rule = "required|trim|string"; + $formRules[$field] = "required|trim|string"; break; case "billing_at": - $rule = "required|valid_date"; + $formRules[$field] = "required|valid_date"; break; case "content": - $rule = "permit_empty|trim|string"; + $formRules[$field] = "permit_empty|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } public function getFormOption(string $action, string $field, array $formDatas = [], array $options = ['options' => [], 'atttributes' => []]): array diff --git a/app/Forms/UserForm.php b/app/Forms/UserForm.php index 2b95bd4..e39b5b7 100644 --- a/app/Forms/UserForm.php +++ b/app/Forms/UserForm.php @@ -47,28 +47,29 @@ class UserForm extends CommonForm $this->setIndexFilters($indexFilter); $this->setBatchjobFilters($batchjobFilters); } - public function getFormRule(string $action, string $field): string + public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { case "id": - $rule = sprintf("required|trim|min_length[4]|max_length[20]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|trim|min_length[4]|max_length[20]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "passwd": $rule = sprintf("%s|%s", in_array($action, ["create", "create_form"]) ? "required" : "permit_empty", "trim|string"); break; case "confirmpassword": - $rule = sprintf("%s|%s", in_array($action, ["create", "create_form"]) ? "required" : "permit_empty", "trim|string|matches[passwd]"); + $formRules[$field] = sprintf("%s|%s", in_array($action, ["create", "create_form"]) ? "required" : "permit_empty", "trim|string|matches[passwd]"); break; case "email": - $rule = sprintf("required|trim|valid_email%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); + $formRules[$field] = sprintf("required|trim|valid_email%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "role": - $rule = "required|trim|string"; + $formRules[$field] = 'required|is_array'; + $formRules['role.*'] = 'trim|in_list[manager,cloudflare,firewall,security,director,master]'; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } - return $rule; + return $formRules; } } diff --git a/app/Helpers/Customer/ClientHelper.php b/app/Helpers/Customer/ClientHelper.php index b304f7c..37b3de9 100644 --- a/app/Helpers/Customer/ClientHelper.php +++ b/app/Helpers/Customer/ClientHelper.php @@ -26,7 +26,7 @@ class ClientHelper extends CustomerHelper : []; $form = ''; //Form페이지에서는 맨앞에것 제외하기 위함 - $firstOption = array_shift($viewDatas['formOptions'][$field]['options']); + array_shift($viewDatas['formOptions'][$field]['options']); foreach ($viewDatas['formOptions'][$field]['options'] as $key => $label) { $checked = in_array(strtolower(trim($key)), $currentRoles); $form .= '