From d2dcbf43f5500aa48fa2849345903d5c1d2fa09e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 22 Dec 2018 23:20:25 +0100 Subject: [PATCH] cleanup badge usage --- Controller/ApiController.php | 88 ------------------------------------ Models/NewsArticle.php | 4 +- 2 files changed, 2 insertions(+), 90 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f0be400..d87ea58 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,9 +14,6 @@ declare(strict_types=1); namespace Modules\News\Controller; -use Modules\News\Models\Badge; - -use Modules\News\Models\BadgeMapper; use Modules\News\Models\NewsArticle; use Modules\News\Models\NewsArticleMapper; use Modules\News\Models\NewsStatus; @@ -187,71 +184,6 @@ final class ApiController extends Controller $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully returned', $news); } - /** - * Validate badge create request - * - * @param RequestAbstract $request Request - * - * @return array - * - * @since 1.0.0 - */ - private function validateBadgeCreate(RequestAbstract $request) : array - { - $val = []; - if (($val['title'] = empty($request->getData('title'))) - ) { - return $val; - } - - return []; - } - - /** - * Api method to create Badge - * - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param mixed $data Generic data - * - * @return void - * - * @api - * - * @since 1.0.0 - */ - public function apiBadgeCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void - { - if (!empty($val = $this->validateBadgeCreate($request))) { - $response->set('badge_create', new FormValidation($val)); - - return; - } - - $badge = $this->createBadgeFromRequest($request); - $this->createModel($request, $badge, BadgeMapper::class, 'badge'); - $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Badge', 'Badge successfully created', $badge); - } - - /** - * Method to create badge from request. - * - * @param RequestAbstract $request Request - * - * @return Badge - * - * @since 1.0.0 - */ - private function createBadgeFromRequest(RequestAbstract $request) : Badge - { - $mardkownParser = new Markdown(); - - $badge = new Badge(); - $badge->setName((string) ($request->getData('title') ?? '')); - - return $badge; - } - /** * Get Newslists. * @@ -321,24 +253,4 @@ final class ApiController extends Controller $this->deleteModel($request, $news, NewsArticleMapper::class, 'news'); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully deleted', $news); } - - /** - * Api method to delete badge - * - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param mixed $data Generic data - * - * @return void - * - * @api - * - * @since 1.0.0 - */ - public function apiDeleteNewsBadge(RequestAbstract $request, ResponseAbstract $response, $data = null) : void - { - $badge = BadgeMapper::get((int) $request->getData('id')); - $this->deleteModel($request, $badge, BadgeMapper::class, 'badge'); - $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Badge', 'Badge successfully deleted', $badge); - } } diff --git a/Models/NewsArticle.php b/Models/NewsArticle.php index e620b31..7ff0be1 100644 --- a/Models/NewsArticle.php +++ b/Models/NewsArticle.php @@ -151,13 +151,13 @@ class NewsArticle implements ArrayableInterface, \JsonSerializable /** * Add badge * - * @param Badge $badge Badge to add + * @param mixed $badge Badge to add * * @return void * * @since 1.0.0 */ - public function addBadge(Badge $badge) : void + public function addBadge($badge) : void { $this->badges[] = $badge; }