From f1157dac681b63e684dbb20a20090dbaa6fa4c65 Mon Sep 17 00:00:00 2001 From: Marcus Fihlon Date: Fri, 28 Jun 2024 15:09:17 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20small=20code=20cleanups?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcus Fihlon --- .../event/sessionize/SessionizePlugin.java | 49 +++++++++---------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/src/main/java/swiss/fihlon/apus/plugin/event/sessionize/SessionizePlugin.java b/src/main/java/swiss/fihlon/apus/plugin/event/sessionize/SessionizePlugin.java index 2976ea4..3eb6034 100644 --- a/src/main/java/swiss/fihlon/apus/plugin/event/sessionize/SessionizePlugin.java +++ b/src/main/java/swiss/fihlon/apus/plugin/event/sessionize/SessionizePlugin.java @@ -72,33 +72,9 @@ public boolean isEnabled() { final JSONObject jsonObject = new JSONArray(json).getJSONObject(0); final JSONArray sessionizeSessions = jsonObject.getJSONArray("sessions"); for (int counter = 0; counter < sessionizeSessions.length(); counter++) { - JSONObject singleSession = sessionizeSessions.getJSONObject(counter); - String sessionId = singleSession.getString("id"); - lastSessionId = sessionId; - LocalDateTime startDate = LocalDateTime.parse(singleSession.getString("startsAt")); - if (startDate.toLocalDate().getDayOfMonth() == 16) { - continue; - } - LocalDateTime endDate = LocalDateTime.parse(singleSession.getString("endsAt")); - Room room = new Room(singleSession.getString("room")); - String title = singleSession.getString("title"); - final JSONArray persons = singleSession.getJSONArray("speakers"); - final ArrayList speakers = new ArrayList<>(persons.length()); - for (int personCounter = 0; personCounter < persons.length(); personCounter++) { - final JSONObject person = persons.getJSONObject(personCounter); - final String publicName = person.getString("name"); - speakers.add(publicName); - } - - - Session session = new Session( - String.format("%s:%s", eventId, sessionId), - startDate, endDate, room, title, - speakers.stream().map(Speaker::new).toList(), - getLanguage(singleSession), - Track.NONE); - - sessions.add(session); + final JSONObject sessionData = sessionizeSessions.getJSONObject(counter); + lastSessionId = sessionData.getString("id"); + sessions.add(getSession(sessionData)); } LOGGER.info("Successfully loaded {} sessions for event ID {}", sessions.size(), eventId); } catch (IOException | URISyntaxException | JSONException e) { @@ -107,6 +83,25 @@ public boolean isEnabled() { return sessions; } + private Session getSession(@NotNull final JSONObject sessionData) { + final JSONArray speakersData = sessionData.getJSONArray("speakers"); + final ArrayList speakers = new ArrayList<>(speakersData.length()); + for (int speakerCounter = 0; speakerCounter < speakersData.length(); speakerCounter++) { + final JSONObject speakerData = speakersData.getJSONObject(speakerCounter); + speakers.add(speakerData.getString("name")); + } + + return new Session( + String.format("%s:%s", eventId, sessionData.getString("id")), + LocalDateTime.parse(sessionData.getString("startsAt")), + LocalDateTime.parse(sessionData.getString("endsAt")), + new Room(sessionData.getString("room")), + sessionData.getString("title"), + speakers.stream().map(Speaker::new).toList(), + getLanguage(sessionData), + Track.NONE); + } + private Language getLanguage(@NotNull final JSONObject singleSession) { final JSONArray categories = singleSession.getJSONArray("categories"); for (int categoryCounter = 0; categoryCounter < categories.length(); categoryCounter++) {