Merge branch 'ZelKami-episode-types'

UweTrottmann · Jun 7, 2024 · 5fa0ae0 · 5fa0ae0
2 parents 568ba5c + b3f906f
commit 5fa0ae0
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 0 deletions.
diff --git a/src/main/java/com/uwetrottmann/tmdb2/TmdbHelper.java b/src/main/java/com/uwetrottmann/tmdb2/TmdbHelper.java
@@ -15,6 +15,7 @@
 import com.uwetrottmann.tmdb2.entities.PersonCrewCredit;
 import com.uwetrottmann.tmdb2.entities.RatingObject;
 import com.uwetrottmann.tmdb2.entities.Trending;
+import com.uwetrottmann.tmdb2.enumerations.EpisodeType;
 import com.uwetrottmann.tmdb2.enumerations.MediaType;
 import com.uwetrottmann.tmdb2.enumerations.Status;
 import com.uwetrottmann.tmdb2.enumerations.VideoType;
@@ -180,6 +181,16 @@ public static GsonBuilder getGsonBuilder() {
                     return trending;
                 });
 
+        builder.registerTypeAdapter(EpisodeType.class,
+                (JsonDeserializer<EpisodeType>) (jsonElement, type, jsonDeserializationContext) -> {
+                    String value = jsonElement.getAsString();
+                    if (value != null) {
+                        return EpisodeType.fromValue(value);
+                    } else {
+                        return null;
+                    }
+                });
+
         return builder;
     }
 

diff --git a/src/main/java/com/uwetrottmann/tmdb2/entities/BaseTvEpisode.java b/src/main/java/com/uwetrottmann/tmdb2/entities/BaseTvEpisode.java
@@ -1,5 +1,6 @@
 package com.uwetrottmann.tmdb2.entities;
 
+import com.uwetrottmann.tmdb2.enumerations.EpisodeType;
 import java.util.Date;
 
 public class BaseTvEpisode extends BaseTvEpisodeRatingObject {
@@ -16,5 +17,6 @@ public class BaseTvEpisode extends BaseTvEpisodeRatingObject {
 
     public Date air_date;
     public Integer episode_number;
+    public EpisodeType episode_type;
 
 }
diff --git a/src/main/java/com/uwetrottmann/tmdb2/enumerations/EpisodeType.java b/src/main/java/com/uwetrottmann/tmdb2/enumerations/EpisodeType.java
@@ -0,0 +1,29 @@
+package com.uwetrottmann.tmdb2.enumerations;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EpisodeType {
+    STANDARD("standard"),
+    MID_SEASON_FINALE("mid_season"),
+    FINALE("finale");
+
+    private final String value;
+
+    EpisodeType(String value) { this.value = value; }
+
+    private static final Map<String, EpisodeType> STRING_MAPPING = new HashMap<>();
+
+    static {
+        for (EpisodeType via : EpisodeType.values()) {
+            STRING_MAPPING.put(via.toString().toUpperCase(), via);
+        }
+    }
+
+    public static EpisodeType fromValue(String value) {
+        return STRING_MAPPING.get(value.toUpperCase());
+    }
+
+    @Override
+    public String toString() { return value; }
+}
diff --git a/src/test/java/com/uwetrottmann/tmdb2/assertions/TvAssertions.java b/src/test/java/com/uwetrottmann/tmdb2/assertions/TvAssertions.java
@@ -148,6 +148,7 @@ public static void assertTvSeason(TvSeason tvSeason) {
         assertThat(tvSeason.episodes).isNotEmpty();
         for (TvEpisode tvEpisode : tvSeason.episodes) {
             assertTvEpisode(tvEpisode);
+            assertThat(tvEpisode.episode_type).isNotNull();
         }
     }