cleanup badge usage

This commit is contained in:
Dennis Eichhorn 2018-12-22 23:20:25 +01:00
parent bb4d34b431
commit d2dcbf43f5
2 changed files with 2 additions and 90 deletions

View File

@ -14,9 +14,6 @@ declare(strict_types=1);
namespace Modules\News\Controller; namespace Modules\News\Controller;
use Modules\News\Models\Badge;
use Modules\News\Models\BadgeMapper;
use Modules\News\Models\NewsArticle; use Modules\News\Models\NewsArticle;
use Modules\News\Models\NewsArticleMapper; use Modules\News\Models\NewsArticleMapper;
use Modules\News\Models\NewsStatus; 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); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully returned', $news);
} }
/**
* Validate badge create request
*
* @param RequestAbstract $request Request
*
* @return array<string, bool>
*
* @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. * Get Newslists.
* *
@ -321,24 +253,4 @@ final class ApiController extends Controller
$this->deleteModel($request, $news, NewsArticleMapper::class, 'news'); $this->deleteModel($request, $news, NewsArticleMapper::class, 'news');
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully deleted', $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);
}
} }

View File

@ -151,13 +151,13 @@ class NewsArticle implements ArrayableInterface, \JsonSerializable
/** /**
* Add badge * Add badge
* *
* @param Badge $badge Badge to add * @param mixed $badge Badge to add
* *
* @return void * @return void
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function addBadge(Badge $badge) : void public function addBadge($badge) : void
{ {
$this->badges[] = $badge; $this->badges[] = $badge;
} }