PROGRAMMES-7180 - add various external contributor profile IDs

src/Data/ProgrammesDb/Entity/Contributor.php

@@ -78,7 +78,7 @@ class Contributor
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\Column(type="string", length=511, nullable=true)
      */
     private $sortName;
 
@@ -109,6 +109,35 @@ class Contributor
      */
     private $contributions;
 
+    /**
+     * @var Thing|null
+     *
+     * @ORM\ManyToOne(targetEntity="Thing")
+     * @ORM\JoinColumn(name="thing_id", referencedColumnName="id")
+     */
+    private $thing;
+
+    /**
+     * @var string|null
+     *
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    private $wikidataItemId;
+
+    /**
+     * @var string|null
+     *
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private $imdbUri;
+
+    /**
+     * @var string|null
+     *
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private $wikipediaUri;
+
     public function __construct(string $pid, string $type)
     {
         $this->pid = $pid;
@@ -230,4 +259,44 @@ public function setGender(?string $gender)
     {
         $this->gender = $gender;
     }
+
+    public function getThing(): ?Thing
+    {
+        return $this->thing;
+    }
+
+    public function setThing(?Thing $thing)
+    {
+        $this->thing = $thing;
+    }
+
+    public function getWikidataItemId(): ?string
+    {
+        return $this->wikidataItemId;
+    }
+
+    public function setWikidataItemId(?string $wikidataItemId)
+    {
+        $this->wikidataItemId = $wikidataItemId;
+    }
+
+    public function getImdbUri(): ?string
+    {
+        return $this->imdbUri;
+    }
+
+    public function setImdbUri(?string $imdbUri)
+    {
+        $this->imdbUri = $imdbUri;
+    }
+
+    public function getWikipediaUri(): ?string
+    {
+        return $this->wikipediaUri;
+    }
+
+    public function setWikipediaUri(?string $wikipediaUri)
+    {
+        $this->wikipediaUri = $wikipediaUri;
+    }
 }

src/Data/ProgrammesDb/Entity/Thing.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace BBC\ProgrammesPagesService\Data\ProgrammesDb\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Gedmo\Timestampable\Traits\TimestampableEntity;
+
+/**
+ * @ORM\Entity(repositoryClass="BBC\ProgrammesPagesService\Data\ProgrammesDb\EntityRepository\ThingRepository")
+ */
+class Thing
+{
+    use TimestampableEntity;
+
+    /**
+     * @var string
+     *
+     * @ORM\Id()
+     * @ORM\Column(type="string", length=36, nullable=false)
+     */
+    private $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="text", nullable=false)
+     */
+    private $preferredLabel;
+
+    /**
+     * @var string|null
+     *
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private $disambiguationHint;
+
+    public function __construct(string $id, string $preferredLabel)
+    {
+        $this->id = $id;
+        $this->preferredLabel = $preferredLabel;
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function setId(string $id)
+    {
+        $this->id = $id;
+    }
+
+    public function getPreferredLabel(): string
+    {
+        return $this->preferredLabel;
+    }
+
+    public function setPreferredLabel(string $preferredLabel)
+    {
+        $this->preferredLabel = $preferredLabel;
+    }
+
+    public function getDisambiguationHint(): ?string
+    {
+        return $this->disambiguationHint;
+    }
+
+    public function setDisambiguationHint(?string $disambiguationHint)
+    {
+        $this->disambiguationHint = $disambiguationHint;
+    }
+}

src/Data/ProgrammesDb/EntityRepository/ContributionRepository.php

@@ -31,9 +31,10 @@ public function findByContributionTo(
         $columnName = $columnNameLookup[$type] ?? 'contributionToCoreEntity';
 
         $qb = $this->createQueryBuilder('contribution')
-            ->addSelect(['contributor', 'creditRole'])
+            ->addSelect(['contributor', 'creditRole', 'thing'])
             ->join('contribution.contributor', 'contributor')
             ->join('contribution.creditRole', 'creditRole')
+            ->leftJoin('contributor.thing', 'thing')
             ->andWhere('contribution.' . $columnName . ' IN (:dbIds)')
             ->orderBy('contribution.position')
             ->setFirstResult($offset)

src/Data/ProgrammesDb/EntityRepository/CoreEntityRepository.php

@@ -840,6 +840,33 @@ public function coreEntityAncestryGetter(array $ids): array
         return $cached;
     }
 
+    public function findByThing(
+        string $thingDbId,
+        ?int $limit,
+        int $offset
+    ): array {
+        return $this->resolveParents(
+            $this->getEntityManager()->createQueryBuilder()
+                ->addSelect(['coreEntity', 'image', 'masterBrand', 'mbImage', 'network', 'nwImage'])
+                ->from('ProgrammesPagesService:ProgrammeItem', 'coreEntity')
+                ->leftJoin('coreEntity.image', 'image')
+                ->leftJoin('coreEntity.masterBrand', 'masterBrand')
+                ->leftJoin('masterBrand.image', 'mbImage')
+                ->leftJoin('masterBrand.network', 'network')
+                ->leftJoin('network.image', 'nwImage')
+                ->innerJoin('ProgrammesPagesService:Contribution', 'contribution', Query\Expr\Join::WITH, 'contribution.contributionToCoreEntity = coreEntity')
+                ->innerJoin('contribution.contributor', 'contributor')
+                ->innerJoin('contributor.thing', 'thing')
+                ->where('thing.id = :thingId')
+                ->orderBy('coreEntity.onDemandSortDate', 'DESC')
+                ->setFirstResult($offset)
+                ->setMaxResults($limit)
+                ->setParameter('thingId', $thingDbId)
+                ->getQuery()
+                ->getResult(AbstractQuery::HYDRATE_ARRAY)
+        );
+    }
+
     private function findFullCommon(string $entityType): QueryBuilder
     {
         $this->assertEntityType($entityType, self::ALL_VALID_ENTITY_TYPES);

src/Data/ProgrammesDb/EntityRepository/ThingRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace BBC\ProgrammesPagesService\Data\ProgrammesDb\EntityRepository;
+
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+
+class ThingRepository extends EntityRepository
+{
+    public function findById(string $id): ?array
+    {
+        return $this->createQueryBuilder('thing')
+            ->andWhere('thing.id = :id')
+            ->setParameter('id', $id)
+            ->getQuery()
+            ->getOneOrNullResult(Query::HYDRATE_ARRAY);
+    }
+}

src/Domain/Entity/Contributor.php

@@ -30,6 +30,9 @@ class Contributor
     /** @var string|null */
     private $musicBrainzId;
 
+    /** @var Thing|null */
+    private $thing;
+
     public function __construct(
         int $dbId,
         Pid $pid,
@@ -38,7 +41,8 @@ public function __construct(
         ?string $sortName = null,
         ?string $givenName = null,
         ?string $familyName = null,
-        ?string $musicBrainzId = null
+        ?string $musicBrainzId = null,
+        ?Thing $thing = null
     ) {
         $this->dbId = $dbId;
         $this->pid = $pid;
@@ -48,6 +52,7 @@ public function __construct(
         $this->givenName = $givenName;
         $this->familyName = $familyName;
         $this->musicBrainzId = $musicBrainzId;
+        $this->thing = $thing;
     }
 
     /**
@@ -95,4 +100,9 @@ public function getMusicBrainzId(): ?string
     {
         return $this->musicBrainzId;
     }
+
+    public function getThing(): ?Thing
+    {
+        return $this->thing;
+    }
 }

src/Domain/Entity/Thing.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace BBC\ProgrammesPagesService\Domain\Entity;
+
+class Thing
+{
+    /** @var string */
+    private $id;
+
+    /** @var string */
+    private $preferredLabel;
+
+    /** @var string|null */
+    private $disambiguationHint;
+
+    public function __construct(string $id, string $preferredLabel, ?string $disambiguationHint)
+    {
+        $this->id = $id;
+        $this->preferredLabel = $preferredLabel;
+        $this->disambiguationHint = $disambiguationHint;
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function getPreferredLabel(): string
+    {
+        return $this->preferredLabel;
+    }
+
+    public function getDisambiguationHint(): ?string
+    {
+        return $this->disambiguationHint;
+    }
+}

src/Mapper/ProgrammesDbToDomain/ContributorMapper.php

@@ -3,6 +3,7 @@
 namespace BBC\ProgrammesPagesService\Mapper\ProgrammesDbToDomain;
 
 use BBC\ProgrammesPagesService\Domain\Entity\Contributor;
+use BBC\ProgrammesPagesService\Domain\Entity\Thing;
 use BBC\ProgrammesPagesService\Domain\ValueObject\Pid;
 
 class ContributorMapper extends AbstractMapper
@@ -19,6 +20,17 @@ public function getDomainModel(array $dbContributor): Contributor
         $cacheKey = $this->getCacheKey($dbContributor);
 
         if (!isset($this->cache[$cacheKey])) {
+            if (isset($dbContributor['thing'])) {
+                $dbThing = $dbContributor['thing'];
+                $thing = new Thing(
+                    $dbThing['id'],
+                    $dbThing['preferredLabel'],
+                    $dbThing['disambiguationHint']
+                );
+            } else {
+                $thing = null;
+            }
+
             $this->cache[$cacheKey] = new Contributor(
                 $dbContributor['id'],
                 new Pid($dbContributor['pid']),
@@ -27,7 +39,8 @@ public function getDomainModel(array $dbContributor): Contributor
                 $dbContributor['sortName'],
                 $dbContributor['givenName'],
                 $dbContributor['familyName'],
-                $dbContributor['musicBrainzId']
+                $dbContributor['musicBrainzId'],
+                $thing
             );
         }
 

src/Mapper/ProgrammesDbToDomain/MapperFactory.php

@@ -186,6 +186,15 @@ public function getServiceMapper(): ServiceMapper
         return $this->instances[ServiceMapper::class];
     }
 
+    public function getThingMapper(): ThingMapper
+    {
+        if (!isset($this->instances[ThingMapper::class])) {
+            $this->instances[ThingMapper::class] = new ThingMapper($this);
+        }
+
+        return $this->instances[ThingMapper::class];
+    }
+
     public function getVersionMapper(): VersionMapper
     {
         if (!isset($this->instances[VersionMapper::class])) {

src/Mapper/ProgrammesDbToDomain/ThingMapper.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace BBC\ProgrammesPagesService\Mapper\ProgrammesDbToDomain;
+
+use BBC\ProgrammesPagesService\Domain\Entity\Thing;
+
+class ThingMapper extends AbstractMapper
+{
+    private $cache = [];
+
+    public function getCacheKey(array $dbThing): string
+    {
+        return $this->buildCacheKey($dbThing, 'id');
+    }
+
+    public function getDomainModel(array $dbThing): Thing
+    {
+        $cacheKey = $this->getCacheKey($dbThing);
+
+        if (!isset($this->cache[$cacheKey])) {
+            $this->cache[$cacheKey] = new Thing(
+                $dbThing['id'],
+                $dbThing['preferredLabel'],
+                $dbThing['disambiguationHint']
+            );
+        }
+
+        return $this->cache[$cacheKey];
+    }
+}