Skip to content

Commit bb32d34

Browse files
authored
Merge pull request #1638 from ArtyMaury/add-devfestnantes-2025
add devfestnantes 2025
2 parents 75d6a13 + b15ba54 commit bb32d34

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

backend/datastore/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/datastore/ConferenceId.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ enum class ConferenceId(val id: String) {
1717
DroidconNYC2023("droidconnyc2023"),
1818
DevFestNantes2023("devfestnantes2023"),
1919
DevFestNantes2024("devfestnantes2024"),
20+
DevFestNantes2025("devfestnantes2025"),
2021
SwiftConnection2023("swiftconnection2023"),
2122
DroidConLisbon2023("droidconlisbon2023"),
2223
DevFestGeorgia2023("devfestgeorgia2023"),

backend/datastore/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/datastore/DataStore.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,7 @@ class DataStore {
632632
ConferenceId.DroidConSF2022 -> listOf("2022-06-02", "2022-06-03")
633633
ConferenceId.DevFestNantes2022 -> listOf("2022-10-20", "2022-10-21")
634634
ConferenceId.DevFestNantes2024 -> listOf("2024-10-17", "2024-10-18")
635+
ConferenceId.DevFestNantes2025 -> listOf("2025-10-16", "2025-10-17")
635636
ConferenceId.FrenchKit2022 -> listOf("2022-09-29", "2022-09-30")
636637
ConferenceId.GraphQLSummit2022 -> listOf("2022-10-04", "2022-10-05")
637638
ConferenceId.DroidConLondon2022 -> listOf("2022-10-27", "2022-10-28")

backend/service-import/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/import/DevFestNantes.kt

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ private val okHttpClient = OkHttpClient.Builder()
4949
private val baseUrl2022 = "https://raw.githubusercontent.com/GDG-Nantes/Devfest2022/master/"
5050
private val baseUrl2023 = "https://raw.githubusercontent.com/GDG-Nantes/Devfest2023/main/"
5151
private val baseUrl2024 = "https://raw.githubusercontent.com/GDG-Nantes/Devfest2024/main/"
52+
private val baseUrl2025 = "https://raw.githubusercontent.com/GDG-Nantes/Devfest2025/main/"
5253
private val json = Json {
5354
ignoreUnknownKeys = true
5455
}
@@ -64,7 +65,8 @@ suspend fun importDefvestNantes2022() =
6465
LocalDate(2022, 10, 21)
6566
),
6667
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2022/master/src/images/home/album/wide/amphi.jpg",
67-
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2022/master/src/images/plan-cite-blanc.png"
68+
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2022/master/src/images/plan-cite-blanc.png",
69+
""
6870
).import()
6971

7072
suspend fun importDefvestNantes2023() = DevFestNantes(
@@ -77,7 +79,8 @@ suspend fun importDefvestNantes2023() = DevFestNantes(
7779
LocalDate(2023, 10, 20)
7880
),
7981
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2023/main/src/images/home/album/wide/800.jpg",
80-
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2023/main/src/images/plan-cite-transparent.png"
82+
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2023/main/src/images/plan-cite-transparent.png",
83+
""
8184
).import()
8285

8386
suspend fun importDefvestNantes2024() = DevFestNantes(
@@ -90,9 +93,25 @@ suspend fun importDefvestNantes2024() = DevFestNantes(
9093
LocalDate(2024, 10, 18)
9194
),
9295
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2024/main/src/images/home/album/wide/2000.jpg",
93-
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2024/main/src/images/plan-cite-transparent.png"
96+
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2024/main/src/images/plan-cite-transparent.png",
97+
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2024/main/static"
9498
).import()
9599

100+
suspend fun importDefvestNantes2025() = DevFestNantes(
101+
baseUrl2025,
102+
"Devfest2025",
103+
"main",
104+
ConferenceId.DevFestNantes2025.id,
105+
listOf(
106+
LocalDate(2025, 10, 16),
107+
LocalDate(2025, 10, 17)
108+
),
109+
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2025/main/src/images/home/album/equipe-amphi.jpg",
110+
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2025/main/src/images/plan-cite-transparent.png",
111+
"https://raw.githubusercontent.com/GDG-Nantes/Devfest2025/main/src/images/speakers/"
112+
).import()
113+
114+
96115
class DevFestNantes(
97116
private val baseUrl: String,
98117
private val confId: String,
@@ -101,6 +120,7 @@ class DevFestNantes(
101120
private val days: List<LocalDate>,
102121
private val venueImageUrl: String,
103122
private val venueFloorPlanUrl: String,
123+
private val speakerImagesBaseUrl: String,
104124
) {
105125
private suspend fun getUrl(url: String): String {
106126
val request = Request(url.toHttpUrl())
@@ -278,7 +298,7 @@ class DevFestNantes(
278298
}
279299
DLink(key = it.key, url = url)
280300
},
281-
photoUrl = speaker.get("photoUrl")?.asString?.let { "${baseUrl}static$it" },
301+
photoUrl = speaker.get("photoUrl")?.asString?.let { "${speakerImagesBaseUrl}$it" },
282302
companyLogoUrl = speaker.get("companyLogo")?.asString?.let { "${baseUrl}src$it" },
283303
city = speaker.get("city")?.asString,
284304
)

backend/service-import/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/import/Main.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ private suspend fun update(conf: String?): Int {
106106
ConferenceId.DevFestNantes2022 -> importDefvestNantes2022()
107107
ConferenceId.DevFestNantes2023 -> importDefvestNantes2023()
108108
ConferenceId.DevFestNantes2024 -> importDefvestNantes2024()
109+
ConferenceId.DevFestNantes2025 -> importDefvestNantes2025()
109110
ConferenceId.FrenchKit2022 -> FrenchKit.import()
110111
ConferenceId.GraphQLSummit2022 -> GraphQLSummit.import()
111112
ConferenceId.DroidConLondon2022 -> Sessionize.importDroidConLondon2022()

0 commit comments

Comments
 (0)