bug fixes and permission tests

Admin/Install/db.json

@@ -143,6 +143,13 @@
                 "null": false,
                 "foreignTable": "account",
                 "foreignKey": "account_id"
+            },
+            "news_seen_news": {
+                "name": "news_seen_news",
+                "type": "INT",
+                "null": false,
+                "foreignTable": "news",
+                "foreignKey": "news_id"
             }
         }
     }

Controller/BackendController.php

@@ -70,39 +70,38 @@ final class BackendController extends Controller implements DashboardElementInte
 
         if ($request->getData('ptype') === 'p') {
             $view->setData('news',
-                $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '<')
+                $data = $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '<')
                     ->limit(25)->execute()
             );
         } elseif ($request->getData('ptype') === 'n') {
             $view->setData('news',
-                $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '>')
+                $data = $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '>')
                     ->limit(25)->execute()
             );
         } else {
             $view->setData('news',
-                $mapperQuery->where('id', 0, '>')
+                $data = $mapperQuery->where('id', 0, '>')
                     ->limit(25)->execute()
             );
         }
 
-        $seen = NewsSeenMapper::get()->where('seenBy', $request->header->account)->execute();
+        $ids = [];
-        $view->setData('seen', $seen->seenAt);
+        foreach ($data as $news) {
-
+            $ids[] = $news->getId();
-        // @async
-        // @todo: Seen needs field which defines which news article is seen!!!!
-        if ($seen instanceof NullNewsSeen) {
-            $seen         = new NewsSeen();
-            $seen->seenBy = (int) $request->header->account;
-            $seen->seenAt = new \DateTime('now');
-
-            NewsSeenMapper::create()->execute($seen);
-        } else {
-            $newSeen         = clone $seen;
-            $newSeen->seenAt = new \DateTime('now');
-
-            NewsSeenMapper::update()->execute($newSeen);
         }
 
+        $seenObjects = NewsSeenMapper::getAll()
+            ->where('seenBy', $request->header->account)
+            ->where('news', $ids, 'in')
+            ->execute();
+
+        $seen = [];
+        foreach ($seenObjects as $seenObject) {
+            $seen[] = $seenObject->news;
+        }
+
+        $view->setData('seen', $seen);
+
         return $view;
     }
 
@@ -172,6 +171,20 @@ final class BackendController extends Controller implements DashboardElementInte
             return $view;
         }
 
+        $seen = NewsSeenMapper::get()
+            ->where('news', (int) $request->getData('id'))
+            ->where('seenBy', $request->header->account)
+            ->execute();
+
+        if ($seen instanceof NullNewsSeen) {
+            $seen         = new NewsSeen();
+            $seen->seenBy = (int) $request->header->account;
+            $seen->news   = (int) $request->getData('id');
+            $seen->seenAt = new \DateTime('now');
+
+            NewsSeenMapper::create()->execute($seen);
+        }
+
         $view->setTemplate('/Modules/News/Theme/Backend/news-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response));
         $view->addData('news', $article);

Models/NewsSeen.php

@@ -36,6 +36,8 @@ class NewsSeen
 
     public int $seenBy = 0;
 
+    public int $news = 0;
+
     /**
      * Constructor.
      *

Models/NewsSeenMapper.php

@@ -23,11 +23,6 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
- *
- * @todo Orange-Management/oms-News#???
- *  Too complicated select.
- *  I think the default getAll etc. is too complicated and has too many joins which are not really required.
- *  Check and fix!
  */
 final class NewsSeenMapper extends DataMapperFactory
 {
@@ -38,9 +33,10 @@ final class NewsSeenMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'news_seen_id' => ['name' => 'news_seen_id', 'type' => 'int',      'internal' => 'id'],
+        'news_seen_id'   => ['name' => 'news_seen_id',   'type' => 'int',      'internal' => 'id'],
-        'news_seen_at' => ['name' => 'news_seen_at', 'type' => 'DateTime', 'internal' => 'seenAt'],
+        'news_seen_at'   => ['name' => 'news_seen_at',   'type' => 'DateTime', 'internal' => 'seenAt'],
-        'news_seen_by' => ['name' => 'news_seen_by', 'type' => 'int',      'internal' => 'seenBy'],
+        'news_seen_news' => ['name' => 'news_seen_news', 'type' => 'int',      'internal' => 'news'],
+        'news_seen_by'   => ['name' => 'news_seen_by',   'type' => 'int',      'internal' => 'seenBy'],
     ];
 
     /**

Theme/Backend/news-dashboard.tpl.php

@@ -18,7 +18,7 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
 /** @var \phpOMS\Views\View $this */
 /** @var \Modules\News\Models\NewsArticle[] $newsList */
 $newsList = $this->getData('news');
-$seenAt   = $this->getData('seen');
+$seen     = $this->getData('seen') ?? [];
 
 $previous = empty($newsList) ? '{/prefix}news/dashboard' : '{/prefix}news/dashboard?{?}&id=' . \reset($newsList)->getId() . '&ptype=p';
 $next     = empty($newsList) ? '{/prefix}news/dashboard' : '{/prefix}news/dashboard?{?}&id=' . \end($newsList)->getId() . '&ptype=n';
@@ -32,13 +32,13 @@ echo $this->getData('nav')->render(); ?>
         ?>
         <div class="portlet">
             <div class="portlet-head">
-                <?= $seenAt->getTimestamp() < $news->publish->getTimestamp() ? '<strong>' : ''; ?>
+                <?= !($isSeen = \in_array($news->getId(), $seen)) ? '<strong>' : ''; ?>
                     <a href="<?= $url; ?>"><?= $this->printHtml($news->title); ?></a>
                     <span class="floatRight">
                         <a class="content" href="<?= $profile; ?>"><?= $this->printHtml($news->createdBy->name3 . ' ' . $news->createdBy->name2 . ' ' . $news->createdBy->name1); ?>
                         </a> - <?= $news->publish->format('Y-m-d'); ?>
                     </span>
-                <?= $seenAt->getTimestamp() < $news->publish->getTimestamp() ? '</strong>' : ''; ?>
+                <?= !$isSeen ? '</strong>' : ''; ?>
             </div>
             <div class="portlet-body">
                 <article>