From 26bcd1e28cb0e978d0dc8914f4e2850d3ca23652 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 22 Dec 2018 23:20:25 +0100 Subject: [PATCH] cleanup badge usage --- Admin/Routes/Web/Backend.php | 22 ---------------- Controller/ApiController.php | 35 ------------------------- Controller/BackendController.php | 44 -------------------------------- Models/PermissionState.php | 1 - Models/QAQuestionMapper.php | 6 ----- 5 files changed, 108 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 4fa8e55..4a6d503 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -28,28 +28,6 @@ return [ ], ], ], - '^.*/backend/qa/badge/list.*$' => [ - [ - 'dest' => '\Modules\QA\Controller\BackendController:viewQABadgeList', - 'verb' => RouteVerb::GET, - 'permission' => [ - 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::BADGE, - ], - ], - ], - '^.*/backend/qa/badge/single.*$' => [ - [ - 'dest' => '\Modules\QA\Controller\BackendController:viewQABadgeEdit', - 'verb' => RouteVerb::GET, - 'permission' => [ - 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::BADGE, - ], - ], - ], '^.*/backend/qa/question.*$' => [ [ 'dest' => '\Modules\QA\Controller\BackendController:viewQADoc', diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 341dcac..9ccdaaf 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\QA\Controller; -use Modules\QA\Models\QABadgeMapper; use Modules\QA\Models\QAQuestionMapper; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; @@ -155,38 +154,4 @@ final class ApiController extends Controller return []; } - - public function apiQABadgeCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void - { - if (!empty($val = $this->validateQABadgeCreate($request))) { - $response->set('qa_badge_create', new FormValidation($val)); - - return; - } - - $badge = $this->createQABadgeFromRquest($request); - QABadgeMapper::create($badge); - $response->set('badge', $badge->jsonSerialize()); - } - - public function createQABadgeFromRquest(RequestAbstract $request) : QABadge - { - $mardkownParser = new Markdown(); - - $badge = new QABadge(); - $badge->setName((string) $request->getData('title')); - - return $badge; - } - - private function validateQABadgeCreate(RequestAbstract $request) : array - { - $val = []; - if (($val['title'] = empty($request->getData('title'))) - ) { - return $val; - } - - return []; - } } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index ac8ab02..4eaa2c5 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\QA\Controller; -use Modules\QA\Models\QABadgeMapper; use Modules\QA\Models\QAQuestionMapper; use phpOMS\Asset\AssetType; use phpOMS\Message\RequestAbstract; @@ -70,49 +69,6 @@ final class BackendController extends Controller return $view; } - /** - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param mixed $data Generic data - * - * @return \Serializable - * - * @since 1.0.0 - * @codeCoverageIgnore - */ - public function viewQABadgeList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable - { - $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/QA/Theme/Backend/qa-tag-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006001001, $request, $response)); - - $list = QABadgeMapper::getAll(); - $view->setData('tags', $list); - - return $view; - } - - /** - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param mixed $data Generic data - * - * @return \Serializable - * - * @since 1.0.0 - * @codeCoverageIgnore - */ - public function viewQABadgeEdit(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable - { - $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/QA/Theme/Backend/qa-tag-edit'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006001001, $request, $response)); - - $tag = QABadgeMapper::get((int) $request->getData('id')); - $view->setData('tag', $tag); - - return $view; - } /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Models/PermissionState.php b/Models/PermissionState.php index 1c19824..13fb5e7 100644 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -28,5 +28,4 @@ abstract class PermissionState extends Enum { public const QA = 1; public const QUESTION = 2; - public const BADGE = 3; } diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php index 861cf2c..e427e20 100644 --- a/Models/QAQuestionMapper.php +++ b/Models/QAQuestionMapper.php @@ -52,12 +52,6 @@ final class QAQuestionMapper extends DataMapperAbstract * @since 1.0.0 */ protected static $hasMany = [ - 'badges' => [ - 'mapper' => QABadgeMapper::class, - 'table' => 'qa_question_badge', - 'src' => 'qa_question_badge_badge', - 'dst' => 'qa_question_badge_question', - ], 'answers' => [ 'mapper' => QAAnswerMapper::class, 'table' => 'qa_answer',