Split controllers per application

This commit is contained in:
Dennis Eichhorn 2018-09-19 21:34:04 +02:00
parent edec34fda0
commit a82ead99a5
5 changed files with 284 additions and 145 deletions

View File

@ -3,15 +3,15 @@
use phpOMS\Router\RouteVerb;
use phpOMS\Account\PermissionType;
use Modules\Media\Models\PermissionState;
use Modules\Media\Controller;
use Modules\Media\Controller\ApiController;
return [
'^.*/api/media/collection.*$' => [
[
'dest' => '\Modules\Media\Controller:apiCollectionCreate',
'dest' => '\Modules\Media\Controller\ApiController:apiCollectionCreate',
'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::COLLECTION,
],
@ -19,10 +19,10 @@ return [
],
'^.*/api/media$' => [
[
'dest' => '\Modules\Media\Controller:apiMediaUpload',
'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpload',
'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
@ -30,10 +30,10 @@ return [
],
'^.*/api/media/create.*$' => [
[
'dest' => '\Modules\Media\Controller:apiMediaCreate',
'dest' => '\Modules\Media\Controller\ApiController:apiMediaCreate',
'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],

View File

@ -3,15 +3,15 @@
use phpOMS\Router\RouteVerb;
use phpOMS\Account\PermissionType;
use Modules\Media\Models\PermissionState;
use Modules\Media\Controller;
use Modules\Media\Controller\BackendController;
return [
'^.*/backend/media/list.*$' => [
[
'dest' => '\Modules\Media\Controller:viewMediaList',
'dest' => '\Modules\Media\Controller\BackendController:viewMediaList',
'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::MEDIA,
],
@ -19,19 +19,19 @@ return [
],
'^.*/backend/media/create.*$' => [
[
'dest' => '\Modules\Media\Controller:setUpFileUploader',
'dest' => '\Modules\Media\Controller\BackendController:setUpFileUploader',
'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
],
[
'dest' => '\Modules\Media\Controller:viewMediaCreate',
'dest' => '\Modules\Media\Controller\BackendController:viewMediaCreate',
'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
@ -39,10 +39,10 @@ return [
],
'^.*/backend/media/single.*$' => [
[
'dest' => '\Modules\Media\Controller:viewMediaSingle',
'dest' => '\Modules\Media\Controller\BackendController:viewMediaSingle',
'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::MEDIA,
],

View File

@ -0,0 +1,172 @@
<?php
/**
* Orange Management
*
* PHP Version 7.2
*
* @package Modules\Media
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link http://website.orange-management.de
*/
declare(strict_types=1);
namespace Modules\Media\Controller;
use Modules\Media\Models\Media;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\Collection;
use Modules\Media\Views\MediaView;
use Modules\Media\Models\UploadFile;
use Modules\Media\Models\UploadStatus;
use phpOMS\Asset\AssetType;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Html\Head;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\WebInterface;
use phpOMS\System\MimeType;
use phpOMS\Views\View;
use phpOMS\Message\Http\RequestStatusCode;
/**
* Media class.
*
* @package Modules\Media
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0
*/
class ApiController extends Controller
{
/**
* Shows api content.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return void
*
* @api
*
* @since 1.0.0
*/
public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$uploads = $this->uploadFiles(
$request->getFiles(),
$request->getHeader()->getAccount(),
(string) ($request->getData('path') ?? __DIR__ . '/../../Modules/Media/Files')
);
$ids = [];
foreach ($uploads as $file) {
$ids[] = $file->getId();
}
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->set($request->getUri()->__toString(), [['uploads' => $ids, 'type' => 'UI']]);
}
/**
* Shows api content.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return void
*
* @api
*
* @since 1.0.0
*/
public function apiMediaCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
// todo: change database entry for files if has write permission
}
/**
* @param array $files Files
* @param int $account Uploader
* @param string $basePath Base path
*
* @return array
*
* @since 1.0.0
*/
public function uploadFiles(array $files, int $account, string $basePath = 'Modules/Media/Files') : array
{
$mediaCreated = [];
if (!empty($files)) {
$upload = new UploadFile();
$upload->setOutputDir(self::createMediaPath($basePath));
$status = $upload->upload($files);
$mediaCreated = self::createDbEntries($status, $account);
}
return $mediaCreated;
}
public static function createMediaPath(string $basePath = 'Modules/Media/Files') : string
{
$rndPath = str_pad(dechex(rand(0, 65535)), 4, '0', STR_PAD_LEFT);
return $basePath . '/' . $rndPath[0] . $rndPath[1] . '/' . $rndPath[2] . $rndPath[3];
}
/**
* @param array $status Files
* @param int $account Uploader
*
* @return array
*
* @since 1.0.0
*/
public static function createDbEntries(array $status, int $account) : array
{
$mediaCreated = [];
foreach ($status as $uFile) {
if (!is_null($created = self::createDbEntry($uFile, $account))) {
$mediaCreated[] = $created;
}
}
return $mediaCreated;
}
public static function createDbEntry(array $status, int $account) : ?Media
{
$media = null;
if ($status['status'] === UploadStatus::OK) {
$media = new Media();
$media->setPath(self::normalizeDbPath($status['path']) . '/' . $status['filename']);
$media->setName($status['name']);
$media->setSize($status['size']);
$media->setCreatedBy($account);
$media->setExtension($status['extension']);
MediaMapper::create($media);
}
return $media;
}
private static function normalizeDbPath(string $path) : string
{
return \str_replace('\\', '/',
\str_replace(realpath(__DIR__ . '/../../'), '',
rtrim($path, '/')
)
);
}
}

View File

@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Media;
namespace Modules\Media\Controller;
use Modules\Media\Models\Media;
use Modules\Media\Models\MediaMapper;
@ -40,7 +40,7 @@ use phpOMS\Message\Http\RequestStatusCode;
* @link http://website.orange-management.de
* @since 1.0.0
*/
final class Controller extends ModuleAbstract implements WebInterface
class BackendController extends Controller
{
/**
@ -176,131 +176,4 @@ final class Controller extends ModuleAbstract implements WebInterface
return $view;
}
/**
* Shows api content.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return void
*
* @api
*
* @since 1.0.0
*/
public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$uploads = $this->uploadFiles(
$request->getFiles(),
$request->getHeader()->getAccount(),
(string) ($request->getData('path') ?? __DIR__ . '/../../Modules/Media/Files')
);
$ids = [];
foreach ($uploads as $file) {
$ids[] = $file->getId();
}
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->set($request->getUri()->__toString(), [['uploads' => $ids, 'type' => 'UI']]);
}
/**
* Shows api content.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return void
*
* @api
*
* @since 1.0.0
*/
public function apiMediaCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
// todo: change database entry for files if has write permission
}
/**
* @param array $files Files
* @param int $account Uploader
* @param string $basePath Base path
*
* @return array
*
* @since 1.0.0
*/
public function uploadFiles(array $files, int $account, string $basePath = 'Modules/Media/Files') : array
{
$mediaCreated = [];
if (!empty($files)) {
$upload = new UploadFile();
$upload->setOutputDir(self::createMediaPath($basePath));
$status = $upload->upload($files);
$mediaCreated = self::createDbEntries($status, $account);
}
return $mediaCreated;
}
public static function createMediaPath(string $basePath = 'Modules/Media/Files') : string
{
$rndPath = str_pad(dechex(rand(0, 65535)), 4, '0', STR_PAD_LEFT);
return $basePath . '/' . $rndPath[0] . $rndPath[1] . '/' . $rndPath[2] . $rndPath[3];
}
/**
* @param array $status Files
* @param int $account Uploader
*
* @return array
*
* @since 1.0.0
*/
public static function createDbEntries(array $status, int $account) : array
{
$mediaCreated = [];
foreach ($status as $uFile) {
if (!is_null($created = self::createDbEntry($uFile, $account))) {
$mediaCreated[] = $created;
}
}
return $mediaCreated;
}
public static function createDbEntry(array $status, int $account) : ?Media
{
$media = null;
if ($status['status'] === UploadStatus::OK) {
$media = new Media();
$media->setPath(self::normalizeDbPath($status['path']) . '/' . $status['filename']);
$media->setName($status['name']);
$media->setSize($status['size']);
$media->setCreatedBy($account);
$media->setExtension($status['extension']);
MediaMapper::create($media);
}
return $media;
}
private static function normalizeDbPath(string $path) : string
{
return \str_replace('\\', '/',
\str_replace(realpath(__DIR__ . '/../../'), '',
rtrim($path, '/')
)
);
}
}

94
Controller/Controller.php Normal file
View File

@ -0,0 +1,94 @@
<?php
/**
* Orange Management
*
* PHP Version 7.2
*
* @package Modules\Media
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link http://website.orange-management.de
*/
declare(strict_types=1);
namespace Modules\Media\Controller;
use Modules\Media\Models\Media;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\Collection;
use Modules\Media\Views\MediaView;
use Modules\Media\Models\UploadFile;
use Modules\Media\Models\UploadStatus;
use phpOMS\Asset\AssetType;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Html\Head;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\WebInterface;
use phpOMS\System\MimeType;
use phpOMS\Views\View;
use phpOMS\Message\Http\RequestStatusCode;
/**
* Media class.
*
* @package Modules\Media
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0
*/
class Controller extends ModuleAbstract implements WebInterface
{
/**
* Module path.
*
* @var string
* @since 1.0.0
*/
public const MODULE_PATH = __DIR__ . '/../';
/**
* Module version.
*
* @var string
* @since 1.0.0
*/
public const MODULE_VERSION = '1.0.0';
/**
* Module name.
*
* @var string
* @since 1.0.0
*/
public const MODULE_NAME = 'Media';
/**
* Module id.
*
* @var int
* @since 1.0.0
*/
public const MODULE_ID = 1000400000;
/**
* Providing.
*
* @var string[]
* @since 1.0.0
*/
protected static $providing = [];
/**
* Dependencies.
*
* @var string[]
* @since 1.0.0
*/
protected static $dependencies = [
];
}