Support for usernames in TimeZone model

Author: madhead

.deploy/lambda/lib/JProfByBotStack.ts

@@ -73,6 +73,12 @@ export class JProfByBotStack extends cdk.Stack {
             partitionKey: {name: 'userId', type: dynamodb.AttributeType.NUMBER},
             projectionType: dynamodb.ProjectionType.ALL,
         });
+        timezonesTable.addGlobalSecondaryIndex({
+            indexName: 'username',
+            partitionKey: {name: 'username', type: dynamodb.AttributeType.STRING},
+            sortKey: {name: 'chat', type: dynamodb.AttributeType.NUMBER},
+            projectionType: dynamodb.ProjectionType.ALL,
+        });
 
         const lambdaUnpin = new lambda.Function(this, 'jprof-by-bot-lambda-unpin', {
             functionName: 'jprof-by-bot-lambda-unpin',

times/timezones/dynamodb/src/main/kotlin/by/jprof/telegram/bot/times/timezones/dynamodb/dao/TimeZoneDAO.kt

@@ -36,11 +36,30 @@ class TimeZoneDAO(
             }.await()?.item()?.takeUnless { it.isEmpty() }?.toTimeZone()
         }
     }
+
+    override suspend fun getByUsername(username: String, chat: Long): TimeZone? {
+        return withContext(Dispatchers.IO) {
+            dynamoDb.query {
+                it.tableName(table)
+                it.indexName("username")
+                it.keyConditionExpression("username = :username AND chat = :chat")
+                it.expressionAttributeValues(
+                    mapOf(
+                        ":username" to username.toAttributeValue(),
+                        ":chat" to chat.toAttributeValue(),
+                    )
+                )
+            }.await()?.items()?.firstOrNull()?.toTimeZone()
+        }
+    }
 }
 
 @OptIn(ExperimentalStdlibApi::class)
 fun TimeZone.toAttributes(): Map<String, AttributeValue> = buildMap {
     put("user", this@toAttributes.user.toAttributeValue())
+    this@toAttributes.username?.let {
+        put("username", it.toAttributeValue())
+    }
     put("chat", this@toAttributes.chat.toAttributeValue())
     this@toAttributes.zoneId?.let {
         put("zoneId", it.toAttributeValue())
@@ -52,6 +71,7 @@ fun TimeZone.toAttributes(): Map<String, AttributeValue> = buildMap {
 
 fun Map<String, AttributeValue>.toTimeZone(): TimeZone = TimeZone(
     user = this["user"].toLong("user"),
+    username = this["username"]?.s(),
     chat = this["chat"].toLong("chat"),
     zoneId = this["zoneId"]?.s(),
     offset = this["offset"]?.n()?.toInt()

times/timezones/dynamodb/src/test/kotlin/by/jprof/telegram/bot/times/timezones/dynamodb/dao/TimeZoneDAOTest.kt

@@ -37,14 +37,21 @@ internal class TimeZoneDAOTest {
         assertEquals(timeZone, sut.get(1, 1))
     }
 
+    @Test
+    fun getByUsername() = runBlocking {
+        assertEquals(timeZone.copy(chat = 3), sut.getByUsername("test", 3))
+    }
+
     @Test
     fun getUnexisting() = runBlocking {
         assertNull(sut.get(-1, -2))
+        assertNull(sut.getByUsername("unexisting", -2))
     }
 
     private val timeZone
         get() = TimeZone(
             user = 1L,
+            username = "test",
             chat = 1L,
             zoneId = "UTC",
         )

times/timezones/dynamodb/src/test/kotlin/by/jprof/telegram/bot/times/timezones/dynamodb/dao/TimeZoneTest.kt

@@ -14,6 +14,14 @@ internal class TimeZoneTest {
         )
     }
 
+    @Test
+    fun toAttributesNoUsername() {
+        Assertions.assertEquals(
+            attributes.toMutableMap().apply { this.remove("username") },
+            timeZone.copy(username = null).toAttributes()
+        )
+    }
+
     @Test
     fun toAttributesNoZoneId() {
         Assertions.assertEquals(
@@ -38,6 +46,14 @@ internal class TimeZoneTest {
         )
     }
 
+    @Test
+    fun toTimeZoneNoUsername() {
+        Assertions.assertEquals(
+            timeZone.copy(username = null),
+            attributes.toMutableMap().apply { this.remove("username") }.toTimeZone(),
+        )
+    }
+
     @Test
     fun toTimeZoneNoZoneId() {
         Assertions.assertEquals(
@@ -57,13 +73,15 @@ internal class TimeZoneTest {
     private val timeZone
         get() = TimeZone(
             user = 1L,
+            username = "test",
             chat = 2L,
             zoneId = "UTC",
             offset = 3600,
         )
     private val attributes
         get() = mapOf(
             "user" to AttributeValue.builder().n("1").build(),
+            "username" to AttributeValue.builder().s("test").build(),
             "chat" to AttributeValue.builder().n("2").build(),
             "zoneId" to AttributeValue.builder().s("UTC").build(),
             "offset" to AttributeValue.builder().n("3600").build(),

times/timezones/dynamodb/src/test/resources/timezones.items.json

@@ -6,6 +6,9 @@
                     "user": {
                         "N": "1"
                     },
+                    "username": {
+                        "S": "test"
+                    },
                     "chat": {
                         "N": "1"
                     },
@@ -21,6 +24,9 @@
                     "user": {
                         "N": "1"
                     },
+                    "username": {
+                        "S": "test"
+                    },
                     "chat": {
                         "N": "2"
                     },
@@ -29,6 +35,24 @@
                     }
                 }
             }
+        },
+        {
+            "PutRequest": {
+                "Item": {
+                    "user": {
+                        "N": "1"
+                    },
+                    "username": {
+                        "S": "test"
+                    },
+                    "chat": {
+                        "N": "3"
+                    },
+                    "zoneId": {
+                        "S": "UTC"
+                    }
+                }
+            }
         }
     ]
 }

times/timezones/dynamodb/src/test/resources/timezones.table.json

@@ -5,6 +5,10 @@
             "AttributeName": "user",
             "AttributeType": "N"
         },
+        {
+            "AttributeName": "username",
+            "AttributeType": "S"
+        },
         {
             "AttributeName": "chat",
             "AttributeType": "N"
@@ -20,6 +24,28 @@
             "KeyType": "RANGE"
         }
     ],
+    "GlobalSecondaryIndexes": [
+        {
+            "IndexName": "username",
+            "KeySchema": [
+                {
+                    "AttributeName": "username",
+                    "KeyType": "HASH"
+                },
+                {
+                    "AttributeName": "chat",
+                    "KeyType": "RANGE"
+                }
+            ],
+            "Projection": {
+                "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+                "ReadCapacityUnits": 1,
+                "WriteCapacityUnits": 1
+            }
+        }
+    ],
     "ProvisionedThroughput": {
         "ReadCapacityUnits": 1,
         "WriteCapacityUnits": 1

times/timezones/src/main/kotlin/by/jprof/telegram/bot/times/timezones/dao/TimeZoneDAO.kt

@@ -6,4 +6,6 @@ interface TimeZoneDAO {
     suspend fun save(timeZone: TimeZone)
 
     suspend fun get(user: Long, chat: Long): TimeZone?
+
+    suspend fun getByUsername(username: String, chat: Long): TimeZone?
 }

times/timezones/src/main/kotlin/by/jprof/telegram/bot/times/timezones/model/TimeZone.kt

@@ -2,6 +2,7 @@ package by.jprof.telegram.bot.times.timezones.model
 
 data class TimeZone(
     val user: Long,
+    val username: String? = null,
     val chat: Long,
     val zoneId: String? = null,
     val offset: Int? = null,