Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions sources/AppBundle/Controller/Event/Blog/ProgramAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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,
],
);
}
Expand Down
21 changes: 19 additions & 2 deletions sources/AppBundle/Controller/Event/Blog/SpeakersAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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/'),
Expand Down
13 changes: 13 additions & 0 deletions sources/AppBundle/Controller/Event/Blog/TalkWidgetAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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' => [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions templates/blog/program.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@
{% endif %}
{% endfor %}
</div>
{% if video_talk_ids[talk.talk.id] is defined %}
<div>
<div class="banner-button-container">
<a href="{{ url('talks_show', {id: talk.talk.id, slug: talk.talk.slug}) }}" class="banner-button basis-primary-background">Voir la vidéo</a>
</div>
</div>
{% endif %}
{% if display_joindin_links and talk.talk.getJoindinUrl %}
<div>
<div class="banner-button-container">
Expand Down
5 changes: 5 additions & 0 deletions templates/blog/speakers.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
</li>
{% endfor %}
</ul>
{% if speaker_slugs[row.speaker.id] is defined %}
<p>
<a href="{{ url('talks_speaker', {slug: speaker_slugs[row.speaker.id]}) }}">Toutes les conférences de {{ row.speaker.label }} sur afup.org</a>
</p>
{% endif %}
</div>
</article>
{% endfor %}
Expand Down
6 changes: 5 additions & 1 deletion templates/blog/talk.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@
<tr>
<td width="20%" style="vertical-align: top">
<img src="{{ app.request.getSchemeAndHttpHost() }}{{ photo_storage.getUrl(speaker) }}" alt="{{ speaker.label }}"><br />
<a href="">{{ speaker.label }}</a>
{% if speaker_slugs[speaker.id] is defined %}
<a href="{{ url('talks_speaker', {slug: speaker_slugs[speaker.id]}) }}">{{ speaker.label }}</a>
{% else %}
{{ speaker.label }}
{% endif %}
</td>
<td width="80%" style="text-align: left;padding: 10px;vertical-align: top">
{{ speaker.biography }}
Expand Down
31 changes: 31 additions & 0 deletions tests/behat/features/Api/Api.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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=\"\""
Loading