♻️ refactor session speaker to be a list of speakers closes #57

src/main/java/swiss/fihlon/apus/conference/Session.java

@@ -20,8 +20,10 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
-public record Session(String id, LocalDateTime startDate, LocalDateTime endDate, String room, String title, String speaker)
+public record Session(@NotNull String id, @NotNull LocalDateTime startDate, @NotNull LocalDateTime endDate,
+                      @NotNull String room, @NotNull String title, @NotNull List<Speaker> speakers)
         implements Comparable<Session> {
     @Override
     public int compareTo(@NotNull final Session other) {

src/main/java/swiss/fihlon/apus/conference/Speaker.java

@@ -0,0 +1,22 @@
+/*
+ * Apus - A social wall for conferences with additional features.
+ * Copyright (C) Marcus Fihlon and the individual contributors to Apus.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package swiss.fihlon.apus.conference;
+
+import org.jetbrains.annotations.NotNull;
+
+public record Speaker(@NotNull String fullName) { }

src/main/java/swiss/fihlon/apus/conference/doag/ConferenceAPI.java

@@ -23,6 +23,7 @@
 import org.json.JSONObject;
 import swiss.fihlon.apus.conference.Session;
 import swiss.fihlon.apus.conference.SessionImportException;
+import swiss.fihlon.apus.conference.Speaker;
 import swiss.fihlon.apus.configuration.Configuration;
 
 import java.io.IOException;
@@ -68,7 +69,6 @@ public List<Session> getSessions() {
                 final LocalDate date = LocalDate.parse(day.getString("date")).minus(daysBetween);
 
                 final JSONObject rooms = day.getJSONObject("rooms");
-                @SuppressWarnings("unchecked")
                 final Iterator<String> roomKeys = rooms.keys();
                 while (roomKeys.hasNext()) {
                     final String room = roomKeys.next();
@@ -100,7 +100,7 @@ public List<Session> getSessions() {
                                 LocalDateTime.of(date, startTime).plus(duration),
                                 room,
                                 title,
-                                String.join(", ", speakers));
+                                speakers.stream().map(Speaker::new).toList());
                         sessions.add(session);
                     }
                 }

src/main/java/swiss/fihlon/apus/ui/view/SessionView.java

@@ -26,35 +26,41 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import swiss.fihlon.apus.conference.Session;
+import swiss.fihlon.apus.conference.Speaker;
 
 import java.time.Duration;
 import java.time.LocalTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @CssImport(value = "./themes/apus/views/session-view.css")
 public final class SessionView extends Div {
 
     public SessionView(@NotNull final String room) {
-        this(room, null, null, null, null);
+        this(room, null, List.of(), null, null);
     }
 
     public SessionView(@NotNull final Session session) {
         this(
                 session.room(),
                 session.title(),
-                session.speaker(),
+                session.speakers(),
                 session.startDate().toLocalTime(),
                 session.endDate().toLocalTime()
         );
     }
 
     public SessionView(@NotNull final String room,
                        @Nullable final String title,
-                       @Nullable final String speaker,
+                       @NotNull final List<Speaker> speakers,
                        @Nullable final LocalTime startTime,
                        @Nullable final LocalTime endTime) {
         addClassName("session-view");
         add(new H3(new Text(title == null ? "CLOSED" : title)));
-        add(new Div(speaker == null ? nbsp() : new Text(String.format("\uD83D\uDC64 %s", speaker))));
+        add(new Div(speakers.isEmpty() ? nbsp() : new Text(String.format("\uD83D\uDC64 %s",
+                speakers.stream()
+                        .map(Speaker::fullName)
+                        .collect(Collectors.joining(", "))))));
         add(new Div(new Text(String.format("\uD83D\uDCCD %s", room))));
 
         final var now = LocalTime.now();