feat(backend): published property in event table.

GerardPaligot · Sep 28, 2023 · c2b9fec · c2b9fec
1 parent ecfc942
commit c2b9fec
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
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
@@ -10,7 +10,9 @@ class EventDao(
     private val projectName: String,
     private val database: BasicDatabase
 ) {
-    suspend fun list(): List<EventDb> = database.getAll(projectName)
+    suspend fun list(): List<EventDb> = database
+        .getAll<EventDb>(projectName)
+        .filter { it.published }
     suspend fun get(id: String): EventDb? = database.get(projectName, id)
     suspend fun getVerified(id: String, apiKey: String?): EventDb {
         val eventDb = database.get<EventDb>(projectName, id)

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
@@ -90,6 +90,7 @@ data class EventDb(
     val linkedinUrl: String? = null,
     val faqLink: String? = null,
     val codeOfConductLink: String? = null,
+    val published: Boolean = false,
     val updatedAt: Long = System.currentTimeMillis(),
     val agendaUpdatedAt: Long = System.currentTimeMillis()
 )

diff --git a/backend/src/main/java/org/gdglille/devfest/backend/events/EventMappers.kt b/backend/src/main/java/org/gdglille/devfest/backend/events/EventMappers.kt
@@ -190,6 +190,7 @@ fun EventInput.convertToDb(event: EventDb, addressDb: AddressDb) = EventDb(
     linkedinUrl = this.linkedinUrl,
     faqLink = this.faqLink,
     codeOfConductLink = this.codeOfConductLink,
+    published = published,
     updatedAt = this.updatedAt
 )
 

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
@@ -46,11 +46,11 @@ class EventRepository(
         val now = LocalDateTime.now()
         return EventList(
             future = events
-                .filter { LocalDateTime.parse(it.startDate.dropLast(1)).isAfter(now) }
+                .filter { LocalDateTime.parse(it.endDate.dropLast(1)).isAfter(now) }
                 .sortedBy { it.startDate },
             past = events
                 .filter { LocalDateTime.parse(it.startDate.dropLast(1)).isBefore(now) }
-                .sortedBy { it.startDate }
+                .sortedBy { it.endDate }
         )
     }
 

diff --git a/models/src/commonMain/kotlin/org/gdglille/devfest/models/inputs/EventInput.kt b/models/src/commonMain/kotlin/org/gdglille/devfest/models/inputs/EventInput.kt
@@ -125,6 +125,7 @@ data class EventInput(
     val linkedinUrl: String?,
     @SerialName("faq_link")
     val faqLink: String,
+    val published: Boolean,
     @SerialName("code_of_conduct_link")
     val codeOfConductLink: String,
     @SerialName("update_at")