Merge pull request #71 from leepeuker/add-user-selection

Add user selection
leepeuker · Jul 27, 2022 · 679ce1c · 679ce1c
2 parents 2de9734 + 188fc6e
commit 679ce1c
Show file tree

Hide file tree

Showing 20 changed files with 101 additions and 26 deletions.
diff --git a/public/js/app.js b/public/js/app.js
@@ -6,3 +6,9 @@ if ('serviceWorker' in navigator) {
 			.catch(err => console.log('service worker not registered', err))
 	})
 }
+
+function changeUserContext (e) {
+	const currentUrlPath = window.location.pathname
+
+	window.location.href = currentUrlPath.replace(/\/[a-zA-Z0-9]+\//, '/' + e.value + '/')
+}
diff --git a/src/Application/Movie/Api.php b/src/Application/Movie/Api.php
@@ -138,14 +138,14 @@ public function fetchHistoryOrderedByWatchedAtDesc(int $userId) : array
         return $this->historySelectService->fetchHistoryOrderedByWatchedAtDesc($userId);
     }
 
-    public function fetchWithActor(int $personId) : EntityList
+    public function fetchWithActor(int $personId, int $userId) : EntityList
     {
-        return $this->movieSelectService->fetchWithActor($personId);
+        return $this->movieSelectService->fetchWithActor($personId, $userId);
     }
 
-    public function fetchWithDirector(int $personId) : EntityList
+    public function fetchWithDirector(int $personId, int $userId) : EntityList
     {
-        return $this->movieSelectService->fetchWithDirector($personId);
+        return $this->movieSelectService->fetchWithDirector($personId, $userId);
     }
 
     public function findById(int $movieId) : ?array

diff --git a/src/Application/Movie/Repository.php b/src/Application/Movie/Repository.php
@@ -420,33 +420,35 @@ public function fetchUniqueMovieInHistoryCount(int $userId) : int
         )->fetchFirstColumn()[0];
     }
 
-    public function fetchWithActor(int $personId) : array
+    public function fetchWithActor(int $personId, int $userId) : array
     {
         return $this->dbConnection->fetchAllAssociative(
             <<<SQL
             SELECT m.*
             FROM movie m
             JOIN movie_cast mc ON m.id = mc.movie_id
             JOIN person p ON mc.person_id = p.id
-            WHERE p.id = ? AND m.id IN (SELECT DISTINCT movie_id FROM movie_user_watch_dates mh)
+            JOIN movie_user_watch_dates muwd ON m.id = muwd.movie_id
+            WHERE p.id = ? AND m.id IN (SELECT DISTINCT movie_id FROM movie_user_watch_dates mh) AND muwd.user_id = ?
             ORDER BY m.title
             SQL,
-            [$personId]
+            [$personId, $userId]
         );
     }
 
-    public function fetchWithDirector(int $personId) : array
+    public function fetchWithDirector(int $personId, int $userId) : array
     {
         return $this->dbConnection->fetchAllAssociative(
             <<<SQL
             SELECT m.*
             FROM movie m
             JOIN movie_crew mc ON m.id = mc.movie_id AND job = "Director"
             JOIN person p ON mc.person_id = p.id
-            WHERE p.id = ? AND m.id IN (SELECT DISTINCT movie_id FROM movie_user_watch_dates mh)
+            JOIN movie_user_watch_dates muwd ON m.id = muwd.movie_id
+            WHERE p.id = ? AND m.id IN (SELECT DISTINCT movie_id FROM movie_user_watch_dates mh) AND muwd.user_id = ?
             ORDER BY m.title
             SQL,
-            [$personId]
+            [$personId, $userId]
         );
     }
 

diff --git a/src/Application/Movie/Service/Select.php b/src/Application/Movie/Service/Select.php
@@ -24,14 +24,14 @@ public function fetchAllOrderedByLastUpdatedAtTmdbAsc() : EntityList
         return $this->repository->fetchAllOrderedByLastUpdatedAtTmdbAsc();
     }
 
-    public function fetchWithActor(int $personId) : EntityList
+    public function fetchWithActor(int $personId, int $userId) : EntityList
     {
-        return EntityList::createFromArray($this->repository->fetchWithActor($personId));
+        return EntityList::createFromArray($this->repository->fetchWithActor($personId, $userId));
     }
 
-    public function fetchWithDirector(int $personId) : EntityList
+    public function fetchWithDirector(int $personId, int $userId) : EntityList
     {
-        return EntityList::createFromArray($this->repository->fetchWithDirector($personId));
+        return EntityList::createFromArray($this->repository->fetchWithDirector($personId, $userId));
     }
 
     public function findById(int $movieId) : ?Entity

diff --git a/src/Application/User/Api.php b/src/Application/User/Api.php
@@ -38,6 +38,16 @@ public function fetchAll() : array
         return $this->repository->fetchAll();
     }
 
+    public function fetchAllHavingWatchedMovie(int $movieId) : array
+    {
+        return $this->repository->fetchAllHavingWatchedMovie($movieId);
+    }
+
+    public function fetchAllHavingWatchedMoviesWithPerson(int $personId) : array
+    {
+        return $this->repository->fetchAllHavingWatchedMoviesWithPerson($personId);
+    }
+
     public function fetchDateFormatId(int $userId) : int
     {
         $dateFormat = $this->repository->findDateFormatId($userId);

diff --git a/src/Application/User/Repository.php b/src/Application/User/Repository.php
@@ -55,6 +55,29 @@ public function fetchAll() : array
         return $this->dbConnection->fetchAllAssociative('SELECT * FROM `user`');
     }
 
+    public function fetchAllHavingWatchedMovie(int $movieId) : array
+    {
+        return $this->dbConnection->fetchAllAssociative(
+            'SELECT user.name 
+            FROM `user` 
+            JOIN movie_user_watch_dates muwd ON user.id = muwd.user_id 
+            WHERE movie_id = ?',
+            [$movieId]
+        );
+    }
+
+    public function fetchAllHavingWatchedMoviesWithPerson(int $personId) : array
+    {
+        return $this->dbConnection->fetchAllAssociative(
+            'SELECT user.name
+            FROM `user` 
+            JOIN movie_user_watch_dates muwd ON user.id = muwd.user_id 
+            JOIN movie_cast mc ON muwd.movie_id = mc.movie_id 
+            WHERE person_id = ?',
+            [$personId]
+        );
+    }
+
     public function findAuthTokenExpirationDate(string $token) : ?DateTime
     {
         $expirationDate = $this->dbConnection->fetchOne('SELECT `expiration_date` FROM `user_auth_token` WHERE `token` = ?', [$token]);

diff --git a/src/HttpController/DashboardController.php b/src/HttpController/DashboardController.php
@@ -31,6 +31,7 @@ public function render(Request $request) : Response
         return Response::create(
             StatusCode::createOk(),
             $this->twig->render('page/dashboard.html.twig', [
+                'users' => $this->userApi->fetchAll(),
                 'totalPlayCount' => $this->movieApi->fetchHistoryCount($userId),
                 'uniqueMoviesCount' => $this->movieApi->fetchHistoryCountUnique($userId),
                 'totalHoursWatched' => $this->movieHistorySelectService->fetchTotalHoursWatched($userId),

diff --git a/src/HttpController/HistoryController.php b/src/HttpController/HistoryController.php
@@ -107,6 +107,7 @@ public function renderHistory(Request $request) : Response
         return Response::create(
             StatusCode::createOk(),
             $this->twig->render('page/history.html.twig', [
+                'users' => $this->userApi->fetchAll(),
                 'historyEntries' => $historyPaginated,
                 'paginationElements' => $paginationElements,
                 'searchTerm' => $searchTerm,

diff --git a/src/HttpController/MostWatchedActorsController.php b/src/HttpController/MostWatchedActorsController.php
@@ -46,6 +46,7 @@ public function renderPage(Request $request) : Response
         return Response::create(
             StatusCode::createOk(),
             $this->twig->render('page/mostWatchedActors.html.twig', [
+                'users' => $this->userApi->fetchAll(),
                 'mostWatchedActors' => $mostWatchedActors,
                 'paginationElements' => $paginationElements,
                 'searchTerm' => $searchTerm,

diff --git a/src/HttpController/MostWatchedDirectorsController.php b/src/HttpController/MostWatchedDirectorsController.php
@@ -46,6 +46,7 @@ public function renderPage(Request $request) : Response
         return Response::create(
             StatusCode::createOk(),
             $this->twig->render('page/mostWatchedDirectors.html.twig', [
+                'users' => $this->userApi->fetchAll(),
                 'mostWatchedDirectors' => $mostWatchedActors,
                 'paginationElements' => $paginationElements,
                 'searchTerm' => $searchTerm,

diff --git a/src/HttpController/MovieController.php b/src/HttpController/MovieController.php
@@ -58,6 +58,7 @@ public function renderPage(Request $request) : Response
         return Response::create(
             StatusCode::createOk(),
             $this->twig->render('page/movie.html.twig', [
+                'users' => $this->userApi->fetchAllHavingWatchedMovie($movieId),
                 'movie' => $movie,
                 'movieGenres' => $this->movieApi->findGenresByMovieId($movieId),
                 'castMembers' => $this->movieApi->findCastByMovieId($movieId),

diff --git a/src/HttpController/PersonController.php b/src/HttpController/PersonController.php
@@ -4,6 +4,7 @@
 
 use Movary\Application\Movie;
 use Movary\Application\Person;
+use Movary\Application\User;
 use Movary\ValueObject\Http\Request;
 use Movary\ValueObject\Http\Response;
 use Movary\ValueObject\Http\StatusCode;
@@ -14,20 +15,27 @@ class PersonController
     public function __construct(
         private readonly Person\Api $personApi,
         private readonly Movie\Api $movieApi,
+        private readonly User\Api $userApi,
         private readonly Environment $twig,
     ) {
     }
 
     public function renderPage(Request $request) : Response
     {
+        $userId = $this->userApi->findUserByName((string)$request->getRouteParameters()['username'])?->getId();
+        if ($userId === null) {
+            return Response::createNotFound();
+        }
+
         $personId = (int)$request->getRouteParameters()['id'];
 
         return Response::create(
             StatusCode::createOk(),
             $this->twig->render('page/actor.html.twig', [
+                'users' => $this->userApi->fetchAllHavingWatchedMoviesWithPerson($personId),
                 'person' => $this->personApi->findById($personId),
-                'moviesAsActor' => $this->movieApi->fetchWithActor($personId),
-                'moviesAsDirector' => $this->movieApi->fetchWithDirector($personId),
+                'moviesAsActor' => $this->movieApi->fetchWithActor($personId, $userId),
+                'moviesAsDirector' => $this->movieApi->fetchWithDirector($personId, $userId),
             ]),
         );
     }

diff --git a/templates/component/navbar.html.twig b/templates/component/navbar.html.twig
@@ -13,9 +13,6 @@
                     </li>
                 {% endif %}
                 <li><a class="dropdown-item {% if requestUrlPath matches '#\/.+\/dashboard#' %}active{% endif %}" href="/{{ routeUsername }}/dashboard">Dashboard</a></li>
-                <li>
-                    <hr class="dropdown-divider">
-                </li>
                 <li><a class="dropdown-item {% if requestUrlPath matches '#\/.+\/history#' %}active{% endif %}" href="/{{ routeUsername }}/history">History</a></li>
                 <li><a class="dropdown-item {% if requestUrlPath matches '#\/.+\/most-watched-actors#' %}active{% endif %}" href="/{{ routeUsername }}/most-watched-actors">Top Actors</a></li>
                 <li><a class="dropdown-item {% if requestUrlPath matches '#\/.+\/most-watched-directors#' %}active{% endif %}" href="/{{ routeUsername }}/most-watched-directors">Top Directors</a></li>

diff --git a/templates/component/user-select.html.twig b/templates/component/user-select.html.twig
@@ -0,0 +1,11 @@
+<div style="margin-top: 1rem;margin-bottom: 1rem">
+    <div class="input-group">
+        <span class="input-group-text">User</span>
+        <select class="form-select" onchange="changeUserContext(this)">
+            <option disabled>Select user</option>
+            {% for user in users %}
+                <option value="{{ user.name }}" {% if routeUsername == user.name %}selected{% endif %}>{{ user.name }}</option>
+            {% endfor %}
+        </select>
+    </div>
+</div>
diff --git a/templates/page/actor.html.twig b/templates/page/actor.html.twig
@@ -8,7 +8,10 @@
 {% block body %}
     <main role="main" class="container">
         {{ include('component/navbar.html.twig') }}
-        <h2 style="display: flex;padding-top: 0.5rem;">{{ person.name }}</h2>
+        {{ include('component/user-select.html.twig') }}
+
+        <h2 style="display: flex;">{{ person.name }}</h2>
+
         <div style="display: flex;">
             <div style="text-align: center">
                 <img src="{{ tmdb.generatePosterImageUrl(person.tmdbPosterPath) }}" width="200rem" style="width: 11rem;align-self: start;">

diff --git a/templates/page/dashboard.html.twig b/templates/page/dashboard.html.twig
@@ -13,7 +13,9 @@
 {% block body %}
     <main role="main" class="container">
         {{ include('component/navbar.html.twig') }}
-        <div style="text-align: center;padding-top: 1rem">
+        <div style="text-align: center">
+            {{ include('component/user-select.html.twig') }}
+
             <h2 style="padding-bottom: 0.5rem">Overview</h2>
             <div class="row justify-content-md-center">
                 <div class="col ">
@@ -80,7 +82,8 @@
                     <div class="row row-cols-3 row-cols-md-3 row-cols-lg-6">
                         {% for mostWatchedActor in mostWatchedActors %}
                             <div class="col" style="padding-bottom: 1rem;">
-                                <div class="card h-100 position-relative" onclick="window.location='/{{ routeUsername }}/person/{{ mostWatchedActor.id }}'" style="cursor: pointer;">
+                                <div class="card h-100 position-relative" onclick="window.location='/{{ routeUsername }}/person/{{ mostWatchedActor.id }}'"
+                                     style="cursor: pointer;">
                                     <div class="card-header text-truncate" style="padding: 0.2rem">
                                         <small class="text-muted" style="font-size: 0.9rem;">{{ mostWatchedActor.name }}</small>
                                     </div>

diff --git a/templates/page/history.html.twig b/templates/page/history.html.twig
@@ -14,7 +14,9 @@
     <main role="main" class="container">
         {{ include('component/navbar.html.twig') }}
 
-        <div style="text-align: center;padding-top: 1rem">
+        <div style="text-align: center">
+            {{ include('component/user-select.html.twig') }}
+
             <form action="/{{ routeUsername }}/history" method="GET">
                 <div class="input-group mb-3">
                     <input type="text" class="form-control" name="s" placeholder="Search" value="{{ (searchTerm is null) ? '' : searchTerm }}">

diff --git a/templates/page/mostWatchedActors.html.twig b/templates/page/mostWatchedActors.html.twig
@@ -14,7 +14,9 @@
     <main role="main" class="container">
         {{ include('component/navbar.html.twig') }}
 
-        <div style="text-align: center;padding-top: 1rem">
+        <div style="text-align: center;">
+            {{ include('component/user-select.html.twig') }}
+
             <form action="/most-watched-actors" method="GET">
                 <div class="input-group mb-3">
                     <input type="text" class="form-control" name="s" placeholder="Search" value="{{ (searchTerm is null) ? '' : searchTerm }}">

diff --git a/templates/page/mostWatchedDirectors.html.twig b/templates/page/mostWatchedDirectors.html.twig
@@ -14,7 +14,9 @@
     <main role="main" class="container">
         {{ include('component/navbar.html.twig') }}
 
-        <div style="text-align: center;padding-top: 1rem">
+        <div style="text-align: center;m">
+            {{ include('component/user-select.html.twig') }}
+
             <form action="/most-watched-directors" method="GET">
                 <div class="input-group mb-3">
                     <input type="text" class="form-control" name="s" placeholder="Search" value="{{ (searchTerm is null) ? '' : searchTerm }}">

diff --git a/templates/page/movie.html.twig b/templates/page/movie.html.twig
@@ -18,8 +18,9 @@
 {% block body %}
     <main role="main" class="container">
         {{ include('component/navbar.html.twig') }}
+        {{ include('component/user-select.html.twig') }}
 
-        <h2 style="display: flex;padding-top: 0.5rem;margin-bottom: 0.3rem">{{ movie.title }} ({{ movie.releaseDate|date("Y") }})</h2>
+        <h2 style="display: flex;margin-bottom: 0.3rem">{{ movie.title }} ({{ movie.releaseDate|date("Y") }})</h2>
 
 
         <input type="hidden" id="movieId" value="{{ movie.id }}">