paug · martinbonnin · Mar 6, 2026 · Mar 6, 2026
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
@@ -31,6 +31,7 @@ tasks.register("run", JavaExec::class.java) {
     classpath(configurations.getByName("runtimeClasspath"))
     classpath(kotlin.target.compilations.getByName("main").output.classesDirs)
     mainClass.set("androidmakers.service.MainKt")
+    debug = true
 }
 
 configureDeploy("service", "androidmakers.service.MainKt")
diff --git a/service/graphql/schema.graphqls b/service/graphql/schema.graphqls
@@ -3,6 +3,11 @@ schema {
   mutation: RootMutation
 }
 
+"""
+ A type representing a formatted kotlinx.datetime.Instant
+"""
+scalar GraphQLInstant
+
 scalar GraphQLLocalDate
 
 scalar GraphQLLocalDateTime
@@ -57,12 +62,17 @@ type Conference {
 type FeedItem {
   id: ID!
 
+  createdAt: GraphQLInstant!
+
   title: String!
 
   markdown: Markdown!
 }
 
-type FeedItemFailure
+type FeedItemFailure {
+  message: String!
+}
+
 type FeedItemSuccess {
   feedItem: FeedItem!
 }
@@ -260,8 +270,6 @@ type SpeakerConnection {
 type User {
   id: String!
 
-  email: String!
-
   isAdmin: Boolean!
 }
 
@@ -308,9 +316,9 @@ input ConferenceOrderBy {
 }
 
 input FeedItemInput {
-  title: String!
+  title: String
 
-  markdown: Markdown!
+  markdown: Markdown
 }
 
 input SessionOrderBy {

diff --git a/service/index.yaml b/service/index.yaml
@@ -0,0 +1,7 @@
+indexes:
+
+  - kind: FeedItems
+    ancestor: yes
+    properties:
+      - name: createdAt
+        direction: desc
diff --git a/service/src/main/kotlin/androidmakers/service/context/AuthenticationContext.kt b/service/src/main/kotlin/androidmakers/service/context/AuthenticationContext.kt
@@ -1,19 +1,12 @@
 package androidmakers.service.context
 
-import androidmakers.service.firebaseEmail
 import com.apollographql.apollo.api.ExecutionContext
 
 internal class AuthenticationContext(val uid: String?) : ExecutionContext.Element {
     override val key: ExecutionContext.Key<*>
         get() = Key
 
     companion object Key : ExecutionContext.Key<AuthenticationContext>
-
-    val email: String? by lazy {
-        uid?.let {
-            firebaseEmail(it)
-        }
-    }
 }
 
 internal fun ExecutionContext.uid() = this.get(AuthenticationContext)?.uid

diff --git a/service/src/main/kotlin/androidmakers/service/firebase.kt b/service/src/main/kotlin/androidmakers/service/firebase.kt
@@ -27,10 +27,6 @@ private fun ensureInitialized() {
         }
     }
 }
-fun firebaseEmail(uid: String): String {
-    ensureInitialized()
-    return FirebaseAuth.getInstance().getUser(uid).email
-}
 
 fun String.firebaseUid(): FirebaseUidResult {
     if (this == "testToken") {

diff --git a/service/src/main/kotlin/androidmakers/service/graphql/model.kt b/service/src/main/kotlin/androidmakers/service/graphql/model.kt
@@ -3,13 +3,10 @@
 package androidmakers.service.graphql
 
 import androidmakers.service.Sessionize
-import androidmakers.service.context.AuthenticationContext
-import androidmakers.service.context.bookmarksKeyFactory
-import androidmakers.service.context.datastore
-import androidmakers.service.context.uid
-import androidmakers.service.context.updateMaxAge
-import com.apollographql.apollo.annotations.*
+import androidmakers.service.context.*
+import com.apollographql.apollo.annotations.ApolloExperimental
 import com.apollographql.apollo.api.ExecutionContext
+import com.apollographql.apollo.api.Optional
 import com.apollographql.apollo.execution.StringCoercing
 import com.apollographql.execution.annotation.GraphQLDefault
 import com.apollographql.execution.annotation.GraphQLMutation
@@ -19,8 +16,11 @@ import com.google.cloud.datastore.BooleanValue
 import com.google.cloud.datastore.Cursor
 import com.google.cloud.datastore.Entity
 import com.google.cloud.datastore.Query
-import com.google.rpc.context.AttributeContext
+import com.google.cloud.datastore.StructuredQuery
+import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.toInstant
+import kotlin.time.Clock
 
 const val KIND_BOOKMARKS = "Bookmarks"
 const val KIND_FEED_ITEMS = "FeedItems"
@@ -35,11 +35,11 @@ typealias Markdown = String
 typealias ID = String
 
 class FeedItemInput(
-    val title: String,
-    val markdown: Markdown
+    val title: Optional<String?>,
+    val markdown: Optional<Markdown?>,
 )
 
-internal val adminEmails = setOf("martinbonninandroid@gmail.com", "reno.mathieu@gmail.com")
+internal val adminUids = setOf("AY7jNYS4EpNhRHBxW89LjomGCtl1")
 
 sealed interface FeedItemResult
 
@@ -50,32 +50,69 @@ data class FeedItemSuccess(
 
 class FeedItem(
     val id: ID,
+    val createdAt: GraphQLInstant,
     val title: String,
     val markdown: Markdown
 )
 
 @GraphQLMutation
 class RootMutation {
     fun updateFeedItem(executionContext: ExecutionContext, id: ID, feedItem: FeedItemInput): FeedItemResult {
-        TODO()
-    }
-    fun addFeedItem(executionContext: ExecutionContext, feedItem: FeedItemInput): FeedItemResult {
         val authenticationContext = executionContext.get(AuthenticationContext)!!
-        val email = authenticationContext.email
-        check(email != null) {
-            "Adding to the feed requires authentication"
+        if (authenticationContext.uid !in adminUids) {
+            throw Error("Only admins can add feed items")
         }
 
-        if (email !in adminEmails) {
+        val datastore = executionContext.datastore()
+        val key = datastore.newKeyFactory().setKind(KIND_FEED_ITEMS).newKey(id.toLong())
+        val entity = datastore.get(key)
+        if (entity == null) {
+            return FeedItemFailure("No item found for id $id")
+        }
+        val updatedEntity = Entity.newBuilder(entity)
+            .apply {
+                if (feedItem.title.getOrNull() != null) {
+                    set("title", feedItem.title.getOrThrow())
+                }
+                if (feedItem.markdown.getOrNull() != null) {
+                    set("markdown", feedItem.markdown.getOrThrow())
+                }
+            }
+            .build()
+
+        val newEntity = datastore.put(updatedEntity)
+
+        return FeedItemSuccess(
+            FeedItem(
+                id = id,
+                title = newEntity.getString("title"),
+                markdown = newEntity.getString("markdown"),
+                createdAt = Instant.parse(newEntity.getString("createdAt"))
+            )
+        )
+    }
+
+    fun addFeedItem(executionContext: ExecutionContext, feedItem: FeedItemInput): FeedItemResult {
+        val authenticationContext = executionContext.get(AuthenticationContext)!!
+        if (authenticationContext.uid !in adminUids) {
             throw Error("Only admins can add feed items")
         }
 
         val datastore = executionContext.datastore()
 
+        check(feedItem.title.getOrNull() != null) {
+           "title is required"
+        }
+        check(feedItem.markdown.getOrNull() != null) {
+            "markdown is required"
+        }
         val key = datastore.newKeyFactory().setKind(KIND_FEED_ITEMS).newKey()
+        val now = Clock.System.now()
+
         val entity = Entity.newBuilder(key)!!
-            .set("title", feedItem.title)
-            .set("markdown", feedItem.markdown)
+            .set("title", feedItem.title.getOrThrow())
+            .set("markdown", feedItem.markdown.getOrThrow())
+            .set("createdAt", now.toString())
             .build()
 
         val result = datastore.runInTransaction {
@@ -84,9 +121,10 @@ class RootMutation {
 
         return FeedItemSuccess(
             FeedItem(
-                id = result.key.toString(),
-                title = feedItem.title,
-                markdown = feedItem.markdown
+                id = result.key.id.toString(),
+                title = result.getString("title"),
+                markdown = result.getString("markdown"),
+                createdAt = result.getString("createdAt").toInstant()
             )
         )
     }
@@ -298,6 +336,7 @@ class RootQuery {
 
         val query = Query.newEntityQueryBuilder()
             .setKind(KIND_FEED_ITEMS)
+            .addOrderBy(StructuredQuery.OrderBy.desc("createdAt"))
             .setLimit(first)
             .apply {
               if (after != null) {
@@ -312,9 +351,10 @@ class RootQuery {
         results.forEach { entity ->
             allItems.add(
                 FeedItem(
-                    id = entity.key.toString(),
+                    id = entity.key.id.toString(),
                     title = entity.getString("title"),
-                    markdown = entity.getString("markdown")
+                    markdown = entity.getString("markdown"),
+                    createdAt = entity.getString("createdAt").toInstant(),
                 )
             )
         }
@@ -333,13 +373,12 @@ class RootQuery {
         if (authenticationContext.uid == null) {
             return null
         }
-        return User(id = authenticationContext.uid, email = authenticationContext.email!!, isAdmin = authenticationContext.email in adminEmails)
+        return User(id = authenticationContext.uid, isAdmin = authenticationContext.uid in adminUids)
     }
 }
 
 class User(
     val id: String,
-    val email: String,
     val isAdmin: Boolean
 )
 

diff --git a/service/src/main/kotlin/androidmakers/service/graphql/scalars.kt b/service/src/main/kotlin/androidmakers/service/graphql/scalars.kt
@@ -62,3 +62,4 @@ object GraphQLLocalDateTimeCoercing : Coercing<LocalDateTime> {
         return internalValue.toString()
     }
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,3 +62,4 @@ object GraphQLLocalDateTimeCoercing : Coercing<LocalDateTime> {
		return internalValue.toString()
		}
		}