feat(shared): save address in local database for event sessions.

GerardPaligot · May 11, 2024 · c7b76e3 · c7b76e3
1 parent ebc6f44
commit c7b76e3
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 12 deletions.
diff --git a/shared/core/src/androidMain/kotlin/org/gdglille/devfest/database/DatabaseWrapper.kt b/shared/core/src/androidMain/kotlin/org/gdglille/devfest/database/DatabaseWrapper.kt
@@ -5,6 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 import org.gdglille.devfest.db.Conferences4HallDatabase
 import org.gdglille.devfest.db.Event
+import org.gdglille.devfest.db.EventSession
 import org.gdglille.devfest.db.Partner
 
 actual class DatabaseWrapper(val context: Context) {
@@ -20,9 +21,10 @@ actual class DatabaseWrapper(val context: Context) {
             }
         )
         return Conferences4HallDatabase.invoke(
-            driver,
-            Event.Adapter(formatted_addressAdapter = listOfStringsAdapter),
-            Partner.Adapter(formatted_addressAdapter = listOfStringsAdapter)
+            driver = driver,
+            EventAdapter = Event.Adapter(formatted_addressAdapter = listOfStringsAdapter),
+            EventSessionAdapter = EventSession.Adapter(formatted_addressAdapter = listOfStringsAdapter),
+            PartnerAdapter = Partner.Adapter(formatted_addressAdapter = listOfStringsAdapter)
         )
     }
 }
diff --git a/shared/core/src/commonMain/kotlin/org/gdglille/devfest/database/mappers/SessionMappers.kt b/shared/core/src/commonMain/kotlin/org/gdglille/devfest/database/mappers/SessionMappers.kt
@@ -21,6 +21,7 @@ import org.gdglille.devfest.db.TalkSessionWithSpeakers
 import org.gdglille.devfest.extensions.formatHoursMinutes
 import org.gdglille.devfest.models.ScheduleItemV4
 import org.gdglille.devfest.models.Session
+import org.gdglille.devfest.models.ui.AddressUi
 import org.gdglille.devfest.models.ui.CategoryUi
 import org.gdglille.devfest.models.ui.EventSessionItemUi
 import org.gdglille.devfest.models.ui.FormatUi
@@ -115,6 +116,11 @@ fun SelectBreakSessions.convertEventSessionItemUi(strings: Strings): EventSessio
     val endDateTime = end_time.toLocalDateTime()
     val diff = endDateTime.toInstant(TimeZone.UTC).minus(startDateTime.toInstant(TimeZone.UTC))
     val timeInMinutes = diff.inWholeMinutes.toInt()
+    val address = if (formatted_address != null && address != null && latitude != null && longitude != null) {
+        AddressUi(formatted_address.toImmutableList(), address, latitude, longitude)
+    } else {
+        null
+    }
     return EventSessionItemUi(
         id = id,
         title = title,
@@ -125,7 +131,8 @@ fun SelectBreakSessions.convertEventSessionItemUi(strings: Strings): EventSessio
         startTime = start_time,
         endTime = end_time,
         timeInMinutes = timeInMinutes,
-        time = strings.texts.scheduleMinutes(timeInMinutes)
+        time = strings.texts.scheduleMinutes(timeInMinutes),
+        addressUi = address
     )
 }
 
@@ -134,6 +141,11 @@ fun SelectEventSessionById.convertEventSessionItemUi(strings: Strings): EventSes
     val endDateTime = end_time.toLocalDateTime()
     val diff = endDateTime.toInstant(TimeZone.UTC).minus(startDateTime.toInstant(TimeZone.UTC))
     val timeInMinutes = diff.inWholeMinutes.toInt()
+    val address = if (formatted_address != null && address != null && latitude != null && longitude != null) {
+        AddressUi(formatted_address.toImmutableList(), address, latitude, longitude)
+    } else {
+        null
+    }
     return EventSessionItemUi(
         id = id,
         title = title,
@@ -144,7 +156,8 @@ fun SelectEventSessionById.convertEventSessionItemUi(strings: Strings): EventSes
         startTime = start_time,
         endTime = end_time,
         timeInMinutes = timeInMinutes,
-        time = strings.texts.scheduleMinutes(timeInMinutes)
+        time = strings.texts.scheduleMinutes(timeInMinutes),
+        addressUi = address
     )
 }
 
@@ -258,5 +271,9 @@ fun Session.Event.convertToDb(eventId: String): EventSession = EventSession(
     id = this.id,
     title = this.title,
     description = this.description,
+    formatted_address = address?.formatted,
+    address = address?.address,
+    latitude = address?.lat,
+    longitude = address?.lng,
     event_id = eventId
 )
diff --git a/shared/core/src/commonMain/sqldelight/org/gdglille/devfest/db/28.sqm b/shared/core/src/commonMain/sqldelight/org/gdglille/devfest/db/28.sqm
@@ -0,0 +1,4 @@
+ALTER TABLE EventSession ADD COLUMN formatted_address TEXT;
+ALTER TABLE EventSession ADD COLUMN address TEXT;
+ALTER TABLE EventSession ADD COLUMN latitude TEXT;
+ALTER TABLE EventSession ADD COLUMN longitude TEXT;
diff --git a/shared/core/src/commonMain/sqldelight/org/gdglille/devfest/db/Session.sq b/shared/core/src/commonMain/sqldelight/org/gdglille/devfest/db/Session.sq
@@ -1,4 +1,6 @@
+import kotlin.collections.List;
 import kotlin.Boolean;
+import kotlin.String;
 
 CREATE TABLE Session (
 id TEXT NOT NULL PRIMARY KEY,
@@ -19,6 +21,10 @@ CREATE TABLE EventSession(
 id TEXT NOT NULL PRIMARY KEY,
 title TEXT NOT NULL,
 description TEXT,
+formatted_address TEXT AS List<String>,
+address TEXT,
+latitude REAL,
+longitude REAL,
 event_id TEXT NOT NULL
 );
 
@@ -66,15 +72,17 @@ ORDER BY start_time;
 selectBreakSessions:
 SELECT Session.id, Session.order_, Session.event_id, Session.date, Session.start_time,
 Session.end_time, Session.room, Session.session_event_id, EventSession.title,
-EventSession.description
+EventSession.description, EventSession.formatted_address, EventSession.address,
+EventSession.latitude, EventSession.longitude
 FROM Session
 INNER JOIN EventSession ON Session.session_event_id = EventSession.id
 WHERE Session.event_id = ?
 ORDER BY start_time;
 
 selectEventSessionById:
 SELECT Session.id, Session.order_, Session.event_id, Session.start_time, Session.end_time,
-Session.room, Session.session_event_id, EventSession.title, EventSession.description
+Session.room, Session.session_event_id, EventSession.title, EventSession.description,
+EventSession.formatted_address, EventSession.address, EventSession.latitude, EventSession.longitude
 FROM Session
 INNER JOIN EventSession ON Session.session_event_id = EventSession.id
 WHERE Session.event_id = ? AND Session.session_event_id = ?;

diff --git a/shared/core/src/iosMain/kotlin/org/gdglille/devfest/database/DatabaseWrapper.kt b/shared/core/src/iosMain/kotlin/org/gdglille/devfest/database/DatabaseWrapper.kt
@@ -4,6 +4,7 @@ import app.cash.sqldelight.driver.native.NativeSqliteDriver
 import co.touchlab.sqliter.DatabaseConfiguration
 import org.gdglille.devfest.db.Conferences4HallDatabase
 import org.gdglille.devfest.db.Event
+import org.gdglille.devfest.db.EventSession
 import org.gdglille.devfest.db.Partner
 
 actual class DatabaseWrapper {
@@ -18,9 +19,10 @@ actual class DatabaseWrapper {
             }
         )
         return Conferences4HallDatabase.invoke(
-            driver,
-            Event.Adapter(formatted_addressAdapter = listOfStringsAdapter),
-            Partner.Adapter(formatted_addressAdapter = listOfStringsAdapter)
+            driver = driver,
+            EventAdapter = Event.Adapter(formatted_addressAdapter = listOfStringsAdapter),
+            EventSessionAdapter = EventSession.Adapter(formatted_addressAdapter = listOfStringsAdapter),
+            PartnerAdapter = Partner.Adapter(formatted_addressAdapter = listOfStringsAdapter)
         )
     }
 }
diff --git a/shared/ui-models/src/commonMain/kotlin/org/gdglille/devfest/models/ui/AddressUi.kt b/shared/ui-models/src/commonMain/kotlin/org/gdglille/devfest/models/ui/AddressUi.kt
@@ -0,0 +1,10 @@
+package org.gdglille.devfest.models.ui
+
+import kotlinx.collections.immutable.ImmutableList
+
+data class AddressUi(
+    val formattedAddress: ImmutableList<String>,
+    val address: String,
+    val latitude: Double,
+    val longitude: Double
+)
diff --git a/shared/ui-models/src/commonMain/kotlin/org/gdglille/devfest/models/ui/TalkItemUi.kt b/shared/ui-models/src/commonMain/kotlin/org/gdglille/devfest/models/ui/TalkItemUi.kt
@@ -63,7 +63,8 @@ data class EventSessionItemUi(
     val endTime: String,
     val timeInMinutes: Int,
     val time: String,
-    val room: String
+    val room: String,
+    val addressUi: AddressUi?
 ) : SessionItemUi() {
     companion object {
         val fakePause = EventSessionItemUi(
@@ -76,7 +77,8 @@ data class EventSessionItemUi(
             time = "20 minutes",
             room = "Salle Lumière",
             title = "Pause ☕️",
-            description = null
+            description = null,
+            addressUi = null
         )
     }
 }