diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 95bbb3a..fd5349e 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -43,7 +43,9 @@ "news_lang": { "name": "news_lang", "type": "VARCHAR(2)", - "null": false + "null": false, + "foreignTable": "language", + "foreignKey": "language_639_1" }, "news_publish": { "name": "news_publish", @@ -56,6 +58,22 @@ "null": true, "default": null }, + "news_unit": { + "name": "news_unit", + "type": "INT", + "default": null, + "null": true, + "foreignTable": "organization_unit", + "foreignKey": "organization_unit_id" + }, + "news_app": { + "name": "news_app", + "type": "INT", + "default": null, + "null": true, + "foreignTable": "app", + "foreignKey": "app_id" + }, "news_created_at": { "name": "news_created_at", "type": "DATETIME", diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 39634d2..a9703c4 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -124,6 +124,8 @@ final class ApiController extends Controller $newsArticle->setType((int) ($request->getData('type') ?? $newsArticle->getType())); $newsArticle->setStatus((int) ($request->getData('status') ?? $newsArticle->getStatus())); $newsArticle->isFeatured = (bool) ($request->getData('featured') ?? $newsArticle->isFeatured); + $newsArticle->unit = $request->getData('unit', 'int'); + $newsArticle->app = $request->getData('app', 'int'); return $newsArticle; } diff --git a/Models/NewsArticle.php b/Models/NewsArticle.php index 3c5944e..05b645f 100755 --- a/Models/NewsArticle.php +++ b/Models/NewsArticle.php @@ -89,6 +89,22 @@ class NewsArticle implements \JsonSerializable */ private string $language = ISO639x1Enum::_EN; + /** + * Unit + * + * @var null|int + * @since 1.0.0 + */ + public ?int $unit = null; + + /** + * Application + * + * @var null|int + * @since 1.0.0 + */ + public ?int $app = null; + /** * Created. * diff --git a/Models/NewsArticleMapper.php b/Models/NewsArticleMapper.php index 22542e7..9b84f97 100755 --- a/Models/NewsArticleMapper.php +++ b/Models/NewsArticleMapper.php @@ -47,6 +47,8 @@ final class NewsArticleMapper extends DataMapperFactory 'news_type' => ['name' => 'news_type', 'type' => 'int', 'internal' => 'type'], 'news_featured' => ['name' => 'news_featured', 'type' => 'bool', 'internal' => 'isFeatured'], 'news_comment_list' => ['name' => 'news_comment_list', 'type' => 'int', 'internal' => 'comments'], + 'news_unit' => ['name' => 'news_unit', 'type' => 'int', 'internal' => 'unit'], + 'news_app' => ['name' => 'news_app', 'type' => 'int', 'internal' => 'app'], 'news_created_at' => ['name' => 'news_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], 'news_created_by' => ['name' => 'news_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], ];