added view counter

public/css/dashboard.css

@@ -117,4 +117,11 @@
     bottom: 0;
     height: 2%;
     background-color: lightgrey;
+}
+
+.views {
+    position: absolute;
+    font-size: 1vw;
+    top: 69%;
+    right: 10%;
 }

public/css/watch.css

@@ -12,8 +12,8 @@
 
 #set {
     position: absolute;
-    top: 0px;
+    top: 0;
-    right: 0px;
+    right: 0;
     width: 23.5%;
     min-height: 100px;
     padding: 1%;
@@ -22,4 +22,11 @@
 #description {
     width: 73.5%;
     padding: 1%;
+    position: relative;
+}
+
+.views {
+    position: absolute;
+    top: 7%;
+    right: 3%;
 }

src/Controller/DashboardController.php

@@ -9,6 +9,7 @@ use App\Entity\VideoLink;
 use App\Form\VideoLinkType;
 use App\Form\VideoType;
 use App\Mapper\CustomUuidMapper;
+use App\Service\LoggingService;
 use App\Service\UserService;
 use App\Service\VideoLinkService;
 use App\Service\VideoService;
@@ -27,6 +28,7 @@ class DashboardController extends AbstractController
     private $userService;
     private $videoService;
     private $videoLinkService;
+    private $loggingService;
 
     private $uuidMapper;
 
@@ -34,12 +36,14 @@ class DashboardController extends AbstractController
         UserService $userService,
         VideoService $videoService,
         VideoLinkService $videoLinkService,
+        LoggingService $loggingService,
         CustomUuidMapper $uuidMapper
     )
     {
         $this->userService = $userService;
         $this->videoService = $videoService;
         $this->videoLinkService = $videoLinkService;
+        $this->loggingService = $loggingService;
         $this->uuidMapper = $uuidMapper;
     }
 
@@ -58,6 +62,7 @@ class DashboardController extends AbstractController
 
         foreach ($videos as $video) {
             $video->setCustomId($this->uuidMapper->toString($video->getId()));
+            $video->setViews($this->loggingService->getViews($video));
         }
 
         return $this->render("dashboard/dashboard.html.twig", [
@@ -169,7 +174,6 @@ class DashboardController extends AbstractController
         try {
             $videoId = $this->uuidMapper->fromString($videoId);
         } catch (ConversionException $e) {
-            return new Response($videoId);
             return $this->redirectToRoute("app_links");
         }
 

src/Controller/WatchController.php

@@ -2,7 +2,6 @@
 
 namespace App\Controller;
 
-use App\Entity\User;
 use App\Entity\Video;
 use App\Entity\VideoLink;
 use App\Mapper\CustomUuidMapper;
@@ -55,7 +54,7 @@ class WatchController extends AbstractController
         $this->uuidMapper = $uuidMapper;
     }
 
-    private function isAllowed(?Video $video, ?User $user, VideoLink $link): int
+    private function isAllowed(?Video $video, VideoLink $link): int
     {
         if (!$link) {
             return self::NOT_ALLOWED;
@@ -85,7 +84,7 @@ class WatchController extends AbstractController
 
             if (!$allowed) {
                 $link = $this->videoLinkService->get($this->uuidMapper->fromString($linkId));
-                $allowed = $this->isAllowed($video, $user, $link);
+                $allowed = $this->isAllowed($video, $link);
             }
         } catch (ConversionException $e) {
             throw new AccessDeniedHttpException();
@@ -200,6 +199,7 @@ class WatchController extends AbstractController
         }
 
         $data["video"]->setCustomId($videoId);
+        $data["video"]->setViews($this->loggingService->getViews($data["video"]));
 
         return $this->render("watch/watch.html.twig", [
             "viewToken" => $viewToken,

src/Entity/Video.php

@@ -77,6 +77,8 @@ class Video
      */
     private $transcodingProgress = 0;
 
+    private $views = 0;
+
     public function __construct()
     {
         $this->videoLinks = new ArrayCollection();
@@ -241,4 +243,15 @@ class Video
 
         return $this;
     }
+
+    public function getViews(): ?int
+    {
+        return $this->views;
+    }
+
+    public function setViews(int $views): self
+    {
+        $this->views = $views;
+        return $this;
+    }
 }

src/Repository/ViewRepository.php

@@ -2,6 +2,7 @@
 
 namespace App\Repository;
 
+use App\Entity\Video;
 use App\Entity\View;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -58,4 +59,14 @@ class ViewRepository extends ServiceEntityRepository
     {
         $this->_em->flush();
     }
+
+    public function countForVideo(Video $video): int
+    {
+        $qb = $this->createQueryBuilder("v");
+        return $qb->select("count(v.id)")
+            ->andWhere("v.video = :video")
+            ->setParameter("video", $video->getId()->getBytes())
+            ->andWhere($qb->expr()->isNotNull("v.validated"))
+            ->getQuery()->getSingleScalarResult();
+    }
 }

src/Service/LoggingService.php

@@ -54,4 +54,10 @@ class LoggingService
 
         return true;
     }
+
+    public function getViews(Video $video): int
+    {
+        //return $this->viewRepository->countByVideoAndNotNullValidated($video);
+        return $this->viewRepository->countForVideo($video);
+    }
 }

templates/dashboard/dashboard.html.twig

@@ -70,6 +70,9 @@
                                 </a>
                             </div>
                             <h5>{{ video.name }}</h5>
+                            <div class="views">
+                                {{ video.views }} {{ video.views == 1 ? "View" : "Views" }}
+                            </div>
                             <p>
                                 {{ video.description }}
                             </p>

templates/watch/watch.html.twig

@@ -67,6 +67,9 @@
         </div>
         <div id="description" class="bg-light shadow-5-strong">
             <h2>{{ video.name }}</h2>
+            <div class="views">
+                {{ video.views }} {{ video.views == 1 ? "View" : "Views" }}
+            </div>
             <p>
                 {{ video.description }}
             </p>