From 30cda1a5a1d2a5f2800b41c0af52dd7f318acccb Mon Sep 17 00:00:00 2001
From: Pietro Bonaldo Gregori <pietro.bogre@gmail.com>
Date: Thu, 27 Jul 2023 15:33:58 +0200
Subject: [PATCH 1/7] remove duplicate movies

---
 src/Domain/Movie/MovieRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Domain/Movie/MovieRepository.php b/src/Domain/Movie/MovieRepository.php
index 11eded9b..303fba3e 100644
--- a/src/Domain/Movie/MovieRepository.php
+++ b/src/Domain/Movie/MovieRepository.php
@@ -672,7 +672,7 @@ public function fetchUniqueMoviesPaginated(
 
         return $this->dbConnection->fetchAllAssociative(
             <<<SQL
-            SELECT m.*, mur.rating as userRating
+            SELECT DISTINCT m.*, mur.rating as userRating
             FROM movie m
             JOIN movie_user_watch_dates mh on mh.movie_id = m.id and mh.user_id = ?
             LEFT JOIN movie_user_rating mur ON mh.movie_id = mur.movie_id and mur.user_id = ?

From a3e292a98e20f2d39d06ccd1057f24caca501492 Mon Sep 17 00:00:00 2001
From: Pietro Bonaldo Gregori <pietro.bogre@gmail.com>
Date: Thu, 27 Jul 2023 15:37:24 +0200
Subject: [PATCH 2/7] rename sorting option to 'First watch date'

---
 templates/page/movies.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/page/movies.html.twig b/templates/page/movies.html.twig
index 0e4aa9ae..6528439a 100644
--- a/templates/page/movies.html.twig
+++ b/templates/page/movies.html.twig
@@ -32,7 +32,7 @@
                         <select class="form-control" name="sb" id="sort-by" style="width: 50%">
                             <option value="title" {{ sortBy == 'title' ? 'selected' }}>Title</option>
                             <option value="releaseDate" {{ sortBy == 'releaseDate' ? 'selected' }}>Release date</option>
-                            <option value="watchDate" {{ sortBy == 'watchDate' ? 'selected' }}>Watch date</option>
+                            <option value="watchDate" {{ sortBy == 'watchDate' ? 'selected' }}>First watch date</option>
                             <option value="rating" {{ sortBy == 'rating' ? 'selected' }}>Rating</option>
                             <option value="runtime" {{ sortBy == 'runtime' ? 'selected' }}>Runtime</option>
                         </select>

From 1f2e2dbd982c8b77a4e2050ae0ae75c622fc6d58 Mon Sep 17 00:00:00 2001
From: Pietro Bonaldo Gregori <45976792+pbogre@users.noreply.github.com>
Date: Thu, 27 Jul 2023 18:25:50 +0200
Subject: [PATCH 3/7] rename option to Watch date

Co-authored-by: Lee Peuker <lee.peuker@protonmail.com>
---
 templates/page/movies.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/page/movies.html.twig b/templates/page/movies.html.twig
index 6528439a..0e4aa9ae 100644
--- a/templates/page/movies.html.twig
+++ b/templates/page/movies.html.twig
@@ -32,7 +32,7 @@
                         <select class="form-control" name="sb" id="sort-by" style="width: 50%">
                             <option value="title" {{ sortBy == 'title' ? 'selected' }}>Title</option>
                             <option value="releaseDate" {{ sortBy == 'releaseDate' ? 'selected' }}>Release date</option>
-                            <option value="watchDate" {{ sortBy == 'watchDate' ? 'selected' }}>First watch date</option>
+                            <option value="watchDate" {{ sortBy == 'watchDate' ? 'selected' }}>Watch date</option>
                             <option value="rating" {{ sortBy == 'rating' ? 'selected' }}>Rating</option>
                             <option value="runtime" {{ sortBy == 'runtime' ? 'selected' }}>Runtime</option>
                         </select>

From 08f3ea1d7016aa7aaa7316e2b1607bfce554738d Mon Sep 17 00:00:00 2001
From: Pietro Bonaldo Gregori <pietro.bogre@gmail.com>
Date: Thu, 27 Jul 2023 20:29:23 +0200
Subject: [PATCH 4/7] (broken) improved sql query but gets parameter error

---
 src/Domain/Movie/MovieRepository.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Domain/Movie/MovieRepository.php b/src/Domain/Movie/MovieRepository.php
index 303fba3e..6ab2e35d 100644
--- a/src/Domain/Movie/MovieRepository.php
+++ b/src/Domain/Movie/MovieRepository.php
@@ -672,16 +672,18 @@ public function fetchUniqueMoviesPaginated(
 
         return $this->dbConnection->fetchAllAssociative(
             <<<SQL
-            SELECT DISTINCT m.*, mur.rating as userRating
-            FROM movie m
-            JOIN movie_user_watch_dates mh on mh.movie_id = m.id and mh.user_id = ?
-            LEFT JOIN movie_user_rating mur ON mh.movie_id = mur.movie_id and mur.user_id = ?
-            LEFT JOIN movie_genre mg on m.id = mg.movie_id
-            LEFT JOIN genre g on mg.genre_id = g.id
-            $whereQuery
-            GROUP BY m.id, title, release_date, watched_at, rating
-            ORDER BY $sortBySanitized $sortOrder, title asc
-            LIMIT $offset, $limit
+            SELECT * FROM (
+                SELECT m.*, mur.rating as userRating, ROW_NUMBER() OVER(PARTITION BY m.id) rn
+                FROM movie m
+                JOIN movie_user_watch_dates mh on mh.movie_id = m.id and mh.user_id = ?
+                LEFT JOIN movie_user_rating mur on mh.movie_id = mur.movie_id and mh.user_id = ?
+                LEFT JOIN movie_genre mg on m.id = mg.movie_id
+                LEFT JOIN genre g on mg.genre_id = g.id
+                GROUP BY m.id, title, release_date, watched_at, rating
+                ORDER BY $sortBySanitized $sortOrder, title asc
+                LIMIT $offset, $limit
+            ) a
+            WHERE rn = 1
             SQL,
             $payload,
         );

From 0eefa9545be36162ad4dab4c87f46a7baab440cd Mon Sep 17 00:00:00 2001
From: Pietro Bonaldo Gregori <pietro.bogre@gmail.com>
Date: Thu, 27 Jul 2023 20:35:15 +0200
Subject: [PATCH 5/7] fix by including

---
 src/Domain/Movie/MovieRepository.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Domain/Movie/MovieRepository.php b/src/Domain/Movie/MovieRepository.php
index 6ab2e35d..8e145b5e 100644
--- a/src/Domain/Movie/MovieRepository.php
+++ b/src/Domain/Movie/MovieRepository.php
@@ -679,6 +679,7 @@ public function fetchUniqueMoviesPaginated(
                 LEFT JOIN movie_user_rating mur on mh.movie_id = mur.movie_id and mh.user_id = ?
                 LEFT JOIN movie_genre mg on m.id = mg.movie_id
                 LEFT JOIN genre g on mg.genre_id = g.id
+                $whereQuery
                 GROUP BY m.id, title, release_date, watched_at, rating
                 ORDER BY $sortBySanitized $sortOrder, title asc
                 LIMIT $offset, $limit

From 914d2c16a7784d0837d78086606e0c606f3f3370 Mon Sep 17 00:00:00 2001
From: Pietro Bonaldo Gregori <pietro.bogre@gmail.com>
Date: Thu, 27 Jul 2023 20:35:15 +0200
Subject: [PATCH 6/7] fix by including $whereQuery

---
 src/Domain/Movie/MovieRepository.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Domain/Movie/MovieRepository.php b/src/Domain/Movie/MovieRepository.php
index 6ab2e35d..8e145b5e 100644
--- a/src/Domain/Movie/MovieRepository.php
+++ b/src/Domain/Movie/MovieRepository.php
@@ -679,6 +679,7 @@ public function fetchUniqueMoviesPaginated(
                 LEFT JOIN movie_user_rating mur on mh.movie_id = mur.movie_id and mh.user_id = ?
                 LEFT JOIN movie_genre mg on m.id = mg.movie_id
                 LEFT JOIN genre g on mg.genre_id = g.id
+                $whereQuery
                 GROUP BY m.id, title, release_date, watched_at, rating
                 ORDER BY $sortBySanitized $sortOrder, title asc
                 LIMIT $offset, $limit

From d1a95d4c133e8ad4109d98868f9ca456a5d9d292 Mon Sep 17 00:00:00 2001
From: Pietro Bonaldo Gregori <pietro.bogre@gmail.com>
Date: Fri, 28 Jul 2023 14:37:00 +0200
Subject: [PATCH 7/7] limit entries outside subquery

---
 src/Domain/Movie/MovieRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Domain/Movie/MovieRepository.php b/src/Domain/Movie/MovieRepository.php
index 8e145b5e..e9df9f8e 100644
--- a/src/Domain/Movie/MovieRepository.php
+++ b/src/Domain/Movie/MovieRepository.php
@@ -682,9 +682,9 @@ public function fetchUniqueMoviesPaginated(
                 $whereQuery
                 GROUP BY m.id, title, release_date, watched_at, rating
                 ORDER BY $sortBySanitized $sortOrder, title asc
-                LIMIT $offset, $limit
             ) a
             WHERE rn = 1
+            LIMIT $offset, $limit
             SQL,
             $payload,
         );