From 66ebb6c53934f6f0ea4eb3222d25ca035e84cb8b Mon Sep 17 00:00:00 2001 From: Lee Peuker Date: Sat, 30 Sep 2023 21:51:20 +0200 Subject: [PATCH 1/5] Always display imdb link if id is set on movie page --- templates/page/movie.html.twig | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/page/movie.html.twig b/templates/page/movie.html.twig index 71c42daf..768b083f 100644 --- a/templates/page/movie.html.twig +++ b/templates/page/movie.html.twig @@ -83,20 +83,22 @@
- {% if movie.imdbRatingAverage is not null %} -
- + {% if movie.imdbId is not null %} +
+

+ {% if movie.imdbRatingAverage is not null %} {# Must be in one line otherwise there is a whitespace between the slash and the vote count which looks ugly #} {% if movie.imdbRatingAverage is null %}-{% else %}{{ movie.imdbRatingAverage|number_format(1, '.', ',') }}{% endif %}/{{ movie.imdbRatingVoteCount|default('-') }} + {% endif %}

-
+
{% endif %} -
-

+

{# Must be in one line otherwise there is a whitespace between the slash and the vote count which looks ugly #} {% if movie.tmdbRatingAverage is null %}-{% else %}{{ movie.tmdbRatingAverage|number_format(1, '.', ',') }}{% endif %}/{{ movie.tmdbRatingVoteCount|default('-') }} From 870a054f8fad035eba82f479ae62f974894b4aad Mon Sep 17 00:00:00 2001 From: Lee Peuker Date: Sun, 1 Oct 2023 13:08:59 +0200 Subject: [PATCH 2/5] Add imdb id to person --- .../20231001110211_AddImdbIdToPersonTable.php | 24 ++++ .../20231001110211_AddImdbIdToPersonTable.php | 129 ++++++++++++++++++ src/Api/Tmdb/Dto/TmdbPerson.php | 7 + src/Domain/Person/PersonApi.php | 4 + src/Domain/Person/PersonEntity.php | 7 + src/Domain/Person/PersonRepository.php | 4 + src/Service/Tmdb/SyncPerson.php | 2 + 7 files changed, 177 insertions(+) create mode 100644 db/migrations/mysql/20231001110211_AddImdbIdToPersonTable.php create mode 100644 db/migrations/sqlite/20231001110211_AddImdbIdToPersonTable.php diff --git a/db/migrations/mysql/20231001110211_AddImdbIdToPersonTable.php b/db/migrations/mysql/20231001110211_AddImdbIdToPersonTable.php new file mode 100644 index 00000000..68825bdb --- /dev/null +++ b/db/migrations/mysql/20231001110211_AddImdbIdToPersonTable.php @@ -0,0 +1,24 @@ +execute( + <<execute( + <<execute( + <<execute( + 'INSERT INTO `tmp_person` ( + `id`, + `name`, + `gender`, + `known_for_department`, + `poster_path`, + `biography`, + `birth_date`, + `place_of_birth`, + `death_date`, + `tmdb_id`, + `tmdb_poster_path`, + `created_at`, + `updated_at`, + `updated_at_tmdb` + ) SELECT + `id`, + `name`, + `gender`, + `known_for_department`, + `poster_path`, + `biography`, + `birth_date`, + `place_of_birth`, + `death_date`, + `tmdb_id`, + `tmdb_poster_path`, + `created_at`, + `updated_at`, + `updated_at_tmdb` + FROM `person`', + ); + $this->execute('DROP TABLE `person`'); + $this->execute('ALTER TABLE `tmp_person` RENAME TO `person`'); + } + + public function up() + { + $this->execute( + <<execute( + 'INSERT INTO `tmp_person` ( + `id`, + `name`, + `gender`, + `known_for_department`, + `poster_path`, + `biography`, + `birth_date`, + `place_of_birth`, + `death_date`, + `tmdb_id`, + `tmdb_poster_path`, + `created_at`, + `updated_at`, + `updated_at_tmdb` + ) SELECT + `id`, + `name`, + `gender`, + `known_for_department`, + `poster_path`, + `biography`, + `birth_date`, + `place_of_birth`, + `death_date`, + `tmdb_id`, + `tmdb_poster_path`, + `created_at`, + `updated_at`, + `updated_at_tmdb` + FROM `person`', + ); + $this->execute('DROP TABLE `person`'); + $this->execute('ALTER TABLE `tmp_person` RENAME TO `person`'); + } +} diff --git a/src/Api/Tmdb/Dto/TmdbPerson.php b/src/Api/Tmdb/Dto/TmdbPerson.php index 210a8464..9e0b5232 100644 --- a/src/Api/Tmdb/Dto/TmdbPerson.php +++ b/src/Api/Tmdb/Dto/TmdbPerson.php @@ -9,6 +9,7 @@ class TmdbPerson { private function __construct( private readonly int $tmdbId, + private readonly ?string $imdbId, private readonly string $name, private readonly ?string $biography, private readonly ?Date $birthDate, @@ -25,6 +26,7 @@ public static function createFromArray(array $data) : self { return new self( $data['id'], + $data['imdb_id'], $data['name'], empty($data['biography']) === true ? null : $data['biography'], empty($data['birthday']) === true ? null : Date::createFromString($data['birthday']), @@ -57,6 +59,11 @@ public function getGender() : Gender return $this->gender; } + public function getImdbId() : ?string + { + return $this->imdbId; + } + public function getKnownForDepartment() : ?string { return $this->knownForDepartment; diff --git a/src/Domain/Person/PersonApi.php b/src/Domain/Person/PersonApi.php index e132ecbd..54986252 100644 --- a/src/Domain/Person/PersonApi.php +++ b/src/Domain/Person/PersonApi.php @@ -24,6 +24,7 @@ public function create( ?Date $deathDate = null, ?string $placeOfBirth = null, ?DateTime $updatedAtTmdb = null, + ?string $imdbId = null, ) : PersonEntity { return $this->repository->create( $tmdbId, @@ -36,6 +37,7 @@ public function create( $deathDate, $placeOfBirth, $updatedAtTmdb, + $imdbId, ); } @@ -113,6 +115,7 @@ public function update( ?Date $deathDate = null, ?string $placeOfBirth = null, ?DateTime $updatedAtTmdb = null, + ?string $imdbId = null, ) : PersonEntity { return $this->repository->update( $id, @@ -126,6 +129,7 @@ public function update( $deathDate, $placeOfBirth, $updatedAtTmdb, + $imdbId, ); } } diff --git a/src/Domain/Person/PersonEntity.php b/src/Domain/Person/PersonEntity.php index 577ac0bd..0becbd6c 100644 --- a/src/Domain/Person/PersonEntity.php +++ b/src/Domain/Person/PersonEntity.php @@ -14,6 +14,7 @@ private function __construct( private readonly Gender $gender, private readonly ?string $knownForDepartment, private readonly int $tmdbId, + private readonly ?string $imdbId, private readonly ?string $posterPath, private readonly ?string $tmdbPosterPath, private readonly ?string $biography, @@ -32,6 +33,7 @@ public static function createFromArray(array $data) : self Gender::createFromInt((int)$data['gender']), $data['known_for_department'], $data['tmdb_id'], + $data['imdb_id'], $data['poster_path'], $data['tmdb_poster_path'], empty($data['biography']) === true ? null : $data['biography'], @@ -67,6 +69,11 @@ public function getId() : int return $this->id; } + public function getImdbId() : ?string + { + return $this->imdbId; + } + public function getKnownForDepartment() : ?string { return $this->knownForDepartment; diff --git a/src/Domain/Person/PersonRepository.php b/src/Domain/Person/PersonRepository.php index 97674a0f..295141a6 100644 --- a/src/Domain/Person/PersonRepository.php +++ b/src/Domain/Person/PersonRepository.php @@ -25,6 +25,7 @@ public function create( ?Date $deathDate = null, ?string $placeOfBirth = null, ?DateTime $updatedAtTmdb = null, + ?string $imdbId = null, ) : PersonEntity { $this->dbConnection->insert( 'person', @@ -33,6 +34,7 @@ public function create( 'gender' => $gender->asInt(), 'known_for_department' => $knownForDepartment, 'tmdb_id' => $tmdbId, + 'imdb_id' => $imdbId, 'tmdb_poster_path' => $tmdbPosterPath, 'biography' => $biography === null ? null : $biography, 'birth_date' => $birthDate === null ? null : (string)$birthDate, @@ -117,12 +119,14 @@ public function update( ?Date $deathDate = null, ?string $placeOfBirth = null, ?DateTime $updatedAtTmdb = null, + ?string $imdbId = null, ) : PersonEntity { $payload = [ 'name' => $name, 'gender' => $gender->asInt(), 'known_for_department' => $knownForDepartment, 'tmdb_id' => $tmdbId, + 'imdb_id' => $imdbId, 'tmdb_poster_path' => $tmdbPosterPath, 'biography' => $biography === null ? null : $biography, 'birth_date' => $birthDate === null ? null : (string)$birthDate, diff --git a/src/Service/Tmdb/SyncPerson.php b/src/Service/Tmdb/SyncPerson.php index ef5c8ef8..025fc851 100644 --- a/src/Service/Tmdb/SyncPerson.php +++ b/src/Service/Tmdb/SyncPerson.php @@ -49,6 +49,7 @@ public function syncPerson(int $tmdbId) : void $tmdbPerson->getDeathDate(), $tmdbPerson->getPlaceOfBirth(), updatedAtTmdb: DateTime::create(), + imdbId: $tmdbPerson->getImdbId() ); $this->logger->debug('TMDB: Created person meta data', ['personId' => $person->getId(), 'tmdbId' => $person->getTmdbId()]); @@ -72,6 +73,7 @@ public function syncPerson(int $tmdbId) : void $tmdbPerson->getDeathDate(), $tmdbPerson->getPlaceOfBirth(), DateTime::create(), + $tmdbPerson->getImdbId() ); $this->logger->debug('TMDB: Updated person meta data', ['personId' => $person->getId(), 'tmdbId' => $person->getTmdbId()]); From 94725a9d1f88ebad2a09e51077dd3145142306dc Mon Sep 17 00:00:00 2001 From: Lee Peuker Date: Sun, 1 Oct 2023 13:12:40 +0200 Subject: [PATCH 3/5] Update person page to match movie page style --- templates/page/movie.html.twig | 2 +- templates/page/person.html.twig | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/page/movie.html.twig b/templates/page/movie.html.twig index 768b083f..b5564ed1 100644 --- a/templates/page/movie.html.twig +++ b/templates/page/movie.html.twig @@ -43,7 +43,7 @@

- +
diff --git a/templates/page/person.html.twig b/templates/page/person.html.twig index b308f1cf..71841882 100644 --- a/templates/page/person.html.twig +++ b/templates/page/person.html.twig @@ -26,29 +26,29 @@
- +
Known for
-

{{ person.knownForDepartment }}

+

{{ person.knownForDepartment }}

Gender
-

{{ person.gender == '0' ? '-' }}{{ person.gender == '1' ? 'Female' }}{{ person.gender == '2' ? 'Male' }}{{ person.gender == '3' ? 'Non-Binary' }}

+

{{ person.gender == '0' ? '-' }}{{ person.gender == '1' ? 'Female' }}{{ person.gender == '2' ? 'Male' }}{{ person.gender == '3' ? 'Non-Binary' }}

{% if person.birthDate is not null %}
Birth date
-

{{ person.birthDate }} {% if person.deathDate is null %}({{ person.age }}){% endif %}

+

{{ person.birthDate }} {% if person.deathDate is null %}({{ person.age }}){% endif %}

{% endif %} {% if person.deathDate is not null %}
Day of Death
-

{{ person.deathDate }} ({{ person.age }})

+

{{ person.deathDate }} ({{ person.age }})

{% endif %} {% if person.placeOfBirth is not null %}
Place of Birth
-

{{ person.placeOfBirth }}

+

{{ person.placeOfBirth }}

{% endif %}
From 7057ac6eb861136e58e2e8003be7b83889d0cf74 Mon Sep 17 00:00:00 2001 From: Lee Peuker Date: Sun, 1 Oct 2023 19:11:59 +0200 Subject: [PATCH 4/5] Update person and movoe page to always disbale tmdb and imdb links if possible --- src/Api/Imdb/ImdbUrlGenerator.php | 5 ++++ src/Api/Tmdb/TmdbUrlGenerator.php | 5 ++++ src/HttpController/Web/PersonController.php | 13 +++++++++ templates/page/movie.html.twig | 30 ++++++++++----------- templates/page/person.html.twig | 22 ++++++++++++--- 5 files changed, 56 insertions(+), 19 deletions(-) diff --git a/src/Api/Imdb/ImdbUrlGenerator.php b/src/Api/Imdb/ImdbUrlGenerator.php index 7bc00699..20d6517d 100644 --- a/src/Api/Imdb/ImdbUrlGenerator.php +++ b/src/Api/Imdb/ImdbUrlGenerator.php @@ -8,4 +8,9 @@ public function buildMovieUrl(string $imdbId) : string { return "https://www.imdb.com/title/$imdbId"; } + + public function generatePersonUrl(string $imdbId) : string + { + return "https://www.imdb.com/name/$imdbId"; + } } diff --git a/src/Api/Tmdb/TmdbUrlGenerator.php b/src/Api/Tmdb/TmdbUrlGenerator.php index c62a8510..7771ed7b 100644 --- a/src/Api/Tmdb/TmdbUrlGenerator.php +++ b/src/Api/Tmdb/TmdbUrlGenerator.php @@ -15,4 +15,9 @@ public function generateMovieUrl(int $tmdbId) : Url { return Url::createFromString("https://www.themoviedb.org/movie/$tmdbId/"); } + + public function generatePersonUrl(int $tmdbId) : Url + { + return Url::createFromString("https://www.themoviedb.org/person/$tmdbId/"); + } } diff --git a/src/HttpController/Web/PersonController.php b/src/HttpController/Web/PersonController.php index 5d633fec..f9a7cc9e 100644 --- a/src/HttpController/Web/PersonController.php +++ b/src/HttpController/Web/PersonController.php @@ -2,6 +2,8 @@ namespace Movary\HttpController\Web; +use Movary\Api\Imdb; +use Movary\Api\Tmdb; use Movary\Domain\Movie\MovieApi; use Movary\Domain\Person; use Movary\Domain\User\Service\UserPageAuthorizationChecker; @@ -20,6 +22,8 @@ public function __construct( private readonly Environment $twig, private readonly UserPageAuthorizationChecker $userPageAuthorizationChecker, private readonly UrlGenerator $urlGenerator, + private readonly Imdb\ImdbUrlGenerator $imdbUrlGenerator, + private readonly Tmdb\TmdbUrlGenerator $tmdbUrlGenerator, ) { } @@ -50,6 +54,13 @@ public function renderPage(Request $request) : Response } } + $imdbId = $person->getImdbId(); + + $imdbUrl = null; + if ($imdbId !== null) { + $imdbUrl = $this->imdbUrlGenerator->generatePersonUrl($imdbId); + } + return Response::create( StatusCode::createOk(), $this->twig->render('page/person.html.twig', [ @@ -64,6 +75,8 @@ public function renderPage(Request $request) : Response 'birthDate' => $person->getBirthDate(), 'deathDate' => $person->getDeathDate(), 'placeOfBirth' => $person->getPlaceOfBirth(), + 'tmdbUrl' => $this->tmdbUrlGenerator->generatePersonUrl($person->getTmdbId()), + 'imdbUrl' => $imdbUrl, ], 'moviesAsActor' => $this->movieApi->fetchWithActor($personId, $userId), 'moviesAsDirector' => $this->movieApi->fetchWithDirector($personId, $userId), diff --git a/templates/page/movie.html.twig b/templates/page/movie.html.twig index b5564ed1..99134363 100644 --- a/templates/page/movie.html.twig +++ b/templates/page/movie.html.twig @@ -84,26 +84,26 @@
{% if movie.imdbId is not null %} -
- -

- {% if movie.imdbRatingAverage is not null %} + + imdb logo + + {% if movie.imdbRatingAverage is not null %} +

{# Must be in one line otherwise there is a whitespace between the slash and the vote count which looks ugly #} {% if movie.imdbRatingAverage is null %}-{% else %}{{ movie.imdbRatingAverage|number_format(1, '.', ',') }}{% endif %}/{{ movie.imdbRatingVoteCount|default('-') }} - {% endif %}

-
+ {% endif %} {% endif %} -
- -

- {# Must be in one line otherwise there is a whitespace between the slash and the vote count which looks ugly #} - {% if movie.tmdbRatingAverage is null %}-{% else %}{{ movie.tmdbRatingAverage|number_format(1, '.', ',') }}{% endif %}/{{ movie.tmdbRatingVoteCount|default('-') }} -

-
+ + tmdb logo + +

+ {# Must be in one line otherwise there is a whitespace between the slash and the vote count which looks ugly #} + {% if movie.tmdbRatingAverage is null %}-{% else %}{{ movie.tmdbRatingAverage|number_format(1, '.', ',') }}{% endif %}/{{ movie.tmdbRatingVoteCount|default('-') }} +

{# --- Buttons --- #} diff --git a/templates/page/person.html.twig b/templates/page/person.html.twig index 71841882..3ca1eb6b 100644 --- a/templates/page/person.html.twig +++ b/templates/page/person.html.twig @@ -34,7 +34,8 @@

{{ person.knownForDepartment }}

Gender
-

{{ person.gender == '0' ? '-' }}{{ person.gender == '1' ? 'Female' }}{{ person.gender == '2' ? 'Male' }}{{ person.gender == '3' ? 'Non-Binary' }}

+

{{ person.gender == '0' ? '-' }}{{ person.gender == '1' ? 'Female' }}{{ person.gender == '2' ? 'Male' }}{{ person.gender == '3' ? 'Non-Binary' }}

{% if person.birthDate is not null %}
Birth date
@@ -53,6 +54,17 @@
+
+ {% if person.imdbUrl is not null %} + + imdb logo + + {% endif %} + + tmdb logo + +
+
Biography
{% if person.biography is not null %}

{{ person.biography|nl2br }}

@@ -65,7 +77,7 @@

No biography available.

{% endif %} -