Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-17 08:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix default respone generation

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-07-26 09:18:05 +00:00
parent b0728df2e5
commit 3f44d1a522
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Controller/ApiController.php
View File

@ -30,10 +30,8 @@ use Modules\Tag\Models\NullTag;
use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation;
use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\Parser\Markdown\Markdown;
/** /**
@ -96,10 +94,10 @@ final class ApiController extends Controller
{ {
/** @var \Modules\News\Models\NewsArticle $old */ /** @var \Modules\News\Models\NewsArticle $old */
$old = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = clone $old; $new = $this->updateNewsFromRequest($request, clone $old);
$new = $this->updateNewsFromRequest($request);
$this->updateModel($request->header->account, $old, $new, NewsArticleMapper::class, 'news', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, NewsArticleMapper::class, 'news', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully updated', $new); $this->createStandardUpdateResponse($request, $response, $new);
} }
/** /**
@ -111,22 +109,20 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
private function updateNewsFromRequest(RequestAbstract $request) : NewsArticle private function updateNewsFromRequest(RequestAbstract $request, NewsArticle $new) : NewsArticle
{ {
/** @var \Modules\News\Models\NewsArticle $newsArticle */ $new->publish = new \DateTime((string) ($request->getData('publish') ?? $new->publish->format('Y-m-d H:i:s')));
$newsArticle = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute(); $new->title = $request->getDataString('title') ?? $new->title;
$newsArticle->publish = new \DateTime((string) ($request->getData('publish') ?? $newsArticle->publish->format('Y-m-d H:i:s'))); $new->plain = $request->getDataString('plain') ?? $new->plain;
$newsArticle->title = $request->getDataString('title') ?? $newsArticle->title; $new->content = Markdown::parse($request->getDataString('plain') ?? $new->plain);
$newsArticle->plain = $request->getDataString('plain') ?? $newsArticle->plain; $new->setLanguage(\strtolower($request->getDataString('lang') ?? $new->getLanguage()));
$newsArticle->content = Markdown::parse($request->getDataString('plain') ?? $newsArticle->plain); $new->setType($request->getDataInt('type') ?? $new->getType());
$newsArticle->setLanguage(\strtolower($request->getDataString('lang') ?? $newsArticle->getLanguage())); $new->setStatus($request->getDataInt('status') ?? $new->getStatus());
$newsArticle->setType($request->getDataInt('type') ?? $newsArticle->getType()); $new->isFeatured = $request->getDataBool('featured') ?? $new->isFeatured;
$newsArticle->setStatus($request->getDataInt('status') ?? $newsArticle->getStatus()); $new->unit = $request->getDataInt('unit');
$newsArticle->isFeatured = $request->getDataBool('featured') ?? $newsArticle->isFeatured; $new->app = $request->getDataInt('app');
$newsArticle->unit = $request->getDataInt('unit');
$newsArticle->app = $request->getDataInt('app');
return $newsArticle; return $new;
} }
/** /**
@ -145,8 +141,8 @@ final class ApiController extends Controller
public function apiNewsCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiNewsCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateNewsCreate($request))) { if (!empty($val = $this->validateNewsCreate($request))) {
$response->data['news_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400;
$response->header->status = RequestStatusCode::R_400; $this->createInvalidCreateResponse($request, $response, $val);
return; return;
} }
@ -160,7 +156,7 @@ final class ApiController extends Controller
$this->createNewsMedia($newsArticle, $request); $this->createNewsMedia($newsArticle, $request);
} }
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully created', $newsArticle); $this->createStandardCreateResponse($request, $response, $newsArticle);
} }
/** /**
@ -385,7 +381,7 @@ final class ApiController extends Controller
public function apiNewsGet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiNewsGet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$news = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute(); $news = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute();
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully returned', $news); $this->createStandardReturnResponse($request, $response, $news);
} }
/** /**
@ -405,6 +401,6 @@ final class ApiController extends Controller
{ {
$news = NewsArticleMapper::get()->with('media')->with('tags')->where('id', (int) $request->getData('id'))->execute(); $news = NewsArticleMapper::get()->with('media')->with('tags')->where('id', (int) $request->getData('id'))->execute();
$this->deleteModel($request->header->account, $news, NewsArticleMapper::class, 'news', $request->getOrigin()); $this->deleteModel($request->header->account, $news, NewsArticleMapper::class, 'news', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully deleted', $news); $this->createStandardDeleteResponse($request, $response, $news);
} }
} }