Refactor data structures for improved clarity and consistency (#73)

- Updated GenreMovieList to use a dedicated Genre type for better structure.
- Upgraded Go version in go.mod to 1.24 and updated dependencies, including testify to v1.10.0.
- Removed redundant fields from GuestSessionRatedMovies, GuestSessionRatedTVShows, and GuestSessionRatedTVEpisodes, replacing them with PaginatedResultsMeta.
- Simplified KeywordMovies by using PaginatedResultsMeta instead of individual pagination fields.
- Refactored MovieDetails to utilize structured types for genres, production companies, and spoken languages.
- Introduced new types for MovieResult and TVShowResult to streamline search and discovery results.
- Consolidated translation structures across various types for consistency.
- Enhanced TVDetails structure with specific types for created by, last and next episodes, and networks.
- Updated all search and trending response types to use PaginatedResultsMeta for pagination.
- Added a new types.go file to centralize common data structures used across the application.

Author: cyruzin

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.16"
+          go-version: "1.24"
       - name: Check out code
         uses: actions/checkout@v2
       - name: Install dependencies

account.go

@@ -42,10 +42,8 @@ func (c *Client) GetAccountDetails() (*AccountDetails, error) {
 
 // AccountCreatedLists type is a struct for created lists JSON response.
 type AccountCreatedLists struct {
-	Page int64 `json:"page"`
 	*AccountCreatedListsResults
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetCreatedLists get all of the lists created by an account.
@@ -75,10 +73,8 @@ func (c *Client) GetCreatedLists(
 
 // AccountFavoriteMovies type is a struct for favorite movies JSON response.
 type AccountFavoriteMovies struct {
-	Page int64 `json:"page"`
 	*AccountFavoriteMoviesResults
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetFavoriteMovies get the list of your favorite movies.
@@ -107,10 +103,8 @@ func (c *Client) GetFavoriteMovies(
 
 // AccountFavoriteTVShows type is a struct for favorite tv shows JSON response.
 type AccountFavoriteTVShows struct {
-	Page int64 `json:"page"`
 	*AccountFavoriteTVShowsResults
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetFavoriteTVShows get the list of your favorite TV shows.
@@ -233,10 +227,8 @@ func (c *Client) GetRatedTVShows(
 
 // AccountRatedTVEpisodes type is a struct for rated TV episodes JSON response.
 type AccountRatedTVEpisodes struct {
-	Page int64 `json:"page"`
 	*AccountRatedTVEpisodesResults
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetRatedTVEpisodes get a list of all the TV episodes you have rated.

changes.go

@@ -5,9 +5,7 @@ import "fmt"
 // ChangesMovie type is a struct for movie changes JSON response.
 type ChangesMovie struct {
 	*ChangesMovieResults
-	Page         int64 `json:"page"`
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetChangesMovie get a list of all of the movie ids

collections.go

@@ -85,18 +85,8 @@ func (c *Client) GetCollectionImages(
 
 // CollectionTranslations type is a struct for translations JSON response.
 type CollectionTranslations struct {
-	ID           int64 `json:"id"`
-	Translations []struct {
-		Iso3166_1   string `json:"iso_3166_1"`
-		Iso639_1    string `json:"iso_639_1"`
-		Name        string `json:"name"`
-		EnglishName string `json:"english_name"`
-		Data        struct {
-			Title    string `json:"title"`
-			Overview string `json:"overview"`
-			Homepage string `json:"homepage"`
-		} `json:"data"`
-	} `json:"translations"`
+	ID           int64         `json:"id"`
+	Translations []Translation `json:"translations"`
 }
 
 // GetCollectionTranslations get the list translations for a collection by id.

credits.go

@@ -37,16 +37,7 @@ type CreditsDetails struct {
 			SeasonNumber  int    `json:"season_number"`
 			StillPath     string `json:"still_path"`
 		} `json:"episodes,omitempty"` // TV
-		Seasons []struct {
-			AirDate      string `json:"air_date"`
-			EpisodeCount int    `json:"episode_count"`
-			ID           int64  `json:"id"`
-			Name         string `json:"name"`
-			Overview     string `json:"overview"`
-			PosterPath   string `json:"poster_path"`
-			SeasonNumber int    `json:"season_number"`
-			ShowID       int64  `json:"show_id"`
-		} `json:"seasons,omitempty"` // TV
+		Seasons []Season `json:"seasons,omitempty"` // TV
 	} `json:"media"`
 	MediaType string `json:"media_type"`
 	ID        string `json:"id"`

discover.go

@@ -4,9 +4,7 @@ import "fmt"
 
 // DiscoverMovie type is a struct for movie JSON response.
 type DiscoverMovie struct {
-	Page         int64 `json:"page"`
-	TotalResults int64 `json:"total_results"`
-	TotalPages   int64 `json:"total_pages"`
+	PaginatedResultsMeta
 	*DiscoverMovieResults
 }
 
@@ -54,9 +52,7 @@ func (c *Client) GetDiscoverMovie(
 
 // DiscoverTV type is a struct for tv JSON response.
 type DiscoverTV struct {
-	Page         int64 `json:"page"`
-	TotalResults int64 `json:"total_results"`
-	TotalPages   int64 `json:"total_pages"`
+	PaginatedResultsMeta
 	*DiscoverTVResults
 }
 

genres.go

@@ -4,10 +4,7 @@ import "fmt"
 
 // GenreMovieList type is a struct for genres movie list JSON response.
 type GenreMovieList struct {
-	Genres []struct {
-		ID   int64  `json:"id"`
-		Name string `json:"name"`
-	} `json:"genres"`
+	Genres []Genre `json:"genres"`
 }
 
 // GetGenreMovieList get the list of official genres for movies.

go.mod

@@ -1,9 +1,16 @@
 module github.com/cyruzin/golang-tmdb
 
-go 1.13
+go 1.24
 
 require (
 	github.com/json-iterator/go v1.1.12
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.10.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -4,23 +4,18 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
-gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

guest_sessions.go

@@ -4,7 +4,6 @@ import "fmt"
 
 // GuestSessionRatedMovies type is a struct for rated movies JSON response.
 type GuestSessionRatedMovies struct {
-	Page    int64 `json:"page"`
 	Results []struct {
 		Adult            bool    `json:"adult"`
 		BackdropPath     string  `json:"backdrop_path"`
@@ -22,8 +21,7 @@ type GuestSessionRatedMovies struct {
 		VoteCount        int64   `json:"vote_count"`
 		Rating           float32 `json:"rating"`
 	} `json:"results"`
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetGuestSessionRatedMovies get the rated movies for a guest session.
@@ -51,7 +49,6 @@ func (c *Client) GetGuestSessionRatedMovies(
 
 // GuestSessionRatedTVShows type is a struct for rated tv shows JSON response.
 type GuestSessionRatedTVShows struct {
-	Page    int64 `json:"page"`
 	Results []struct {
 		BackdropPath     string   `json:"backdrop_path"`
 		FirstAirDate     string   `json:"first_air_date"`
@@ -68,8 +65,7 @@ type GuestSessionRatedTVShows struct {
 		VoteCount        int64    `json:"vote_count"`
 		Rating           float32  `json:"rating"`
 	} `json:"results"`
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetGuestSessionRatedTVShows get the rated TV shows for a guest session.
@@ -97,7 +93,6 @@ func (c *Client) GetGuestSessionRatedTVShows(
 
 // GuestSessionRatedTVEpisodes type is a struct for rated tv episodes JSON response.
 type GuestSessionRatedTVEpisodes struct {
-	Page    int64 `json:"page"`
 	Results []struct {
 		AirDate        string  `json:"air_date"`
 		EpisodeNumber  int     `json:"episode_number"`
@@ -112,8 +107,7 @@ type GuestSessionRatedTVEpisodes struct {
 		VoteCount      int64   `json:"vote_count"`
 		Rating         float32 `json:"rating"`
 	} `json:"results"`
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetGuestSessionRatedTVEpisodes get the rated TV episodes for a guest session.

keywords.go

@@ -31,7 +31,6 @@ func (c *Client) GetKeywordDetails(
 // KeywordMovies type is a struct for movies that belong to a keyword JSON response.
 type KeywordMovies struct {
 	ID      int64 `json:"id"`
-	Page    int64 `json:"page"`
 	Results []struct {
 		Adult            bool    `json:"adult"`
 		BackdropPath     string  `json:"backdrop_path"`
@@ -48,8 +47,7 @@ type KeywordMovies struct {
 		VoteCount        int64   `json:"vote_count"`
 		Popularity       float32 `json:"popularity"`
 	} `json:"results"`
-	TotalPages   int64 `json:"total_pages"`
-	TotalResults int64 `json:"total_results"`
+	PaginatedResultsMeta
 }
 
 // GetKeywordMovies get the movies that belong to a keyword.