chore: update ktlint

GerardPaligot · Apr 7, 2024 · 5daee05 · 5daee05
1 parent 5f04017
commit 5daee05
Show file tree

Hide file tree

Showing 118 changed files with 527 additions and 378 deletions.
diff --git a/androidApp/src/main/java/org/gdglille/devfest/android/MainActivity.kt b/androidApp/src/main/java/org/gdglille/devfest/android/MainActivity.kt
@@ -54,9 +54,9 @@ class MainActivity : ComponentActivity() {
                 enableEdgeToEdge(
                     statusBarStyle = SystemBarStyle.auto(
                         android.graphics.Color.TRANSPARENT,
-                        android.graphics.Color.TRANSPARENT,
+                        android.graphics.Color.TRANSPARENT
                     ) { inDarkTheme },
-                    navigationBarStyle = SystemBarStyle.auto(lightScrim, darkScrim) { inDarkTheme },
+                    navigationBarStyle = SystemBarStyle.auto(lightScrim, darkScrim) { inDarkTheme }
                 )
                 onDispose {}
             }

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/categories/CategoryDao.kt b/backend/src/main/java/org/gdglille/devfest/backend/categories/CategoryDao.kt
@@ -19,16 +19,19 @@ class CategoryDao(private val database: Database) {
     )
 
     suspend fun createOrUpdate(eventId: String, item: CategoryDb) {
-        if (item.id == null) database.insert(
-            eventId = eventId,
-            collectionName = CollectionName
-        ) { item.copy(id = it) }
-        else database.update(
-            eventId = eventId,
-            collectionName = CollectionName,
-            id = item.id,
-            item = item
-        )
+        if (item.id == null) {
+            database.insert(
+                eventId = eventId,
+                collectionName = CollectionName
+            ) { item.copy(id = it) }
+        } else {
+            database.update(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = item.id,
+                item = item
+            )
+        }
     }
 
     suspend fun deleteDiff(eventId: String, ids: List<String>) {

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/events/EventDao.kt b/backend/src/main/java/org/gdglille/devfest/backend/events/EventDao.kt
@@ -24,12 +24,15 @@ class EventDao(
 
     suspend fun createOrUpdate(event: EventDb) {
         val existing = database.get<EventDb>(projectName, event.slugId)
-        if (existing == null) database.insert(projectName, event.slugId, event)
-        else database.update(
-            projectName,
-            event.slugId,
-            event.copy(updatedAt = System.currentTimeMillis())
-        )
+        if (existing == null) {
+            database.insert(projectName, event.slugId, event)
+        } else {
+            database.update(
+                projectName,
+                event.slugId,
+                event.copy(updatedAt = System.currentTimeMillis())
+            )
+        }
     }
 
     suspend fun updateMenus(eventId: String, apiKey: String, menus: List<LunchMenuDb>) {

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/events/EventDb.kt b/backend/src/main/java/org/gdglille/devfest/backend/events/EventDb.kt
@@ -37,7 +37,7 @@ data class OpenPlannerConfigurationDb(
 data class BilletWebConfigurationDb(
     val eventId: String = "",
     val userId: String = "",
-    val apiKey: String = "",
+    val apiKey: String = ""
 )
 
 data class WldConfigurationDb(

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/events/EventRepository.kt b/backend/src/main/java/org/gdglille/devfest/backend/events/EventRepository.kt
@@ -124,8 +124,9 @@ class EventRepository(
                 async {
                     val scheduleItems = it.value.map {
                         async {
-                            if (it.talkId == null) it.convertToModel(null)
-                            else {
+                            if (it.talkId == null) {
+                                it.convertToModel(null)
+                            } else {
                                 val talk = talkDao.get(eventDb.slugId, it.talkId)
                                     ?: return@async it.convertToModel(null)
                                 it.convertToModel(

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/events/EventRepositoryV2.kt b/backend/src/main/java/org/gdglille/devfest/backend/events/EventRepositoryV2.kt
@@ -98,8 +98,9 @@ class EventRepositoryV2(
         formats: List<FormatDb>,
         eventDb: EventDb
     ) = async {
-        if (schedule.talkId == null) schedule.convertToModel(null)
-        else {
+        if (schedule.talkId == null) {
+            schedule.convertToModel(null)
+        } else {
             val talk = talks.find { it.id == schedule.talkId }
                 ?: return@async schedule.convertToModel(null)
             val speakersTalk = speakers.filter { talk.speakerIds.contains(it.id) }

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/formats/FormatDao.kt b/backend/src/main/java/org/gdglille/devfest/backend/formats/FormatDao.kt
@@ -19,16 +19,19 @@ class FormatDao(private val database: Database) {
     )
 
     suspend fun createOrUpdate(eventId: String, item: FormatDb) {
-        if (item.id == null) database.insert(
-            eventId = eventId,
-            collectionName = CollectionName
-        ) { item.copy(id = it) }
-        else database.update(
-            eventId = eventId,
-            collectionName = CollectionName,
-            id = item.id,
-            item = item
-        )
+        if (item.id == null) {
+            database.insert(
+                eventId = eventId,
+                collectionName = CollectionName
+            ) { item.copy(id = it) }
+        } else {
+            database.update(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = item.id,
+                item = item
+            )
+        }
     }
 
     suspend fun deleteDiff(eventId: String, ids: List<String>) {

diff --git a/...nd/src/main/java/org/gdglille/devfest/backend/internals/helpers/database/BasicDatabase.kt b/...nd/src/main/java/org/gdglille/devfest/backend/internals/helpers/database/BasicDatabase.kt
@@ -7,8 +7,11 @@ interface BasicDatabase {
     suspend fun count(collectionName: String): Long
     suspend fun <T : Any> get(collectionName: String, id: String, clazz: KClass<T>): T?
     suspend fun <T : Any> getAll(collectionName: String, clazz: KClass<T>): List<T>
-    suspend fun <T : Any> query(collectionName: String, clazz: KClass<T>, vararg ops: WhereOperation):
-        List<Pair<String, T>>
+    suspend fun <T : Any> query(
+        collectionName: String,
+        clazz: KClass<T>,
+        vararg ops: WhereOperation
+    ): List<Pair<String, T>>
 
     suspend fun <T : Any> insert(collectionName: String, eventId: String, item: T)
     suspend fun <T : Any> update(collectionName: String, eventId: String, item: T)

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/internals/helpers/storage/Storage.kt b/backend/src/main/java/org/gdglille/devfest/backend/internals/helpers/storage/Storage.kt
@@ -7,8 +7,11 @@ interface Storage {
 
     object Factory {
         fun create(storage: CloudStorage, bucketName: String, isAppEngine: Boolean): Storage {
-            return if (isAppEngine) BucketStorage(storage, bucketName)
-            else LocalStorage(bucketName)
+            return if (isAppEngine) {
+                BucketStorage(storage, bucketName)
+            } else {
+                LocalStorage(bucketName)
+            }
         }
     }
 }

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/jobs/JobRepository.kt b/backend/src/main/java/org/gdglille/devfest/backend/jobs/JobRepository.kt
@@ -27,8 +27,11 @@ class JobRepository(
         val jobsDb = jobs.hits
             .filter { it.title.contains("spontaneous_application").not() }
             .map { hit ->
-                val id = if (hit.companyId.length < MaxPartnerChar) hit.companyId
-                else "${hit.companyId.substring(0..MaxPartnerChar)}-${hit.publishDate}"
+                val id = if (hit.companyId.length < MaxPartnerChar) {
+                    hit.companyId
+                } else {
+                    "${hit.companyId.substring(0..MaxPartnerChar)}-${hit.publishDate}"
+                }
                 val partnerId = partners.find { it.wldId == hit.companyId }?.id
                     ?: throw NotAcceptableException("Partner WLD ${hit.companyId} not found")
                 hit.convertToDb(id, partnerId)

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/partners/PartnerDao.kt b/backend/src/main/java/org/gdglille/devfest/backend/partners/PartnerDao.kt
@@ -21,22 +21,28 @@ class PartnerDao(private val database: Database, private val storage: Storage) {
         }
 
     suspend fun createOrUpdate(eventId: String, partner: PartnerDb): String = coroutineScope {
-        if (partner.id == "") return@coroutineScope database.insert(
-            eventId = eventId,
-            collectionName = CollectionName
-        ) { partner.copy(id = it) }
+        if (partner.id == "") {
+            return@coroutineScope database.insert(
+                eventId = eventId,
+                collectionName = CollectionName
+            ) { partner.copy(id = it) }
+        }
         val existing = database.get<PartnerDb>(eventId = eventId, collectionName = CollectionName, id = partner.id)
-        if (existing == null) database.insert(
-            eventId = eventId, collectionName = CollectionName,
-            id = partner.id,
-            item = partner
-        )
-        else database.update(
-            eventId = eventId,
-            collectionName = CollectionName,
-            id = partner.id,
-            item = partner
-        )
+        if (existing == null) {
+            database.insert(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = partner.id,
+                item = partner
+            )
+        } else {
+            database.update(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = partner.id,
+                item = partner
+            )
+        }
         return@coroutineScope partner.id
     }
 

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/qanda/QAndADao.kt b/backend/src/main/java/org/gdglille/devfest/backend/qanda/QAndADao.kt
@@ -21,16 +21,19 @@ class QAndADao(private val database: Database) {
     )
 
     suspend fun createOrUpdate(eventId: String, item: QAndADb) {
-        if (item.id == null) database.insert(
-            eventId = eventId,
-            collectionName = CollectionName
-        ) { item.copy(id = it) }
-        else database.update(
-            eventId = eventId,
-            collectionName = CollectionName,
-            id = item.id,
-            item = item
-        )
+        if (item.id == null) {
+            database.insert(
+                eventId = eventId,
+                collectionName = CollectionName
+            ) { item.copy(id = it) }
+        } else {
+            database.update(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = item.id,
+                item = item
+            )
+        }
     }
 
     suspend fun hasQAndA(eventId: String): Boolean =

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/schedulers/ScheduleItemDao.kt b/backend/src/main/java/org/gdglille/devfest/backend/schedulers/ScheduleItemDao.kt
@@ -20,13 +20,16 @@ class ScheduleItemDao(private val database: Database) {
 
     suspend fun createOrUpdate(eventId: String, item: ScheduleDb) {
         val existing = database.get<ScheduleDb>(eventId = eventId, collectionName = CollectionName, id = item.id)
-        if (existing == null) database.insert(
-            eventId = eventId,
-            collectionName = CollectionName,
-            id = item.id,
-            item = item
-        )
-        else database.update(eventId = eventId, collectionName = CollectionName, id = item.id, item = item)
+        if (existing == null) {
+            database.insert(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = item.id,
+                item = item
+            )
+        } else {
+            database.update(eventId = eventId, collectionName = CollectionName, id = item.id, item = item)
+        }
     }
 
     suspend fun delete(eventId: String, id: String) = database.delete(

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/schedulers/ScheduleRepository.kt b/backend/src/main/java/org/gdglille/devfest/backend/schedulers/ScheduleRepository.kt
@@ -58,7 +58,9 @@ class ScheduleRepository(
             val category = categoryDao.get(eventId, talkDb.category)
             val format = formatDao.get(eventId, talkDb.format)
             talkDb.convertToModel(speakers, category, format, eventDb)
-        } else null
+        } else {
+            null
+        }
         return@coroutineScope scheduleItem.convertToModel(talk)
     }
 

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/speakers/SpeakerDao.kt b/backend/src/main/java/org/gdglille/devfest/backend/speakers/SpeakerDao.kt
@@ -55,23 +55,28 @@ class SpeakerDao(private val database: Database, private val storage: Storage) {
     }
 
     suspend fun createOrUpdate(eventId: String, speaker: SpeakerDb): String = coroutineScope {
-        if (speaker.id == "") return@coroutineScope database.insert(
-            eventId = eventId,
-            collectionName = CollectionName
-        ) { speaker.copy(id = it) }
+        if (speaker.id == "") {
+            return@coroutineScope database.insert(
+                eventId = eventId,
+                collectionName = CollectionName
+            ) { speaker.copy(id = it) }
+        }
         val existing = database.get<SpeakerDb>(eventId = eventId, collectionName = CollectionName, id = speaker.id)
-        if (existing == null) database.insert(
-            eventId = eventId,
-            collectionName = CollectionName,
-            id = speaker.id,
-            item = speaker
-        )
-        else database.update(
-            eventId = eventId,
-            collectionName = CollectionName,
-            id = speaker.id,
-            item = speaker
-        )
+        if (existing == null) {
+            database.insert(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = speaker.id,
+                item = speaker
+            )
+        } else {
+            database.update(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = speaker.id,
+                item = speaker
+            )
+        }
         return@coroutineScope speaker.id
     }
 

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/speakers/SpeakerMappers.kt b/backend/src/main/java/org/gdglille/devfest/backend/speakers/SpeakerMappers.kt
@@ -10,12 +10,20 @@ fun org.gdglille.devfest.backend.third.parties.conferencehall.Speaker.convertToD
         bio = this.bio ?: "",
         company = this.company,
         photoUrl = url,
-        twitter = if (this.twitter == null) null
-        else if (this.twitter.contains("twitter.com")) this.twitter
-        else "https://twitter.com/${this.twitter}",
-        github = if (this.github == null) null
-        else if (this.github.contains("github.com")) this.github
-        else "https://github.com/${this.github}",
+        twitter = if (this.twitter == null) {
+            null
+        } else if (this.twitter.contains("twitter.com")) {
+            this.twitter
+        } else {
+            "https://twitter.com/${this.twitter}"
+        },
+        github = if (this.github == null) {
+            null
+        } else if (this.github.contains("github.com")) {
+            this.github
+        } else {
+            "https://github.com/${this.github}"
+        },
         linkedin = null
     )
 

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/talks/TalkDao.kt b/backend/src/main/java/org/gdglille/devfest/backend/talks/TalkDao.kt
@@ -46,18 +46,23 @@ class TalkDao(private val database: Database) {
     }
 
     suspend fun createOrUpdate(eventId: String, talk: TalkDb): String = coroutineScope {
-        if (talk.id == "") return@coroutineScope database.insert(
-            eventId = eventId,
-            collectionName = CollectionName
-        ) { talk.copy(id = it) }
+        if (talk.id == "") {
+            return@coroutineScope database.insert(
+                eventId = eventId,
+                collectionName = CollectionName
+            ) { talk.copy(id = it) }
+        }
         val existing = database.get<TalkDb>(eventId = eventId, collectionName = CollectionName, id = talk.id)
-        if (existing == null) database.insert(
-            eventId = eventId,
-            collectionName = CollectionName,
-            id = talk.id,
-            item = talk
-        )
-        else database.update(eventId = eventId, collectionName = CollectionName, id = talk.id, item = talk)
+        if (existing == null) {
+            database.insert(
+                eventId = eventId,
+                collectionName = CollectionName,
+                id = talk.id,
+                item = talk
+            )
+        } else {
+            database.update(eventId = eventId, collectionName = CollectionName, id = talk.id, item = talk)
+        }
         return@coroutineScope talk.id
     }
 

diff --git a/...n/java/org/gdglille/devfest/backend/third/parties/conferencehall/ConferenceHallMappers.kt b/...n/java/org/gdglille/devfest/backend/third/parties/conferencehall/ConferenceHallMappers.kt
@@ -30,5 +30,5 @@ fun Talk.convertToDb(): TalkDb = TalkDb(
     category = this.categories,
     format = this.formats,
     language = this.language,
-    speakerIds = this.speakers,
+    speakerIds = this.speakers
 )