diff --git a/sources/AppBundle/Controller/Event/Blog/ProgramAction.php b/sources/AppBundle/Controller/Event/Blog/ProgramAction.php index 58d5b0277..d0c0875eb 100644 --- a/sources/AppBundle/Controller/Event/Blog/ProgramAction.php +++ b/sources/AppBundle/Controller/Event/Blog/ProgramAction.php @@ -36,6 +36,14 @@ public function __invoke(Request $request, $eventSlug): Response usort($themes, fn($a, $b): int => $a->priority === $b->priority ? $a->name <=> $b->name : $a->priority <=> $b->priority); $themes = array_combine(array_map(fn($theme): int => (int) $theme->id, $themes), $themes); } + // Talks publiés qui ont une vidéo (définition commune aux pages /talks/), en une requête : + // le widget leur ajoute un lien vers leur page sur afup.org. + $videoTalkIds = []; + foreach ($this->talkRepository->getPublishedByEventWithSpeakers($event) as $eventTalk) { + if ($eventTalk->talk->hasYoutubeId()) { + $videoTalkIds[(int) $eventTalk->talk->getId()] = true; + } + } $now = new \DateTime(); return $this->render( @@ -47,6 +55,7 @@ public function __invoke(Request $request, $eventSlug): Response 'speakersPagePrefix' => $request->query->get('speakers-page-prefix', '/' . $event->getPath() . '/speakers/'), 'display_joindin_links' => $now >= $event->getDateStart() && $now <= \DateTimeImmutable::createFromMutable($event->getDateEnd())->modify('+10 days'), 'themes' => $themes, + 'video_talk_ids' => $videoTalkIds, ], ); } diff --git a/sources/AppBundle/Controller/Event/Blog/SpeakersAction.php b/sources/AppBundle/Controller/Event/Blog/SpeakersAction.php index 8730c8d5a..50289fdac 100644 --- a/sources/AppBundle/Controller/Event/Blog/SpeakersAction.php +++ b/sources/AppBundle/Controller/Event/Blog/SpeakersAction.php @@ -7,6 +7,8 @@ use AppBundle\Controller\Event\EventActionHelper; use AppBundle\Event\JsonLd; use AppBundle\Event\Model\Repository\SpeakerRepository; +use AppBundle\Event\Model\Speaker; +use AppBundle\Event\Speaker\SpeakerProfileResolver; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -17,18 +19,33 @@ public function __construct( private readonly JsonLd $jsonLd, private readonly EventActionHelper $eventActionHelper, private readonly SpeakerRepository $speakerRepository, + private readonly SpeakerProfileResolver $speakerProfileResolver, ) {} public function __invoke(Request $request, string $eventSlug): Response { $event = $this->eventActionHelper->getEvent($eventSlug); - $speakers = $this->speakerRepository->getScheduledSpeakersByEvent($event, !$request->query->getBoolean('apply-publication-date-filters', true)); + $speakers = iterator_to_array($this->speakerRepository->getScheduledSpeakersByEvent($event, !$request->query->getBoolean('apply-publication-date-filters', true))); + + // Slug de la page speaker sur afup.org, pour les seules personnes qui ont un talk publié + // (sinon la page n'existe pas) : un seul index, chargé une fois pour tous. + $speakerSlugs = []; + foreach ($speakers as $row) { + /** @var Speaker $speaker */ + $speaker = $row['speaker']; + $identity = $this->speakerProfileResolver->getIdentityForSpeaker($speaker); + if (null !== $identity && null !== $speaker->getId()) { + $speakerSlugs[$speaker->getId()] = $identity->slug; + } + } + $jsonld = $this->jsonLd->getDataForEvent($event); return $this->render( 'blog/speakers.html.twig', [ - 'speakers' => iterator_to_array($speakers), + 'speakers' => $speakers, + 'speaker_slugs' => $speakerSlugs, 'event' => $event, 'jsonld' => $jsonld, 'programPagePrefix' => $request->query->get('program-page-prefix', '/' . $event->getPath() . '/programme/'), diff --git a/sources/AppBundle/Controller/Event/Blog/TalkWidgetAction.php b/sources/AppBundle/Controller/Event/Blog/TalkWidgetAction.php index 34a00e055..8eb602011 100644 --- a/sources/AppBundle/Controller/Event/Blog/TalkWidgetAction.php +++ b/sources/AppBundle/Controller/Event/Blog/TalkWidgetAction.php @@ -9,6 +9,7 @@ use AppBundle\Event\Model\Event; use AppBundle\Event\Model\Repository\TalkRepository; use AppBundle\Event\Model\Speaker; +use AppBundle\Event\Speaker\SpeakerProfileResolver; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -19,6 +20,7 @@ public function __construct( private readonly TalkRepository $talkRepository, private readonly InterviewRepository $interviewRepository, private readonly PlanningRepository $planningRepository, + private readonly SpeakerProfileResolver $speakerProfileResolver, ) {} public function __invoke(Request $request): Response @@ -49,9 +51,20 @@ public function __invoke(Request $request): Response } } + // Slug de la page speaker sur afup.org, pour les seules personnes qui ont un talk publié + // (sinon la page n'existe pas) : un seul index, chargé une fois pour tous. + $speakerSlugs = []; + foreach ($speakers as $speakerId => $speaker) { + $identity = $this->speakerProfileResolver->getIdentityForSpeaker($speaker); + if (null !== $identity) { + $speakerSlugs[$speakerId] = $identity->slug; + } + } + $data = [ 'talks_infos' => $talksInfos, 'speakers' => $speakers, + 'speaker_slugs' => $speakerSlugs, 'widget_type' => $widgetType, 'event' => $event, 'questions' => [], diff --git a/sources/AppBundle/Event/Model/Repository/SpeakerRepository.php b/sources/AppBundle/Event/Model/Repository/SpeakerRepository.php index c950cb6d4..19368a778 100644 --- a/sources/AppBundle/Event/Model/Repository/SpeakerRepository.php +++ b/sources/AppBundle/Event/Model/Repository/SpeakerRepository.php @@ -69,7 +69,7 @@ public function getScheduledSpeakersByEvent(Event $event, $returnTalksThatWillBe } $query = $this->getPreparedQuery('SELECT speaker.conferencier_id, speaker.id_forum, speaker.genre, speaker.nom, speaker.prenom, speaker.email, speaker.societe, - speaker.biographie, speaker.twitter, speaker.mastodon, speaker.bluesky, speaker.linkedin, speaker.user_github, speaker.photo, talk.titre, talk.session_id, + speaker.biographie, speaker.twitter, speaker.mastodon, speaker.bluesky, speaker.linkedin, speaker.user_github, speaker.person_id, speaker.photo, talk.titre, talk.session_id, speaker.will_attend_speakers_diner, speaker.has_special_diet, speaker.referent_person, diff --git a/sources/AppBundle/Event/Model/Repository/TalkRepository.php b/sources/AppBundle/Event/Model/Repository/TalkRepository.php index 486bcc569..201f2944d 100644 --- a/sources/AppBundle/Event/Model/Repository/TalkRepository.php +++ b/sources/AppBundle/Event/Model/Repository/TalkRepository.php @@ -208,7 +208,7 @@ public function getByTalkWithSpeakers(Talk $talk) // Les plannings ne sont plus hydratés par Ting : ils sont rechargés // via Doctrine avec PlanningRepository::findIndexedByTalkIds(). 'SELECT talk.session_id, talk.titre, skill, talk.genre, abstract, talk.plannifie, - speaker.conferencier_id, speaker.nom, speaker.prenom, speaker.id_forum, speaker.photo, speaker.societe, speaker.biographie, + speaker.conferencier_id, speaker.nom, speaker.prenom, speaker.id_forum, speaker.photo, speaker.societe, speaker.biographie, speaker.person_id, room.id, room.nom, event.date_annonce_planning, event.path, event.interviews_intro, event.interviews_cta_text FROM afup_sessions AS talk LEFT JOIN afup_conferenciers_sessions acs ON acs.session_id = talk.session_id diff --git a/templates/blog/program.html.twig b/templates/blog/program.html.twig index 5d60461a1..78458354a 100644 --- a/templates/blog/program.html.twig +++ b/templates/blog/program.html.twig @@ -61,6 +61,13 @@ {% endif %} {% endfor %} + {% if video_talk_ids[talk.talk.id] is defined %} +
+ +
+ {% endif %} {% if display_joindin_links and talk.talk.getJoindinUrl %}
{% endfor %} diff --git a/templates/blog/talk.html.twig b/templates/blog/talk.html.twig index 31ec3115a..deea70759 100644 --- a/templates/blog/talk.html.twig +++ b/templates/blog/talk.html.twig @@ -48,7 +48,11 @@ {{ speaker.label }}
- {{ speaker.label }} + {% if speaker_slugs[speaker.id] is defined %} + {{ speaker.label }} + {% else %} + {{ speaker.label }} + {% endif %} {{ speaker.biography }} diff --git a/tests/behat/features/Api/Api.feature b/tests/behat/features/Api/Api.feature index 7870170cd..51d6e834a 100644 --- a/tests/behat/features/Api/Api.feature +++ b/tests/behat/features/Api/Api.feature @@ -49,3 +49,34 @@ Feature: API pour event Then the response should contain "Jouons tous ensemble à un petit jeu" And the response should contain "REST ou GraphQL ? Exemples illustrés avec Symfony et API Platform" And the response should contain "Geoffrey BACHELET" + + @reloadDbWithTestData + Scenario: Le programme lie la vidéo de chaque talk publié qui en a une + Given I am on "/blog/forum/program?apply-publication-date-filters=0" + Then the response should contain "Voir la vidéo" + And the response should contain "href=\"https://apachephptest:80/talks/1-jouons-tous-ensemble-a-un-petit-jeu\"" + And the response should contain "href=\"https://apachephptest:80/talks/2-rest-ou-graphql-exemples-illustres-avec-symfony-et-api-platform\"" + # Talk 3 : une vidéo, mais une date de publication future. + And the response should contain "Révolutionons PHP" + And the response should not contain "/talks/3-" + + @reloadDbWithTestData + Scenario: Le programme ne lie pas un talk publié sans vidéo + Given I am on "/blog/passed/program" + Then the response should contain "Révolutionons PHP" + And the response should not contain "/talks/6-" + And the response should not contain "Voir la vidéo" + + @reloadDbWithTestData + Scenario: Les speakers sont liés à leur page sur afup.org quand elle existe + Given I am on "/blog/forum/speakers?apply-publication-date-filters=0" + Then the response should contain "href=\"https://apachephptest:80/talks/speakers/geoffrey-bachelet\"" + # Adrien Gallou n'a aucun talk publié : sa page speaker n'existe pas. + And the response should contain "Adrien GALLOU" + And the response should not contain "/talks/speakers/adrien-gallou" + + @reloadDbWithTestData + Scenario: Le widget talk lie le speaker à sa page sur afup.org + Given I am on "/blog/talk_widget?ids=1&type=speaker" + Then the response should contain "href=\"https://apachephptest:80/talks/speakers/geoffrey-bachelet\"" + And the response should not contain "href=\"\""