feat: just return the basic log, no data anyhow

stabledata · Oct 5, 2024 · 43a3b62 · 43a3b62
1 parent eee4f6c
commit 43a3b62
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 26 deletions.
diff --git a/src/main/kotlin/com/stabledata/dao/LogsDao.kt b/src/main/kotlin/com/stabledata/dao/LogsDao.kt
@@ -1,5 +1,6 @@
 package com.stabledata.dao
 
+import kotlinx.serialization.Serializable
 import org.jetbrains.exposed.sql.Table
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
@@ -9,6 +10,7 @@ import java.util.*
 /**
  * LogEntry records every single event that is synchronized across team workspaces in Stable
  */
+@Serializable
 data class LogEntry (
     val id: String,
     val teamId: String,

diff --git a/src/main/kotlin/com/stabledata/endpoint/SchemaCreateCollectionRoute.kt b/src/main/kotlin/com/stabledata/endpoint/SchemaCreateCollectionRoute.kt
@@ -5,7 +5,6 @@ import com.stabledata.DatabaseOperations
 import com.stabledata.dao.CollectionsTable
 import com.stabledata.dao.LogsTable
 import com.stabledata.endpoint.io.CollectionRequest
-import com.stabledata.endpoint.io.CollectionsResponse
 import com.stabledata.plugins.JWT_NAME
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.http.*
@@ -57,11 +56,7 @@ fun Application.configureCreateCollectionRoute() {
 
                     return@post call.respond(
                         HttpStatusCode.OK,
-                        CollectionsResponse(
-                            id = collection.id,
-                            eventId = envelope.eventId,
-                            confirmedAt = finalLogEntry.confirmedAt
-                        )
+                        finalLogEntry
                     )
 
                 } catch (e: ExposedSQLException) {

diff --git a/src/main/kotlin/com/stabledata/endpoint/SchemaDeleteCollectionRoute.kt b/src/main/kotlin/com/stabledata/endpoint/SchemaDeleteCollectionRoute.kt
@@ -6,7 +6,6 @@ import com.stabledata.dao.CollectionDeleteFailedException
 import com.stabledata.dao.CollectionsTable
 import com.stabledata.dao.LogsTable
 import com.stabledata.endpoint.io.CollectionRequest
-import com.stabledata.endpoint.io.CollectionsResponse
 import com.stabledata.plugins.JWT_NAME
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.http.*
@@ -47,11 +46,7 @@ fun Application.configureDeleteCollectionRoute() {
 
                     return@post call.respond(
                         HttpStatusCode.OK,
-                        CollectionsResponse(
-                            id = collection.id,
-                            eventId = envelope.eventId,
-                            confirmedAt = finalLogEntry.confirmedAt
-                        )
+                        finalLogEntry
                     )
                 } catch (e: CollectionDeleteFailedException) {
                     logger.error { "Delete collection transaction failed at delete query: ${e.localizedMessage}" }

diff --git a/src/main/kotlin/com/stabledata/endpoint/SchemaUpdateCollectionRoute.kt b/src/main/kotlin/com/stabledata/endpoint/SchemaUpdateCollectionRoute.kt
@@ -5,7 +5,6 @@ import com.stabledata.dao.CollectionUpdateFailedException
 import com.stabledata.dao.CollectionsTable
 import com.stabledata.dao.LogsTable
 import com.stabledata.endpoint.io.CollectionRequest
-import com.stabledata.endpoint.io.CollectionsResponse
 import com.stabledata.plugins.JWT_NAME
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.http.*
@@ -46,11 +45,7 @@ fun Application.configureUpdateCollectionRoute() {
 
                     return@post call.respond(
                         HttpStatusCode.OK,
-                        CollectionsResponse(
-                            id = collection.id,
-                            eventId = envelope.eventId,
-                            confirmedAt = finalLogEntry.confirmedAt
-                        )
+                        finalLogEntry
                     )
                 } catch (e: CollectionUpdateFailedException) {
                     logger.error { "Update collection transaction failed at update query: ${e.localizedMessage}" }

diff --git a/src/main/kotlin/com/stabledata/endpoint/io/SchemaEndpointsIO.kt b/src/main/kotlin/com/stabledata/endpoint/io/SchemaEndpointsIO.kt
@@ -23,11 +23,4 @@ data class CollectionRequest (
             return jsonParser.decodeFromString<CollectionRequest>(json)
         }
     }
-}
-
-@Serializable
-data class CollectionsResponse (
-    val id: String,
-    val eventId: String,
-    val confirmedAt: Long?
-)
+}