From 3410b0470e551fb5c176b413ce31a0ae586bd4fb Mon Sep 17 00:00:00 2001
From: Jason <jh5975@gmail.com>
Date: Mon, 31 May 2021 21:16:09 +0900
Subject: [PATCH 1/4] Adding genres to recommended movies

---
 .../java/com/jasonhhouse/gaps/BasicMovie.java | 33 ++++++++++++++++---
 .../gaps/service/GapsSearchService.java       | 33 +++++++++++++++++--
 .../main/resources/templates/recommended.html | 13 +++-----
 3 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/Core/src/main/java/com/jasonhhouse/gaps/BasicMovie.java b/Core/src/main/java/com/jasonhhouse/gaps/BasicMovie.java
index e8cc4bc8..bdee30c7 100755
--- a/Core/src/main/java/com/jasonhhouse/gaps/BasicMovie.java
+++ b/Core/src/main/java/com/jasonhhouse/gaps/BasicMovie.java
@@ -51,6 +51,8 @@ public final class BasicMovie implements Comparable<BasicMovie> {
     private String backdropPathUrl;
     @NotNull
     private Integer tmdbId;
+    @NotNull
+    private List<String> genres;
 
     private BasicMovie(@NotNull String name,
                        @NotNull Integer year,
@@ -64,7 +66,8 @@ private BasicMovie(@NotNull String name,
                        @NotNull String overview,
                        @NotNull List<MovieFromCollection> moviesInCollection,
                        @NotNull Integer ratingKey,
-                       @NotNull String key) {
+                       @NotNull String key,
+                       @NotNull List<String> genres) {
         this.name = name;
         this.nameWithoutBadCharacters = name.replaceAll("[<>`~\\[\\]()*&^%$#@!|{}.,?\\-_=+:;]", "");
         this.year = year;
@@ -79,6 +82,7 @@ private BasicMovie(@NotNull String name,
         this.moviesInCollection = moviesInCollection;
         this.ratingKey = ratingKey;
         this.key = key;
+        this.genres = genres;
     }
 
     public @NotNull Integer getCollectionId() {
@@ -137,12 +141,20 @@ public void setTmdbId(@NotNull Integer tmdbId) {
         return moviesInCollection;
     }
 
+    public @NotNull String getBackdropPathUrl() {
+        return backdropPathUrl;
+    }
+
     public void setBackdropPathUrl(@NotNull String backdropPathUrl) {
         this.backdropPathUrl = backdropPathUrl;
     }
 
-    public @NotNull String getBackdropPathUrl() {
-        return backdropPathUrl;
+    public @NotNull List<String> getGenres() {
+        return genres;
+    }
+
+    public void setGenres(@NotNull List<String> genres) {
+        this.genres = genres;
     }
 
     @JsonIgnore
@@ -198,7 +210,6 @@ public String toString() {
                 ", year=" + year +
                 ", nameWithoutBadCharacters='" + nameWithoutBadCharacters + '\'' +
                 ", posterUrl='" + posterUrl + '\'' +
-                ", backdropPathUrl='" + backdropPathUrl + '\'' +
                 ", language='" + language + '\'' +
                 ", overview='" + overview + '\'' +
                 ", moviesInCollection=" + moviesInCollection +
@@ -207,7 +218,9 @@ public String toString() {
                 ", imdbId='" + imdbId + '\'' +
                 ", collectionTitle='" + collectionTitle + '\'' +
                 ", collectionId=" + collectionId +
+                ", backdropPathUrl='" + backdropPathUrl + '\'' +
                 ", tmdbId=" + tmdbId +
+                ", genres=" + genres +
                 '}';
     }
 
@@ -268,6 +281,10 @@ public static class Builder {
         @JsonProperty
         private String key;
 
+        @NotNull
+        @JsonProperty
+        private List<String> genres;
+
         @JsonCreator
         public Builder(@JsonProperty(value = "name") @NotNull String name,
                        @JsonProperty(value = "year") @NotNull Integer year) {
@@ -284,10 +301,11 @@ public Builder(@JsonProperty(value = "name") @NotNull String name,
             this.moviesInCollection = new ArrayList<>();
             this.ratingKey = -1;
             this.key = "";
+            this.genres = new ArrayList<>();
         }
 
         public @NotNull BasicMovie build() {
-            return new BasicMovie(name, year, posterUrl, backdropPathUrl, collectionTitle, collectionId, tmdbId, imdbId, language, overview, moviesInCollection, ratingKey, key);
+            return new BasicMovie(name, year, posterUrl, backdropPathUrl, collectionTitle, collectionId, tmdbId, imdbId, language, overview, moviesInCollection, ratingKey, key, genres);
         }
 
         public @NotNull Builder setPosterUrl(@NotNull String posterUrl) {
@@ -344,5 +362,10 @@ public Builder(@JsonProperty(value = "name") @NotNull String name,
             this.key = key;
             return this;
         }
+
+        public @NotNull Builder setGenres(@NotNull List<String> genres) {
+            this.genres = genres;
+            return this;
+        }
     }
 }
diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
index 8325b406..14e3b0e2 100755
--- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
+++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
@@ -39,6 +39,7 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
@@ -71,6 +72,7 @@ public class GapsSearchService implements GapsSearch {
 
     public static final String COLLECTION_ID = "belongs_to_collection";
     public static final String BACKDROP_PATH = "backdrop_path";
+    public static final String GENRES = "genres";
     public static final String TITLE = "title";
     public static final String NAME = "name";
     public static final String ID = "id";
@@ -78,6 +80,7 @@ public class GapsSearchService implements GapsSearch {
     public static final String PARTS = "parts";
     public static final String MOVIE_RESULTS = "movie_results";
     public static final String FINISHED_SEARCHING_URL = "/finishedSearching";
+    private static final String languageCode = "en-US";
     private static final Logger LOGGER = LoggerFactory.getLogger(GapsSearchService.class);
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
@@ -95,8 +98,10 @@ public class GapsSearchService implements GapsSearch {
 
     private final NotificationService notificationService;
 
+
     @Autowired
-    public GapsSearchService(@Qualifier("real") UrlGenerator urlGenerator, SimpMessagingTemplate template, FileIoService fileIoService, TmdbService tmdbService, NotificationService notificationService) {
+    public GapsSearchService(@Qualifier("real") UrlGenerator urlGenerator,
+                             SimpMessagingTemplate template, FileIoService fileIoService, TmdbService tmdbService, NotificationService notificationService) {
         this.template = template;
         this.tmdbService = tmdbService;
         this.urlGenerator = urlGenerator;
@@ -108,7 +113,7 @@ public GapsSearchService(@Qualifier("real") UrlGenerator urlGenerator, SimpMessa
     }
 
     @Override
-    public void run(@NotNull String machineIdentifier,@NotNull  Integer key) {
+    public void run(@NotNull String machineIdentifier, @NotNull Integer key) {
         LOGGER.info("run( {}, {} )", machineIdentifier, key);
 
         PlexProperties plexProperties = fileIoService.readProperties();
@@ -228,7 +233,6 @@ private void searchForMovies(PlexProperties plexProperties, String machineIdenti
         }
 
         for (BasicMovie basicMovie : ownedBasicMovies) {
-            String languageCode = "en-US";
 
             //Cancel search if needed
             if (cancelSearch.get()) {
@@ -397,6 +401,9 @@ private void searchMovieDetails(PlexProperties plexProperties, String machineIde
             basicMovie.setCollectionTitle(collectionName);
             basicMovie.setBackdropPathUrl(backdropPath);
 
+            List<String> genres = getGenres(movieDetails);
+            basicMovie.setGenres(genres);
+
             int indexOfMovie = everyBasicMovie.indexOf(basicMovie);
             if (indexOfMovie != -1) {
                 LOGGER.info("Merging movie data");
@@ -404,6 +411,7 @@ private void searchMovieDetails(PlexProperties plexProperties, String machineIde
                 everyBasicMovie.get(indexOfMovie).setCollectionId(basicMovie.getCollectionId());
                 everyBasicMovie.get(indexOfMovie).setCollectionTitle(basicMovie.getCollectionTitle());
                 everyBasicMovie.get(indexOfMovie).setBackdropPathUrl(basicMovie.getBackdropPathUrl());
+                everyBasicMovie.get(indexOfMovie).setGenres(genres);
             } else {
                 BasicMovie newBasicMovie = new BasicMovie.Builder(basicMovie.getName(), basicMovie.getYear())
                         .setTmdbId(basicMovie.getTmdbId())
@@ -411,6 +419,7 @@ private void searchMovieDetails(PlexProperties plexProperties, String machineIde
                         .setCollectionTitle(basicMovie.getCollectionTitle())
                         .setCollectionId(basicMovie.getCollectionId())
                         .setBackdropPathUrl(basicMovie.getBackdropPathUrl())
+                        .setGenres(basicMovie.getGenres())
                         .build();
                 everyBasicMovie.add(newBasicMovie);
             }
@@ -422,6 +431,19 @@ private void searchMovieDetails(PlexProperties plexProperties, String machineIde
         }
     }
 
+    private @NotNull List<String> getGenres(@NotNull JsonNode movieDetails) {
+        List<String> genres = new ArrayList<>();
+
+        Iterator<JsonNode> jsonNodeIterator = movieDetails.get(GENRES).elements();
+
+        while (jsonNodeIterator.hasNext()) {
+            JsonNode genre = jsonNodeIterator.next();
+            genres.add(genre.get(NAME).textValue());
+        }
+
+        return genres;
+    }
+
     private void handleCollection(PlexProperties plexProperties, String machineIdentifier, Integer key, List<BasicMovie> ownedBasicMovies, List<BasicMovie> everyBasicMovie, Set<BasicMovie> recommended, List<BasicMovie> searched,
                                   AtomicInteger searchedMovieCount, BasicMovie basicMovie, OkHttpClient client, String languageCode) {
         LOGGER.debug("handleCollection()");
@@ -506,6 +528,7 @@ private void handleCollection(PlexProperties plexProperties, String machineIdent
                         .setOverview(basicMovie.getOverview())
                         .setPosterUrl(basicMovie.getPosterUrl())
                         .setBackdropPathUrl(basicMovie.getBackdropPathUrl())
+                        .setGenres(basicMovie.getGenres())
                         .build();
                 everyBasicMovie.add(newBasicMovie);
 
@@ -547,6 +570,7 @@ private void handleCollection(PlexProperties plexProperties, String machineIdent
                         .setPosterUrl(posterUrl)
                         .setMoviesInCollection(moviesInCollection)
                         .setBackdropPathUrl(basicMovie.getBackdropPathUrl())
+                        .setGenres(basicMovie.getGenres())
                         .build();
 
                 if (ownedBasicMovies.contains(basicMovieFromCollection)) {
@@ -608,6 +632,8 @@ private void handleCollection(PlexProperties plexProperties, String machineIdent
                             basicMovieFromCollection.setCollectionTitle(collection.get(NAME).textValue());
                         }
 
+                        List<String> genres = getGenres(movieDet);
+
                         // Add movie with imbd_id and other details for RSS to recommended list
                         BasicMovie recommendedBasicMovie = new BasicMovie.Builder(movieDet.get(TITLE).textValue(), year)
                                 .setTmdbId(movieDet.get(ID).intValue())
@@ -618,6 +644,7 @@ private void handleCollection(PlexProperties plexProperties, String machineIdent
                                 .setBackdropPathUrl("https://image.tmdb.org/t/p/original/" + movieDet.get(COLLECTION_ID).get(BACKDROP_PATH).textValue())
                                 .setOverview(movieDet.get("overview").textValue())
                                 .setMoviesInCollection(moviesInCollection)
+                                .setGenres(genres)
                                 .build();
 
                         if (ownedBasicMovies.contains(recommendedBasicMovie)) {
diff --git a/GapsWeb/src/main/resources/templates/recommended.html b/GapsWeb/src/main/resources/templates/recommended.html
index 3fd38fbb..52deedaa 100755
--- a/GapsWeb/src/main/resources/templates/recommended.html
+++ b/GapsWeb/src/main/resources/templates/recommended.html
@@ -137,7 +137,11 @@ <h2 class="top-margin" id="searchTitle">Searching for Movies</h2>
                         <h5 class="card-title">{{name}} ({{year}})</h5>
                         <h6 class="card-title">{{collectionTitle}}</h6>
                         <p class="card-text">{{overview}}</p>
-                        <p class="card-text"><small class="text-info">English</small></p>
+                        <p class="card-text">
+                            {{#each genres}}
+                            <small class="text-info">{{this}}</small>
+                            {{/each}}
+                        </p>
                     </div>
                 </div>
             </div>
@@ -148,17 +152,10 @@ <h5 class="card-title">Owned</h5>
                 <div class="list-group">
                     {{#each moviesInCollection}}
                         {{#if this.owned}}
-                            {{#if (isEqual this.tmdbId @root.tmdbId)}}
-                            <a data-cy="{{@root.imdbId}}-{{this.tmdbId}}"
-                               href="https://www.themoviedb.org/movie/{{this.tmdbId}}" target="_blank"
-                               class="list-group-item list-group-item-action active"
-                               rel="noopener noreferrer">{{this.title}}</a>
-                            {{else}}
                             <a data-cy="{{@root.imdbId}}-{{this.tmdbId}}"
                                href="https://www.themoviedb.org/movie/{{this.tmdbId}}" target="_blank"
                                class="list-group-item list-group-item-action"
                                rel="noopener noreferrer">{{this.title}}</a>
-                            {{/if}}
                         {{/if}}
                     {{/each}}
                 </div>

From 7d928a31effd500b897d15b7c663ed89b8c5fb62 Mon Sep 17 00:00:00 2001
From: Jason <jh5975@gmail.com>
Date: Mon, 31 May 2021 21:59:22 +0900
Subject: [PATCH 2/4] Adding genre to both libraries and recommended

---
 .../gaps/service/GapsSearchService.java       |  1 +
 .../gaps/service/PlexQueryImpl.java           | 34 ++++++++++++++-----
 .../main/resources/templates/libraries.html   |  4 ++-
 .../main/resources/templates/recommended.html |  6 ++--
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
index 14e3b0e2..684ac14a 100755
--- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
+++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
@@ -36,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashSet;
diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java
index cefc50ca..22fe72c7 100755
--- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java
+++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java
@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -268,7 +269,7 @@ public PlexQueryImpl(@Qualifier("real") UrlGenerator urlGenerator) {
     public void findAllMovieIds(@NotNull List<BasicMovie> basicMovies, @NotNull PlexServer plexServer, @NotNull PlexLibrary plexLibrary) {
         LOGGER.info("findAllMovieIds( {}, {} )", plexServer, plexLibrary);
 
-        if(plexLibrary.getScanner().equals("Plex Movie Scanner")) {
+        if (plexLibrary.getScanner().equals("Plex Movie Scanner")) {
             LOGGER.info("PlexLibrary {} uses old scanner", plexLibrary.getTitle());
             return;
         }
@@ -348,10 +349,10 @@ public void findAllMovieIds(@NotNull List<BasicMovie> basicMovies, @NotNull Plex
     }
 
     @Override
-    public @NotNull PlexServer getPlexServerFromMachineIdentifier(@NotNull PlexProperties plexProperties, @NotNull String machineIdentifier) throws IllegalArgumentException{
+    public @NotNull PlexServer getPlexServerFromMachineIdentifier(@NotNull PlexProperties plexProperties, @NotNull String machineIdentifier) throws IllegalArgumentException {
         LOGGER.info("generatePlexUrl( {} )", machineIdentifier);
-        for(PlexServer plexServer : plexProperties.getPlexServers()) {
-            if(plexServer.getMachineIdentifier().equals(machineIdentifier)) {
+        for (PlexServer plexServer : plexProperties.getPlexServers()) {
+            if (plexServer.getMachineIdentifier().equals(machineIdentifier)) {
                 return plexServer;
             }
         }
@@ -360,9 +361,9 @@ public void findAllMovieIds(@NotNull List<BasicMovie> basicMovies, @NotNull Plex
     }
 
     @Override
-    public @NotNull PlexLibrary getPlexLibraryFromKey(@NotNull PlexServer plexServer,@NotNull Integer key) throws IllegalArgumentException {
-        for(PlexLibrary plexLibrary : plexServer.getPlexLibraries()) {
-            if(plexLibrary.getKey().equals(key)) {
+    public @NotNull PlexLibrary getPlexLibraryFromKey(@NotNull PlexServer plexServer, @NotNull Integer key) throws IllegalArgumentException {
+        for (PlexLibrary plexLibrary : plexServer.getPlexLibraries()) {
+            if (plexLibrary.getKey().equals(key)) {
                 return plexLibrary;
             }
         }
@@ -460,7 +461,17 @@ public void findAllMovieIds(@NotNull List<BasicMovie> basicMovies, @NotNull Plex
                         ratingKey = Integer.valueOf(node.getAttributes().getNamedItem("ratingKey").getNodeValue());
                     }
 
-                    BasicMovie basicMovie = getOrCreateOwnedMovie(previousMovies, title, year, tmdbId, imdbId, thumbnail, summary, ratingKey, key);
+                    List<String> genres = new ArrayList<>();
+                    if (node.hasChildNodes()) {
+                        for (int j = 0; j < node.getChildNodes().getLength(); j++) {
+                            Node childNode = node.getChildNodes().item(j);
+                            if (childNode.getNodeName().equalsIgnoreCase("genre")) {
+                                genres.add(childNode.getAttributes().getNamedItem("tag").getNodeValue());
+                            }
+                        }
+                    }
+
+                    BasicMovie basicMovie = getOrCreateOwnedMovie(previousMovies, title, year, tmdbId, imdbId, thumbnail, summary, ratingKey, key, genres);
                     ownedBasicMovies.add(basicMovie);
                 }
                 LOGGER.info("{} movies found in plex", ownedBasicMovies.size());
@@ -483,7 +494,10 @@ public void findAllMovieIds(@NotNull List<BasicMovie> basicMovies, @NotNull Plex
         return ownedBasicMovies;
     }
 
-    private BasicMovie getOrCreateOwnedMovie(Map<Pair<String, Integer>, BasicMovie> previousMovies, @NotNull String title, int year, @NotNull Integer tmdbId, @NotNull String imdbId, @NotNull String thumbnail, @NotNull String summary, @NotNull Integer ratingKey, @NotNull String key) {
+    private BasicMovie getOrCreateOwnedMovie(Map<Pair<String, Integer>, BasicMovie> previousMovies, @NotNull String title, int year,
+                                             @NotNull Integer tmdbId, @NotNull String imdbId, @NotNull String thumbnail,
+                                             @NotNull String summary, @NotNull Integer ratingKey, @NotNull String key,
+                                             @NotNull List<String> genres) {
         Pair<String, Integer> moviePair = new Pair<>(title, year);
         if (previousMovies.containsKey(moviePair)) {
             BasicMovie previousBasicMovie = previousMovies.get(moviePair);
@@ -497,6 +511,7 @@ private BasicMovie getOrCreateOwnedMovie(Map<Pair<String, Integer>, BasicMovie>
                     .setLanguage(previousBasicMovie.getLanguage())
                     .setTmdbId(previousBasicMovie.getTmdbId())
                     .setCollectionId(previousBasicMovie.getCollectionId())
+                    .setGenres(genres)
                     .build();
         } else {
             return new BasicMovie.Builder(title, year)
@@ -506,6 +521,7 @@ private BasicMovie getOrCreateOwnedMovie(Map<Pair<String, Integer>, BasicMovie>
                     .setRatingKey(ratingKey)
                     .setTmdbId(tmdbId)
                     .setImdbId(imdbId)
+                    .setGenres(genres)
                     .build();
         }
     }
diff --git a/GapsWeb/src/main/resources/templates/libraries.html b/GapsWeb/src/main/resources/templates/libraries.html
index 5b0bc0ec..b06aa399 100755
--- a/GapsWeb/src/main/resources/templates/libraries.html
+++ b/GapsWeb/src/main/resources/templates/libraries.html
@@ -122,7 +122,9 @@ <h5 class="card-title">Your movies are really missing</h5>
                 <div class="card-body">
                     <h5 class="card-title">{{name}} ({{year}})</h5>
                     <p class="card-text text-muted">{{overview}}</p>
-                    <p class="card-text"><small class="text-info">English</small></p>
+                    {{#each genres}}
+                    <div class="card-text">{{this}}</div>
+                    {{/each}}
                 </div>
             </div>
         </div>
diff --git a/GapsWeb/src/main/resources/templates/recommended.html b/GapsWeb/src/main/resources/templates/recommended.html
index 52deedaa..6860180d 100755
--- a/GapsWeb/src/main/resources/templates/recommended.html
+++ b/GapsWeb/src/main/resources/templates/recommended.html
@@ -137,11 +137,11 @@ <h2 class="top-margin" id="searchTitle">Searching for Movies</h2>
                         <h5 class="card-title">{{name}} ({{year}})</h5>
                         <h6 class="card-title">{{collectionTitle}}</h6>
                         <p class="card-text">{{overview}}</p>
-                        <p class="card-text">
+                        <div>
                             {{#each genres}}
-                            <small class="text-info">{{this}}</small>
+                            <div class="card-text">{{this}}</div>
                             {{/each}}
-                        </p>
+                        </div>
                     </div>
                 </div>
             </div>

From 21e4b51336b129fbc9c6d63e85e2f164513ea5c5 Mon Sep 17 00:00:00 2001
From: Jason <jh5975@gmail.com>
Date: Tue, 1 Jun 2021 10:33:00 +0900
Subject: [PATCH 3/4] Adding E2E tests

---
 .../main/resources/templates/libraries.html   |  4 ++--
 .../main/resources/templates/recommended.html |  5 +++--
 .../libraries/searchOwnedMovies.spec.js       | 18 +++++++++++++++
 .../searchRecommendedMovies.spec.js           | 22 ++++++++++++++++++-
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/GapsWeb/src/main/resources/templates/libraries.html b/GapsWeb/src/main/resources/templates/libraries.html
index b06aa399..d7dd0fd0 100755
--- a/GapsWeb/src/main/resources/templates/libraries.html
+++ b/GapsWeb/src/main/resources/templates/libraries.html
@@ -114,7 +114,7 @@ <h5 class="card-title">Your movies are really missing</h5>
     <div class="card">
         <div class="row no-gutters">
             <div class="col-12 col-md-auto">
-                <img loading="lazy" data-cy="{{imdbId}}" style="height: auto; width: 225px; display: block;"
+                <img loading="lazy" style="height: auto; width: 225px; display: block;"
                      src="http://{{address}}:{{port}}{{posterUrl}}/?X-Plex-Token={{plexToken}}"
                      class="card-img" alt="Plex Poster">
             </div>
@@ -123,7 +123,7 @@ <h5 class="card-title">Your movies are really missing</h5>
                     <h5 class="card-title">{{name}} ({{year}})</h5>
                     <p class="card-text text-muted">{{overview}}</p>
                     {{#each genres}}
-                    <div class="card-text">{{this}}</div>
+                    <div data-cy="{{this.tmdbId}}{{this}}" class="card-text">{{this}}</div>
                     {{/each}}
                 </div>
             </div>
diff --git a/GapsWeb/src/main/resources/templates/recommended.html b/GapsWeb/src/main/resources/templates/recommended.html
index 6860180d..8e88e045 100755
--- a/GapsWeb/src/main/resources/templates/recommended.html
+++ b/GapsWeb/src/main/resources/templates/recommended.html
@@ -123,12 +123,13 @@ <h2 class="top-margin" id="searchTitle">Searching for Movies</h2>
 <script id="movieCard" type="text/x-handlebars-template">
     <div class="card">
         <img loading="lazy" style="height: 450px;width: auto;display: block;filter: brightness(0.20);"
+             data-cy="backdropPath-{{imdbId}}"
              src="{{backdropPathUrl}}" class="card-img" alt="Backdrop Poster">
         <div class="card-img-overlay">
             <div class="row no-gutters">
                 <div class="col-12 col-md-auto">
                     <img loading="lazy" style="height: auto; width: 225px; display: block;"
-                         data-cy="{{imdbId}}"
+                         data-cy="posterUrl-{{imdbId}}"
                          src="{{posterUrl}}"
                          class="card-img" alt="Plex Poster">
                 </div>
@@ -139,7 +140,7 @@ <h6 class="card-title">{{collectionTitle}}</h6>
                         <p class="card-text">{{overview}}</p>
                         <div>
                             {{#each genres}}
-                            <div class="card-text">{{this}}</div>
+                            <div data-cy="{{this.tmdbId}}{{this}}" class="card-text">{{this}}</div>
                             {{/each}}
                         </div>
                     </div>
diff --git a/cypress/integration/libraries/searchOwnedMovies.spec.js b/cypress/integration/libraries/searchOwnedMovies.spec.js
index 61269fe2..042097cd 100755
--- a/cypress/integration/libraries/searchOwnedMovies.spec.js
+++ b/cypress/integration/libraries/searchOwnedMovies.spec.js
@@ -35,6 +35,12 @@ describe('Find owned movies', () => {
       .clear()
       .type('Saw');
 
+    cy.get('[data-cy=Horror]')
+      .should('have.text', 'Horror');
+
+    cy.get('[data-cy=Crime]')
+      .should('have.text', 'Crime');
+
     cy.get('#movies_info')
       .should('have.text', 'Showing 1 to 1 of 1 entries');
   });
@@ -58,6 +64,12 @@ describe('Find owned movies', () => {
       .clear()
       .type('Saw');
 
+    cy.get('[data-cy=Horror]')
+      .should('have.text', 'Horror');
+
+    cy.get('[data-cy=Crime]')
+      .should('have.text', 'Crime');
+
     cy.get('#movies_info')
       .should('have.text', 'Showing 1 to 1 of 1 entries');
 
@@ -82,6 +94,12 @@ describe('Find owned movies', () => {
       .clear()
       .type('Saw');
 
+    cy.get('[data-cy=Horror]')
+      .should('have.text', 'Horror');
+
+    cy.get('[data-cy=Crime]')
+      .should('have.text', 'Crime');
+
     cy.get('#movies_info')
       .should('have.text', 'Showing 1 to 1 of 1 entries');
 
diff --git a/cypress/integration/recommended/searchRecommendedMovies.spec.js b/cypress/integration/recommended/searchRecommendedMovies.spec.js
index cdb9d0b7..9e3ea10d 100755
--- a/cypress/integration/recommended/searchRecommendedMovies.spec.js
+++ b/cypress/integration/recommended/searchRecommendedMovies.spec.js
@@ -8,7 +8,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* global cy, describe, it, beforeEach */
+/* global cy, describe, expect, it, beforeEach */
 /* eslint no-undef: "error" */
 
 import {
@@ -31,6 +31,12 @@ function searchSawLibrary(cy) {
     .clear()
     .type('Saw');
 
+  cy.get('[data-cy=Horror]')
+    .should('have.text', 'Horror');
+
+  cy.get('[data-cy=Crime]')
+    .should('have.text', 'Crime');
+
   cy.get('#movies_info')
     .should('have.text', 'Showing 1 to 1 of 1 entries');
 
@@ -70,6 +76,20 @@ describe('Search for Recommended', () => {
 
     cy.get('[data-cy=searchForMovies]')
       .click();
+    
+    cy.get('[data-cy="backdropPath-tt0432348"]')
+      .should('be.visible')
+      .and(($img) => {
+        // "naturalWidth" and "naturalHeight" are set when the image loads
+        expect($img[0].naturalWidth).to.be.greaterThan(0);
+      });
+
+    cy.get('[data-cy=posterUrl-tt0432348]')
+      .should('be.visible')
+      .and(($img) => {
+        // "naturalWidth" and "naturalHeight" are set when the image loads
+        expect($img[0].naturalWidth).to.be.greaterThan(0);
+      });
 
     cy.scrollTo(0, 1000);
 

From 9ae174e0f2854432bbc77ea753d2bec75edbbac5 Mon Sep 17 00:00:00 2001
From: Jason <jh5975@gmail.com>
Date: Tue, 1 Jun 2021 10:41:22 +0900
Subject: [PATCH 4/4] 0.9.4

---
 Core/pom.xml                                                 | 2 +-
 Dockerfile                                                   | 2 +-
 Dockerfile.arm64                                             | 2 +-
 Dockerfile.ppc64le                                           | 2 +-
 Dockerfile.raspbian                                          | 2 +-
 Dockerfile.riscv64                                           | 2 +-
 GapsAsJar/gaps.nsi                                           | 2 +-
 GapsWeb/pom.xml                                              | 2 +-
 GapsWeb/src/main/resources/application.yaml                  | 2 +-
 GapsWeb/src/main/resources/templates/about.html              | 2 +-
 GapsWeb/src/main/resources/templates/index.html              | 2 +-
 GapsWeb/src/main/resources/templates/updates.html            | 5 +++++
 Plex/pom.xml                                                 | 2 +-
 RadarrV3/pom.xml                                             | 2 +-
 application-custom.yml                                       | 2 +-
 build                                                        | 2 +-
 build.bat                                                    | 2 +-
 cypress/integration/about/about.spec.js                      | 2 +-
 .../integration/recommended/searchRecommendedMovies.spec.js  | 2 +-
 package-lock.json                                            | 2 +-
 package.json                                                 | 2 +-
 pom.xml                                                      | 4 ++--
 22 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/Core/pom.xml b/Core/pom.xml
index 5916eb62..10d210fb 100755
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Dockerfile b/Dockerfile
index 998ddbfb..a588bbe8 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.3.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.4.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 9986f4a4..e53a7820 100755
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.3.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.4.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
index b44c5883..6c7db07c 100755
--- a/Dockerfile.ppc64le
+++ b/Dockerfile.ppc64le
@@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.3.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.4.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian
index e0e6fc8b..396d7b1d 100755
--- a/Dockerfile.raspbian
+++ b/Dockerfile.raspbian
@@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.3.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.4.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64
index 8c6cfd0f..f203d7b4 100755
--- a/Dockerfile.riscv64
+++ b/Dockerfile.riscv64
@@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.3.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.4.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
diff --git a/GapsAsJar/gaps.nsi b/GapsAsJar/gaps.nsi
index 84ddce6a..21181449 100644
--- a/GapsAsJar/gaps.nsi
+++ b/GapsAsJar/gaps.nsi
@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
 SectionEnd
 
 # name the installer
-OutFile "gaps-0.9.3-installer.exe"
\ No newline at end of file
+OutFile "gaps-0.9.4-installer.exe"
\ No newline at end of file
diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml
index dd0e2f2a..8b2a46c5 100755
--- a/GapsWeb/pom.xml
+++ b/GapsWeb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml
index af465855..58be7927 100755
--- a/GapsWeb/src/main/resources/application.yaml
+++ b/GapsWeb/src/main/resources/application.yaml
@@ -50,7 +50,7 @@ info:
   app:
     name: Gaps
     description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
-    version: 0.9.3
+    version: 0.9.4
     storageFolder: /usr/data
     properties:
       rssFeed: rssFeed.json
diff --git a/GapsWeb/src/main/resources/templates/about.html b/GapsWeb/src/main/resources/templates/about.html
index eb7780a1..c482d1e1 100755
--- a/GapsWeb/src/main/resources/templates/about.html
+++ b/GapsWeb/src/main/resources/templates/about.html
@@ -29,7 +29,7 @@
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">About</h3>
-    <h4 class="top-margin text-primary">v0.9.3</h4>
+    <h4 class="top-margin text-primary">v0.9.4</h4>
 
     <p class="text-muted">Gaps searches through your Plex Server. It then queries
         for known
diff --git a/GapsWeb/src/main/resources/templates/index.html b/GapsWeb/src/main/resources/templates/index.html
index 8c39848e..3b25989c 100755
--- a/GapsWeb/src/main/resources/templates/index.html
+++ b/GapsWeb/src/main/resources/templates/index.html
@@ -27,7 +27,7 @@
 <div class="container bottom-margin">
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
-    <h3 class="top-margin">v0.9.3</h3>
+    <h3 class="top-margin">v0.9.4</h3>
 
     <p class="text-muted">Gaps searches through your Plex Server. It then queries
         for known
diff --git a/GapsWeb/src/main/resources/templates/updates.html b/GapsWeb/src/main/resources/templates/updates.html
index 97300412..1c0ea6c9 100755
--- a/GapsWeb/src/main/resources/templates/updates.html
+++ b/GapsWeb/src/main/resources/templates/updates.html
@@ -28,6 +28,11 @@
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">Updates</h3>
+    <h4 class="top-margin text-primary">v0.9.4</h4>
+    <ul class="text-muted">
+        <li>Adding genres to owned and recommended movies</li>
+    </ul>
+
     <h4 class="top-margin text-primary">v0.9.3</h4>
     <ul class="text-muted">
         <li>Improved UI for recommended movies</li>
diff --git a/Plex/pom.xml b/Plex/pom.xml
index 85c429e0..1cd36cab 100755
--- a/Plex/pom.xml
+++ b/Plex/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml
index d52432ce..a1be1086 100755
--- a/RadarrV3/pom.xml
+++ b/RadarrV3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/application-custom.yml b/application-custom.yml
index 1e5188af..b3045ae6 100644
--- a/application-custom.yml
+++ b/application-custom.yml
@@ -44,7 +44,7 @@ info:
   app:
     name: Gaps
     description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
-    version: 0.9.3
+    version: 0.9.4
     storageFolder: /{CUSTOM_FOLDER} #Change to folder that gaps has permission to read, write, and delete in.
     properties:
       rssFeed: rssFeed.json
diff --git a/build b/build
index d978a71b..ee9e0d79 100755
--- a/build
+++ b/build
@@ -11,7 +11,7 @@
 ##
 
 set -e
-VERSION=0.9.3
+VERSION=0.9.4
 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
 ZIP_VERSION="GapsAsJar-$VERSION.zip"
 npm ci
diff --git a/build.bat b/build.bat
index 6a2cbc98..52bdd6e2 100644
--- a/build.bat
+++ b/build.bat
@@ -7,7 +7,7 @@ call npm run uglifyjs-pages
 call mvn clean install
 del GapsOnWindows\*.jar
 del GapsOnWindows\README.md
-copy GapsWeb\target\GapsWeb-0.9.3.jar GapsOnWindows\gaps.jar
+copy GapsWeb\target\GapsWeb-0.9.4.jar GapsOnWindows\gaps.jar
 copy README.md GapsOnWindows\
 cd GapsOnWindows
 makensis gaps.nsi
\ No newline at end of file
diff --git a/cypress/integration/about/about.spec.js b/cypress/integration/about/about.spec.js
index a6221ada..32f91166 100644
--- a/cypress/integration/about/about.spec.js
+++ b/cypress/integration/about/about.spec.js
@@ -21,7 +21,7 @@ describe('Verify About Page', () => {
       .should('have.text', 'About');
 
     cy.get('.container > :nth-child(3)')
-      .should('have.text', 'v0.9.3');
+      .should('have.text', 'v0.9.4');
 
     cy.get('.container > :nth-child(6)')
       .should('have.text', 'Software');
diff --git a/cypress/integration/recommended/searchRecommendedMovies.spec.js b/cypress/integration/recommended/searchRecommendedMovies.spec.js
index 9e3ea10d..e59e6eba 100755
--- a/cypress/integration/recommended/searchRecommendedMovies.spec.js
+++ b/cypress/integration/recommended/searchRecommendedMovies.spec.js
@@ -76,7 +76,7 @@ describe('Search for Recommended', () => {
 
     cy.get('[data-cy=searchForMovies]')
       .click();
-    
+
     cy.get('[data-cy="backdropPath-tt0432348"]')
       .should('be.visible')
       .and(($img) => {
diff --git a/package-lock.json b/package-lock.json
index 06a602c4..417d0c9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "gaps",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 145c78fc..a9528c47 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gaps",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.",
   "main": "/",
   "dependencies": {
diff --git a/pom.xml b/pom.xml
index 40489958..2d4497e8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>com.jasonhhouse</groupId>
     <artifactId>Gaps</artifactId>
-    <version>0.9.3</version>
+    <version>0.9.4</version>
     <name>Gaps</name>
     <description>Demo project for Spring Boot</description>
 
@@ -26,7 +26,7 @@
         <apache.commons.lang3>3.9</apache.commons.lang3>
         <apache.commons.text>1.9</apache.commons.text>
         <commons.io>2.8.0</commons.io>
-        <gaps.version>0.9.3</gaps.version>
+        <gaps.version>0.9.4</gaps.version>
         <google.findbugs>3.0.0</google.findbugs>
         <guava>30.1-jre</guava>
         <hibernate.core>5.2.12.Final</hibernate.core>