dbms_init...1

This commit is contained in:
choi.jh 2025-06-25 18:38:10 +09:00
parent c5ed6eb2de
commit 66cda3dbea
80 changed files with 168 additions and 164 deletions

View File

@ -23,7 +23,7 @@ class AccountController extends CustomerController
public function getService(): AccountService
{
if (!$this->_service) {
$this->_service = new AccountService($this->request);
$this->_service = new AccountService();
}
return $this->_service;
}

View File

@ -24,7 +24,7 @@ class ClientController extends CustomerController
public function getService(): ClientService
{
if (!$this->_service) {
$this->_service = new ClientService($this->request);
$this->_service = new ClientService();
}
return $this->_service;
}

View File

@ -23,7 +23,7 @@ class CouponController extends CustomerController
public function getService(): CouponService
{
if (!$this->_service) {
$this->_service = new CouponService($this->request);
$this->_service = new CouponService();
}
return $this->_service;
}

View File

@ -19,7 +19,7 @@ abstract class CustomerController extends AdminController
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
$this->_serviceService = new ServiceService();
}
return $this->_serviceService;
}

View File

@ -23,7 +23,7 @@ class PointController extends CustomerController
public function getService(): PointService
{
if (!$this->_service) {
$this->_service = new PointService($this->request);
$this->_service = new PointService();
}
return $this->_service;
}

View File

@ -28,7 +28,7 @@ class ServiceController extends CustomerController
public function getService(): ServiceService
{
if (!$this->_service) {
$this->_service = new ServiceService($this->request);
$this->_service = new ServiceService();
}
return $this->_service;
}
@ -42,14 +42,14 @@ class ServiceController extends CustomerController
public function getCodeService(): CodeService
{
if (!$this->_codeService) {
$this->_codeService = new CodeService($this->request);
$this->_codeService = new CodeService();
}
return $this->_codeService;
}
public function getServicePaymentService(): ServicePaymentService
{
if (!$this->_servicePaymentService) {
$this->_servicePaymentService = new ServicePaymentService($this->request);
$this->_servicePaymentService = new ServicePaymentService();
}
return $this->_servicePaymentService;
}

View File

@ -27,7 +27,7 @@ class ServiceHistoryController extends CustomerController
public function getService(): ServiceHistoryService
{
if (!$this->_service) {
$this->_service = new ServiceHistoryService($this->request);
$this->_service = new ServiceHistoryService();
}
return $this->_service;
}
@ -41,7 +41,7 @@ class ServiceHistoryController extends CustomerController
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
$this->_serviceService = new ServiceService();
}
return $this->_serviceService;
}

View File

@ -39,7 +39,7 @@ class ServiceItemController extends CustomerController
public function getService(): ServiceItemService
{
if (!$this->_service) {
$this->_service = new ServiceItemService($this->request);
$this->_service = new ServiceItemService();
}
return $this->_service;
}
@ -53,7 +53,7 @@ class ServiceItemController extends CustomerController
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
$this->_serviceService = new ServiceService();
}
return $this->_serviceService;
}

View File

@ -32,7 +32,7 @@ class ServicePaymentController extends CustomerController
public function getService(): ServicePaymentService
{
if (!$this->_service) {
$this->_service = new ServicePaymentService($this->request);
$this->_service = new ServicePaymentService();
}
return $this->_service;
}
@ -46,14 +46,14 @@ class ServicePaymentController extends CustomerController
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
$this->_serviceService = new ServiceService();
}
return $this->_serviceService;
}
public function getClientService(): ClientService
{
if (!$this->_clientService) {
$this->_clientService = new ClientService($this->request);
$this->_clientService = new ClientService();
}
return $this->_clientService;
}

View File

@ -23,7 +23,7 @@ class CodeController extends EquipmentController
public function getService(): CodeService
{
if (!$this->_service) {
$this->_service = new CodeService($this->request);
$this->_service = new CodeService();
}
return $this->_service;
}

View File

@ -24,7 +24,7 @@ class DomainController extends EquipmentController
public function getService(): DomainService
{
if (!$this->_service) {
$this->_service = new DomainService($this->request);
$this->_service = new DomainService();
}
return $this->_service;
}

View File

@ -18,7 +18,7 @@ abstract class EquipmentController extends AdminController
final public function getClientService(): ClientService
{
if (!$this->_clientService) {
$this->_clientService = new ClientService($this->request);
$this->_clientService = new ClientService();
}
return $this->_clientService;
}

View File

@ -23,7 +23,7 @@ class CpuController extends PartController
public function getService(): CpuService
{
if (!$this->_service) {
$this->_service = new CpuService($this->request);
$this->_service = new CpuService();
}
return $this->_service;
}

View File

@ -23,7 +23,7 @@ class DefenceController extends PartController
public function getService(): DefenceService
{
if (!$this->_service) {
$this->_service = new DefenceService($this->request);
$this->_service = new DefenceService();
}
return $this->_service;
}

View File

@ -26,7 +26,7 @@ class IpController extends PartController
public function getService(): IpService
{
if (!$this->_service) {
$this->_service = new IpService($this->request);
$this->_service = new IpService();
}
return $this->_service;
}
@ -40,7 +40,7 @@ class IpController extends PartController
final public function getLineService(): LineService
{
if (!$this->_lineService) {
$this->_lineService = new LineService($this->request);
$this->_lineService = new LineService();
}
return $this->_lineService;
}

View File

@ -27,7 +27,7 @@ class LineController extends PartController
public function getService(): LineService
{
if (!$this->_service) {
$this->_service = new LineService($this->request);
$this->_service = new LineService();
}
return $this->_service;
}
@ -41,7 +41,7 @@ class LineController extends PartController
final public function getIpService(): IpService
{
if (!$this->_ipService) {
$this->_ipService = new IpService($this->request);
$this->_ipService = new IpService();
}
return $this->_ipService;
}

View File

@ -23,7 +23,7 @@ class RamController extends PartController
public function getService(): RamService
{
if (!$this->_service) {
$this->_service = new RamService($this->request);
$this->_service = new RamService();
}
return $this->_service;
}

View File

@ -24,7 +24,7 @@ class SoftwareController extends PartController
public function getService(): SoftwareService
{
if (!$this->_service) {
$this->_service = new SoftwareService($this->request);
$this->_service = new SoftwareService();
}
return $this->_service;
}

View File

@ -23,7 +23,7 @@ class StorageController extends PartController
public function getService(): StorageService
{
if (!$this->_service) {
$this->_service = new StorageService($this->request);
$this->_service = new StorageService();
}
return $this->_service;
}

View File

@ -23,7 +23,7 @@ class ServerController extends EquipmentController
public function getService(): ServerService
{
if (!$this->_service) {
$this->_service = new ServerService($this->request);
$this->_service = new ServerService();
}
return $this->_service;
}

View File

@ -27,7 +27,7 @@ class Home extends AdminController
final public function getService(): ServiceService
{
if (!$this->_service) {
$this->_service = new ServiceService($this->request);
$this->_service = new ServiceService();
}
return $this->_service;
}
@ -41,7 +41,7 @@ class Home extends AdminController
final public function getServicePaymentService(): ServicePaymentService
{
if (!$this->_servicePaymentService) {
$this->_servicePaymentService = new ServicePaymentService($this->request);
$this->_servicePaymentService = new ServicePaymentService();
}
return $this->_servicePaymentService;
}

View File

@ -25,7 +25,7 @@ class MyLogController extends AdminController
final public function getService(): MyLogService
{
if (!$this->_service) {
$this->_service = new MyLogService($this->request);
$this->_service = new MyLogService();
}
return $this->_service;
}

View File

@ -28,7 +28,7 @@ class UserController extends AdminController
final public function getService(): UserService
{
if (!$this->_service) {
$this->_service = new UserService($this->request);
$this->_service = new UserService();
}
return $this->_service;
}

View File

@ -19,7 +19,7 @@ class LocalController extends AuthController
final public function getService(): LocalService
{
if (!$this->_service) {
$this->_service = new LocalService($this->request);
$this->_service = new LocalService();
}
return $this->_service;
}

View File

@ -24,21 +24,21 @@ class Payment extends BaseController
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
$this->_serviceService = new ServiceService();
}
return $this->_serviceService;
}
public function getServiceItemService(): ServiceItemService
{
if (!$this->_servicItemeService) {
$this->_servicItemeService = new ServiceItemService($this->request);
$this->_servicItemeService = new ServiceItemService();
}
return $this->_servicItemeService;
}
public function getServicePaymentService(): ServicePaymentService
{
if (!$this->_servicePaymentService) {
$this->_servicePaymentService = new ServicePaymentService($this->request);
$this->_servicePaymentService = new ServicePaymentService();
}
return $this->_servicePaymentService;
}

View File

@ -30,6 +30,7 @@ abstract class CommonController extends BaseController
{
parent::initController($request, $response, $logger);
$this->isLoggedIn = false;
$this->uri = $request->getUri();
if ($this->getMyAuth()->isLoggedIn()) {
$this->isLoggedIn = true;
$this->myAuthName = $this->getMyAuth()->getNameByAuthInfo();
@ -61,7 +62,7 @@ abstract class CommonController extends BaseController
final public function getMyLogService(): mixed
{
if (!$this->_myLogService) {
$this->_myLogService = new MyLogService($this->request);
$this->_myLogService = new MyLogService();
}
return $this->_myLogService;
}

View File

@ -10,7 +10,7 @@ class AuthHelper extends CommonHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(UserModel::TITLE);
}
public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string

View File

@ -2,18 +2,12 @@
namespace App\Helpers;
use CodeIgniter\HTTP\IncomingRequest;
class CommonHelper
{
private $_myAuth = null;
private $_viewDatas = [];
private $_titleField = "";
private ?IncomingRequest $_request = null;
protected function __construct(?IncomingRequest $request = null)
{
$this->_request = $request;
}
protected function __construct() {}
final protected function getMyAuth(): mixed
{
if (!$this->_myAuth) {
@ -21,10 +15,6 @@ class CommonHelper
}
return $this->_myAuth;
}
final public function getRequest(): IncomingRequest|null
{
return $this->_request;
}
final public function setTitleField(string $field): void
{
$this->_titleField = $field;
@ -353,7 +343,7 @@ class CommonHelper
if (isset($viewDatas['order_field']) && $viewDatas['order_field'] == $field) {
$label .= $viewDatas['order_value'] == 'ASC' ? ICONS["UP"] : ICONS["DOWN"];
}
$query = $this->getRequest()->getUri()->getQuery(['except' => ['order_field', 'order_value']]);
$query = $viewDatas['uri']->getQuery(['except' => ['order_field', 'order_value']]);
$query .= empty($query) ? "" : "&";
$query .= "order_field={$field}&order_value=";
$query .= isset($viewDatas['order_value']) && $viewDatas['order_value'] == 'DESC' ? "ASC" : "DESC";
@ -367,13 +357,13 @@ class CommonHelper
{
switch ($action) {
case 'create':
// echo current_url() . '/' . $action . '?' . $this->getRequest()->getUri()->getQuery();
// echo current_url() . '/' . $action . '?' . $viewDatas['uri']->getQuery();
$extras = ["class" => "btn btn-outline btn-primary btn-circle", "target" => "_self", ...$extras];
$action = form_label(
array_key_exists('label', $extras) ? $extras['label'] : ICONS['ADD'],
$action,
[
"data-src" => current_url() . '/' . $action . '?' . $this->getRequest()->getUri()->getQuery(),
"data-src" => current_url() . '/' . $action . '?' . $viewDatas['uri']->getQuery(),
"data-bs-toggle" => "modal",
"data-bs-target" => "#index_action_form",
...$extras
@ -394,7 +384,7 @@ class CommonHelper
$viewDatas['cnt'],
$action,
[
"data-src" => current_url() . '/' . $action . '/' . $viewDatas['entity']->getPK() . '?' . $this->getRequest()->getUri()->getQuery(),
"data-src" => current_url() . '/' . $action . '/' . $viewDatas['entity']->getPK() . '?' . $viewDatas['uri']->getQuery(),
"data-bs-toggle" => "modal",
"data-bs-target" => "#index_action_form",
...$extras

View File

@ -10,7 +10,7 @@ class AccountHelper extends CustomerHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(AccountModel::TITLE);
}
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null

View File

@ -10,7 +10,7 @@ class ClientHelper extends CustomerHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(ClientModel::TITLE);
}
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null

View File

@ -10,7 +10,7 @@ class CouponHelper extends CustomerHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(CouponModel::TITLE);
}
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null

View File

@ -9,6 +9,6 @@ abstract class CustomerHelper extends CommonHelper
{
protected function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
}
}

View File

@ -10,7 +10,7 @@ class PointHelper extends CustomerHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: PointModel::TITLE);
}

View File

@ -11,7 +11,7 @@ class ServiceHelper extends CustomerHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: ServiceModel::TITLE);
}
public function getFieldLabel(string $field, array $viewDatas, array $extras = []): string

View File

@ -10,7 +10,7 @@ class ServiceHistoryHelper extends CustomerHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: ServiceHistoryModel::TITLE);
}
}

View File

@ -12,7 +12,7 @@ class ServiceItemHelper extends CustomerHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: ServiceItemModel::TITLE);
}

View File

@ -10,7 +10,7 @@ class ServicePaymentHelper extends CustomerHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: ServicePaymentModel::TITLE);
}

View File

@ -10,7 +10,7 @@ class CodeHelper extends EquipmentHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: CodeModel::TITLE);
}
}

View File

@ -10,7 +10,7 @@ class DomainHelper extends EquipmentHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: DomainModel::TITLE);
}
}

View File

@ -9,6 +9,6 @@ abstract class EquipmentHelper extends CommonHelper
{
protected function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
}
}

View File

@ -10,7 +10,7 @@ class CpuHelper extends PartHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: CpuModel::TITLE);
}
}

View File

@ -10,7 +10,7 @@ class DefenceHelper extends PartHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: DefenceModel::TITLE);
}
}

View File

@ -10,7 +10,7 @@ class IpHelper extends PartHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: IpModel::TITLE);
}
}

View File

@ -10,7 +10,7 @@ class LineHelper extends PartHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: LineModel::TITLE);
}
}

View File

@ -9,6 +9,6 @@ abstract class PartHelper extends EquipmentHelper
{
protected function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
}
}

View File

@ -10,7 +10,7 @@ class RamHelper extends PartHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: RamModel::TITLE);
}
}

View File

@ -10,7 +10,7 @@ class SoftwareHelper extends PartHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: SoftwareModel::TITLE);
}
}

View File

@ -10,7 +10,7 @@ class StorageHelper extends PartHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: StorageModel::TITLE);
}
}

View File

@ -10,7 +10,7 @@ class ServerHelper extends EquipmentHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: ServerModel::TITLE);
}
}

View File

@ -10,7 +10,7 @@ class HomeHelper extends CommonHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(field: ServicePaymentModel::TITLE);
}

View File

@ -10,7 +10,7 @@ class MyLogHelper extends CommonHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(MyLogModel::TITLE);
}
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null

View File

@ -10,7 +10,7 @@ class UserHelper extends CommonHelper
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->setTitleField(UserModel::TITLE);
}
public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string

View File

@ -14,7 +14,7 @@ abstract class AuthService extends CommonService
private $url_stack_name = "url_stack";
protected function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Auth');
}
abstract public function login(array $formDatas): UserEntity;

View File

@ -14,7 +14,7 @@ class GoogleService extends AuthService
public function __construct(mixed $mySocket, ?IncomingRequest $request = null)
{
$this->_mySocket = $mySocket;
parent::__construct($request);
parent::__construct();
$this->addClassName('Google');
}
public function getMySocket(): mixed

View File

@ -10,7 +10,7 @@ class LocalService extends AuthService
{
public function __construct(?IncomingRequest $request = null)
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Local');
}
final public function getModelClass(): UserModel

View File

@ -11,11 +11,7 @@ abstract class CommonService
private $_model = null;
private $_classNames = [];
private $_myAuth = null;
private $_request = null;
protected function __construct(mixed $_request = null)
{
$this->_request = $_request;
}
protected function __construct() {}
abstract public function getModelClass(): mixed;
abstract public function getEntityClass(): mixed;
abstract public function getFormFields(): array;
@ -28,10 +24,6 @@ abstract class CommonService
}
return $this->_myAuth;
}
final public function getRequest(): mixed
{
return $this->_request;
}
public function getIndexFields(): array
{
return $this->getFormFields();

View File

@ -8,9 +8,9 @@ use App\Entities\Customer\ClientEntity;
class AccountService extends CustomerService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Account');
}
public function getModelClass(): AccountModel

View File

@ -7,9 +7,9 @@ use App\Models\Customer\ClientModel;
class ClientService extends CustomerService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Client');
}
public function getModelClass(): ClientModel

View File

@ -8,9 +8,9 @@ use App\Entities\Customer\ClientEntity;
class CouponService extends CustomerService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Coupon');
}
public function getModelClass(): CouponModel

View File

@ -20,15 +20,15 @@ abstract class CustomerService extends CommonService
{
private ?ClientService $_clientService = null;
private $_equipmentService = [];
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Customer');
}
final public function getClientService(): ClientService
{
if (!$this->_clientService) {
$this->_clientService = new ClientService($this->request);
$this->_clientService = new ClientService();
}
return $this->_clientService;
}

View File

@ -8,9 +8,9 @@ use App\Entities\Customer\ClientEntity;
class PointService extends CustomerService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Point');
}
public function getModelClass(): PointModel

View File

@ -9,9 +9,9 @@ use App\Services\Customer\ServiceService;
class ServiceHistoryService extends CustomerService
{
private ?ServiceService $_serviceService = null;
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('ServiceHistory');
}
public function getModelClass(): ServiceHistoryModel
@ -25,7 +25,7 @@ class ServiceHistoryService extends CustomerService
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
$this->_serviceService = new ServiceService();
}
return $this->_serviceService;
}

View File

@ -3,18 +3,21 @@
namespace App\Services\Customer;
use App\Entities\Customer\ServiceItemEntity;
use App\Entities\Equipment\Part\IpEntity;
use App\Models\Customer\ServiceItemModel;
use App\Services\Customer\CustomerService;
use App\Services\Customer\ServicePaymentService;
use App\Services\Customer\ServiceService;
use App\Services\Equipment\Part\IpService;
class ServiceItemService extends CustomerService
{
private ?ServiceService $_serviceService = null;
private ?ServicePaymentService $_servicePaymentService = null;
public function __construct(mixed $request = null)
private ?IpService $_ipService = null;
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('ServiceItem');
}
public function getModelClass(): ServiceItemModel
@ -28,14 +31,21 @@ class ServiceItemService extends CustomerService
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
$this->_serviceService = new ServiceService();
}
return $this->_serviceService;
}
public function getIpService(): IpService
{
if (!$this->_ipService) {
$this->_ipService = new IpService();
}
return $this->_ipService;
}
public function getServicePaymentService(): ServicePaymentService
{
if (!$this->_servicePaymentService) {
$this->_servicePaymentService = new ServicePaymentService($this->request);
$this->_servicePaymentService = new ServicePaymentService();
}
return $this->_servicePaymentService;
}
@ -80,9 +90,27 @@ class ServiceItemService extends CustomerService
}
public function create(array $formDatas, mixed $entity = null): ServiceItemEntity
{
$entity = parent::create($formDatas, $entity);
//결제정보 ServicePaymentService에 등록
$this->getServicePaymentService()->createByServiceItem($entity);
return $entity;
return parent::create($formDatas, $entity);
}
public function modify(mixed $entity, array $formDatas): ServiceItemEntity
{
//IP가 기존과 다를경우 //toggle,batchjob의 경우 $formDatas에 code가 없을수도 있음
if (array_key_exists('item_type', $formDatas) && $formDatas['item_type'] !== 'IP') {
//기존 IP의 경우 반환처리
$this->getIpService()->setStatus($entity->getItemUID(), IpEntity::STATUS_AVAILABLE);
//신규 설정된 IP의 경우 서비스중 변경처리
$this->getIpService()->setStatus($formDatas['item_uid'], IpEntity::STATUS_OCCUPIED);
}
return parent::modify($entity, $formDatas);
}
public function delete(mixed $entity): ServiceItemEntity
{
//기존 Ip의 경우 반환처리
if ($entity->getItemType() === 'IP') {
$this->getIpService()->setStatus($entity->getItemUID(), IpEntity::STATUS_AVAILABLE);
}
return parent::delete($entity);
}
}

View File

@ -13,9 +13,9 @@ class ServicePaymentService extends CustomerService
{
private ?UserService $_userService = null;
private ?ServiceService $_serviceService = null;
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('ServicePayment');
}
public function getModelClass(): ServicePaymentModel
@ -55,14 +55,14 @@ class ServicePaymentService extends CustomerService
public function getUSerService(): UserService
{
if (!$this->_userService) {
$this->_userService = new UserService($this->request);
$this->_userService = new UserService();
}
return $this->_userService;
}
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
$this->_serviceService = new ServiceService();
}
return $this->_serviceService;
}

View File

@ -9,7 +9,6 @@ use App\Entities\Equipment\Part\IpEntity;
use App\Models\Customer\ServiceModel;
use App\Services\Customer\ServiceItemService;
use App\Services\Equipment\CodeService;
use App\Services\Equipment\Part\IpService;
use App\Services\UserService;
class ServiceService extends CustomerService
@ -18,11 +17,10 @@ class ServiceService extends CustomerService
private ?CodeService $_codeService = null;
private ?ServiceItemService $_serviceItemService = null;
private ?ServicePaymentService $_servicePaymentService = null;
private ?IpService $_ipService = null;
private ?string $_searchIP = null;
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Service');
}
public function getModelClass(): ServiceModel
@ -63,35 +61,28 @@ class ServiceService extends CustomerService
public function getUSerService(): UserService
{
if (!$this->_userService) {
$this->_userService = new UserService($this->request);
$this->_userService = new UserService();
}
return $this->_userService;
}
public function getCodeService(): CodeService
{
if (!$this->_codeService) {
$this->_codeService = new CodeService($this->request);
$this->_codeService = new CodeService();
}
return $this->_codeService;
}
public function getServiceItemService(): ServiceItemService
{
if (!$this->_serviceItemService) {
$this->_serviceItemService = new ServiceItemService($this->request);
$this->_serviceItemService = new ServiceItemService();
}
return $this->_serviceItemService;
}
public function getIpService(): IpService
{
if (!$this->_ipService) {
$this->_ipService = new IpService($this->request);
}
return $this->_ipService;
}
public function getServicePaymentService(): ServicePaymentService
{
if (!$this->_servicePaymentService) {
$this->_servicePaymentService = new ServicePaymentService($this->request);
$this->_servicePaymentService = new ServicePaymentService();
}
return $this->_servicePaymentService;
}
@ -223,9 +214,11 @@ class ServiceService extends CustomerService
{
//기존 code의 경우 반환처리
$this->getCodeService()->setStatus($entity->getCode(), CodeEntity::STATUS_AVAILABLE);
//IP의 경우 반환 처리
foreach ($entity->getItemEntities("IP") as $itemEntity) {
$this->getIpService()->setStatus($itemEntity->getItemUID(), IpEntity::STATUS_AVAILABLE);
//Item들 삭제
foreach (SERVICE_ITEM_TYPES as $item_type => $label) {
foreach ($entity->getItemEntities($item_type) as $itemEntity) {
$this->getServiceItemService()->delete($itemEntity);
}
}
return parent::delete($entity);
}

View File

@ -8,9 +8,9 @@ use App\Services\Equipment\EquipmentService;
class CodeService extends EquipmentService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Code');
}
public function getModelClass(): CodeModel

View File

@ -7,9 +7,9 @@ use App\Models\Equipment\DomainModel;
class DomainService extends EquipmentService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Domain');
}
public function getModelClass(): DomainModel

View File

@ -8,16 +8,16 @@ use App\Services\Customer\ClientService;
abstract class EquipmentService extends CommonService
{
private ?ClientService $_clientService = null;
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Equipment');
}
final public function getClientService(): ClientService
{
if (!$this->_clientService) {
$this->_clientService = new ClientService($this->request);
$this->_clientService = new ClientService();
}
return $this->_clientService;
}

View File

@ -7,9 +7,9 @@ use App\Models\Equipment\Part\CpuModel;
class CpuService extends PartService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Cpu');
}
public function getModelClass(): CpuModel

View File

@ -7,9 +7,9 @@ use App\Models\Equipment\Part\DefenceModel;
class DefenceService extends PartService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Defence');
}
public function getModelClass(): DefenceModel

View File

@ -10,9 +10,9 @@ use App\Services\Equipment\Part\LineService;
class IpService extends PartService
{
private ?LineService $_lineService = null;
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Ip');
}
public function getModelClass(): IpModel
@ -46,7 +46,7 @@ class IpService extends PartService
final public function getLineService(): LineService
{
if (!$this->_lineService) {
$this->_lineService = new LineService($this->request);
$this->_lineService = new LineService();
}
return $this->_lineService;
}

View File

@ -7,9 +7,9 @@ use App\Models\Equipment\Part\LineModel;
class LineService extends PartService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Line');
}
public function getModelClass(): LineModel

View File

@ -6,9 +6,9 @@ use App\Services\Equipment\EquipmentService;
abstract class PartService extends EquipmentService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Part');
}
//FieldForm관련용

View File

@ -7,9 +7,9 @@ use App\Models\Equipment\Part\RamModel;
class RamService extends PartService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Ram');
}
public function getModelClass(): RamModel

View File

@ -7,9 +7,9 @@ use App\Models\Equipment\Part\SoftwareModel;
class SoftwareService extends PartService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Software');
}
public function getModelClass(): SoftwareModel

View File

@ -7,9 +7,9 @@ use App\Models\Equipment\Part\StorageModel;
class StorageService extends PartService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Storage');
}
public function getModelClass(): StorageModel

View File

@ -8,9 +8,9 @@ use App\Services\Equipment\EquipmentService;
class ServerService extends EquipmentService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('Server');
}
public function getModelClass(): ServerModel

View File

@ -11,9 +11,9 @@ use App\Services\UserService;
class MyLogService extends CommonService
{
private $_userService = null;
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('MyLog');
}
public function getModelClass(): MyLogModel
@ -51,7 +51,7 @@ class MyLogService extends CommonService
public function getUserService(): UserService
{
if (!$this->_userService) {
$this->_userService = new UserService($this->request);
$this->_userService = new UserService();
}
return $this->_userService;
}

View File

@ -8,9 +8,9 @@ use App\Entities\UserSNSEntity;
class UserSNSService extends CommonService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);;
parent::__construct();;
$this->addClassName('UserSNS');
}
public function getModelClass(): UserSNSModel

View File

@ -7,9 +7,9 @@ use App\Models\UserModel;
class UserService extends CommonService
{
public function __construct(mixed $request = null)
public function __construct()
{
parent::__construct($request);
parent::__construct();
$this->addClassName('User');
}
public function getModelClass(): UserModel