diff --git a/app/modules/web/Controllers/AccountFile/AccountFileBase.php b/app/modules/web/Controllers/AccountFile/AccountFileBase.php new file mode 100644 index 00000000..29561a7a --- /dev/null +++ b/app/modules/web/Controllers/AccountFile/AccountFileBase.php @@ -0,0 +1,48 @@ +. + */ + +namespace SP\Modules\Web\Controllers\AccountFile; + + +use SP\Core\Application; +use SP\Domain\Account\AccountFileServiceInterface; +use SP\Modules\Web\Controllers\ControllerBase; +use SP\Mvc\Controller\WebControllerHelper; + +abstract class AccountFileBase extends ControllerBase +{ + protected AccountFileServiceInterface $accountFileService; + + public function __construct( + Application $application, + WebControllerHelper $webControllerHelper, + AccountFileServiceInterface $accountFileService + ) { + parent::__construct($application, $webControllerHelper); + + $this->checkLoggedIn(); + + $this->accountFileService = $accountFileService; + } +} \ No newline at end of file diff --git a/app/modules/web/Controllers/AccountFile/DeleteController.php b/app/modules/web/Controllers/AccountFile/DeleteController.php index 90b16b9d..0f36091b 100644 --- a/app/modules/web/Controllers/AccountFile/DeleteController.php +++ b/app/modules/web/Controllers/AccountFile/DeleteController.php @@ -25,40 +25,20 @@ namespace SP\Modules\Web\Controllers\AccountFile; use Exception; -use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountFileServiceInterface; -use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; -use SP\Mvc\Controller\WebControllerHelper; /** * Class DeleteController * * @package SP\Modules\Web\Controllers */ -final class DeleteController extends ControllerBase +final class DeleteController extends AccountFileBase { - private const MIME_VIEW = ['text/plain']; - use JsonTrait, ItemTrait; - private AccountFileServiceInterface $accountFileService; - - public function __construct( - Application $application, - WebControllerHelper $webControllerHelper, - AccountFileServiceInterface $accountFileService - ) { - parent::__construct($application, $webControllerHelper); - - $this->checkLoggedIn(); - - $this->accountFileService = $accountFileService; - } - /** * Delete action * diff --git a/app/modules/web/Controllers/AccountFile/DownloadController.php b/app/modules/web/Controllers/AccountFile/DownloadController.php index 973eb2b6..06dacf81 100644 --- a/app/modules/web/Controllers/AccountFile/DownloadController.php +++ b/app/modules/web/Controllers/AccountFile/DownloadController.php @@ -25,38 +25,20 @@ namespace SP\Modules\Web\Controllers\AccountFile; use Exception; -use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; -use SP\Domain\Account\AccountFileServiceInterface; -use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; -use SP\Mvc\Controller\WebControllerHelper; /** - * Class AccountFileController + * Class DownloadController * * @package SP\Modules\Web\Controllers */ -final class DownloadController extends ControllerBase +final class DownloadController extends AccountFileBase { use JsonTrait; - - private AccountFileServiceInterface $accountFileService; - - public function __construct( - Application $application, - WebControllerHelper $webControllerHelper, - AccountFileServiceInterface $accountFileService - ) { - parent::__construct($application, $webControllerHelper); - - $this->checkLoggedIn(); - - $this->accountFileService = $accountFileService; - } - + /** * Download action * diff --git a/app/modules/web/Controllers/AccountFile/ListController.php b/app/modules/web/Controllers/AccountFile/ListController.php index 1d1a3ac7..bb627e3a 100644 --- a/app/modules/web/Controllers/AccountFile/ListController.php +++ b/app/modules/web/Controllers/AccountFile/ListController.php @@ -27,11 +27,7 @@ namespace SP\Modules\Web\Controllers\AccountFile; use Exception; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Core\Application; use SP\Core\Events\Event; -use SP\Domain\Account\AccountFileServiceInterface; -use SP\Modules\Web\Controllers\ControllerBase; -use SP\Mvc\Controller\WebControllerHelper; use SP\Util\ErrorUtil; /** @@ -39,22 +35,8 @@ use SP\Util\ErrorUtil; * * @package SP\Modules\Web\Controllers */ -final class ListController extends ControllerBase +final class ListController extends AccountFileBase { - private AccountFileServiceInterface $accountFileService; - - public function __construct( - Application $application, - WebControllerHelper $webControllerHelper, - AccountFileServiceInterface $accountFileService - ) { - parent::__construct($application, $webControllerHelper); - - $this->checkLoggedIn(); - - $this->accountFileService = $accountFileService; - } - /** * Obtener los datos para la vista de archivos de una cuenta * diff --git a/app/modules/web/Controllers/AccountFile/ViewController.php b/app/modules/web/Controllers/AccountFile/ViewController.php index b7ac6674..dc769e8e 100644 --- a/app/modules/web/Controllers/AccountFile/ViewController.php +++ b/app/modules/web/Controllers/AccountFile/ViewController.php @@ -25,15 +25,11 @@ namespace SP\Modules\Web\Controllers\AccountFile; use Exception; -use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; -use SP\Domain\Account\AccountFileServiceInterface; use SP\Http\JsonResponse; -use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; -use SP\Mvc\Controller\WebControllerHelper; use SP\Util\FileUtil; /** @@ -41,26 +37,12 @@ use SP\Util\FileUtil; * * @package SP\Modules\Web\Controllers */ -final class ViewController extends ControllerBase +final class ViewController extends AccountFileBase { private const MIME_VIEW = ['text/plain']; use JsonTrait; - private AccountFileServiceInterface $accountFileService; - - public function __construct( - Application $application, - WebControllerHelper $webControllerHelper, - AccountFileServiceInterface $accountFileService - ) { - parent::__construct($application, $webControllerHelper); - - $this->checkLoggedIn(); - - $this->accountFileService = $accountFileService; - } - /** * View action *