feature/spoiler-flag (#25)

Reviewed-on: #25

crates/adapters/postgres/migrations/0030_review_spoilers.sql

@@ -0,0 +1 @@
+ALTER TABLE reviews ADD COLUMN spoilers BOOLEAN NOT NULL DEFAULT FALSE;

crates/adapters/postgres/src/diary.rs

@@ -56,7 +56,8 @@ impl PostgresDiaryRepository {
                     to_char(r.watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
                     to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     r.remote_actor_url,
-                    r.watch_medium
+                    r.watch_medium,
+                    r.spoilers
              FROM reviews r
              INNER JOIN movies m ON m.id = r.movie_id
              ORDER BY {}
@@ -90,7 +91,8 @@ impl PostgresDiaryRepository {
                     to_char(r.watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
                     to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     r.remote_actor_url,
-                    r.watch_medium
+                    r.watch_medium,
+                    r.spoilers
              FROM reviews r
              INNER JOIN movies m ON m.id = r.movie_id
              WHERE r.movie_id = $1
@@ -178,7 +180,8 @@ impl PostgresDiaryRepository {
                     to_char(r.watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
                     to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     r.remote_actor_url,
-                    r.watch_medium
+                    r.watch_medium,
+                    r.spoilers
              FROM reviews r
              INNER JOIN movies m ON m.id = r.movie_id
              WHERE r.user_id = $1{remote_clause}{search_clause}
@@ -336,6 +339,7 @@ impl DiaryQuery for PostgresDiaryRepository {
                     to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     r.remote_actor_url,
                     r.watch_medium,
+                    r.spoilers,
                     CASE WHEN r.remote_actor_url IS NOT NULL THEN COALESCE(a.handle, r.remote_actor_url)
                          ELSE COALESCE(u.email, r.user_id) END AS user_email
              FROM reviews r
@@ -412,7 +416,8 @@ impl DiaryQuery for PostgresDiaryRepository {
                     to_char(watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
                     to_char(created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     remote_actor_url,
-                    watch_medium
+                    watch_medium,
+                    spoilers
              FROM reviews WHERE movie_id = $1 ORDER BY watched_at ASC",
         )
         .bind(&id_str)
@@ -434,7 +439,8 @@ impl DiaryQuery for PostgresDiaryRepository {
                     to_char(r.watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
                     to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     r.remote_actor_url,
-                    r.watch_medium
+                    r.watch_medium,
+                    r.spoilers
              FROM reviews r
              INNER JOIN movies m ON m.id = r.movie_id
              WHERE r.user_id = $1
@@ -461,7 +467,8 @@ impl DiaryQuery for PostgresDiaryRepository {
                         to_char(r.watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
                         to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                         r.remote_actor_url,
-                        r.watch_medium
+                        r.watch_medium,
+                        r.spoilers
                  FROM reviews r
                  INNER JOIN movies m ON m.id = r.movie_id
                  WHERE r.user_id = $1
@@ -521,6 +528,7 @@ impl DiaryQuery for PostgresDiaryRepository {
                     to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     r.remote_actor_url,
                     r.watch_medium,
+                    r.spoilers,
                     CASE WHEN r.remote_actor_url IS NOT NULL THEN COALESCE(a.handle, r.remote_actor_url)
                          ELSE COALESCE(u.email, r.user_id) END AS user_email
              FROM reviews r

crates/adapters/postgres/src/models.rs

@@ -77,6 +77,7 @@ pub(crate) struct ReviewRow {
     pub created_at: String,
     pub remote_actor_url: Option<String>,
     pub watch_medium: Option<String>,
+    pub spoilers: bool,
 }
 
 impl ReviewRow {
@@ -91,6 +92,7 @@ impl ReviewRow {
             self.created_at,
             self.remote_actor_url,
             self.watch_medium,
+            self.spoilers,
         )
     }
 }
@@ -112,6 +114,7 @@ pub(crate) struct DiaryRow {
     pub created_at: String,
     pub remote_actor_url: Option<String>,
     pub watch_medium: Option<String>,
+    pub spoilers: bool,
 }
 
 impl DiaryRow {
@@ -134,6 +137,7 @@ impl DiaryRow {
             self.created_at,
             self.remote_actor_url,
             self.watch_medium,
+            self.spoilers,
         )?;
         Ok(DiaryEntry::new(movie, review))
     }
@@ -156,6 +160,7 @@ pub(crate) struct FeedRow {
     pub created_at: String,
     pub remote_actor_url: Option<String>,
     pub watch_medium: Option<String>,
+    pub spoilers: bool,
     pub user_email: String,
 }
 
@@ -179,6 +184,7 @@ impl FeedRow {
             self.created_at,
             self.remote_actor_url,
             self.watch_medium,
+            self.spoilers,
         )?;
         let diary = DiaryEntry::new(movie, review);
         Ok(FeedEntry::new(diary, self.user_email))

crates/adapters/postgres/src/review.rs

@@ -36,8 +36,8 @@ impl ReviewRepository for PostgresReviewRepository {
         };
 
         sqlx::query(
-            "INSERT INTO reviews (id, movie_id, user_id, rating, comment, watched_at, created_at, remote_actor_url, watch_medium)
-             VALUES ($1, $2, $3, $4, $5, $6::timestamptz, $7::timestamptz, $8, $9)",
+            "INSERT INTO reviews (id, movie_id, user_id, rating, comment, watched_at, created_at, remote_actor_url, watch_medium, spoilers)
+             VALUES ($1, $2, $3, $4, $5, $6::timestamptz, $7::timestamptz, $8, $9, $10)",
         )
         .bind(&id)
         .bind(&movie_id)
@@ -48,6 +48,7 @@ impl ReviewRepository for PostgresReviewRepository {
         .bind(&created_at)
         .bind(&remote_actor_url)
         .bind(review.watch_medium().map(|wm| wm.to_string()))
+        .bind(review.spoilers())
         .execute(&self.pool)
         .await
         .map_err(adapter_common::map_sqlx_error)?;
@@ -62,7 +63,8 @@ impl ReviewRepository for PostgresReviewRepository {
                     to_char(watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
                     to_char(created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     remote_actor_url,
-                    watch_medium
+                    watch_medium,
+                    spoilers
              FROM reviews WHERE id = $1",
         )
         .bind(&id)
@@ -81,12 +83,13 @@ impl ReviewRepository for PostgresReviewRepository {
         let watch_medium = review.watch_medium().map(|wm| wm.to_string());
 
         sqlx::query(
-            "UPDATE reviews SET rating = $1, comment = $2, watched_at = $3::timestamptz, watch_medium = $4 WHERE id = $5",
+            "UPDATE reviews SET rating = $1, comment = $2, watched_at = $3::timestamptz, watch_medium = $4, spoilers = $5 WHERE id = $6",
         )
         .bind(rating)
         .bind(&comment)
         .bind(&watched_at)
         .bind(&watch_medium)
+        .bind(review.spoilers())
         .bind(&id)
         .execute(&self.pool)
         .await
@@ -112,7 +115,8 @@ impl ReviewRepository for PostgresReviewRepository {
                     to_char(watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
                     to_char(created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
                     remote_actor_url,
-                    watch_medium
+                    watch_medium,
+                    spoilers
              FROM reviews WHERE user_id = $1 ORDER BY watched_at DESC",
         )
         .bind(&uid)