Merge pull request #40 from /issues/39

Members' local times

Author: madhead

.deploy/lambda/lib/JProfByBotStack.ts

@@ -55,6 +55,13 @@ export class JProfByBotStack extends cdk.Stack {
             billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
             removalPolicy: cdk.RemovalPolicy.DESTROY,
         });
+        const timezonesTable = new dynamodb.Table(this, 'jprof-by-bot-table-timezones', {
+            tableName: 'jprof-by-bot-table-timezones',
+            partitionKey: {name: 'user', type: dynamodb.AttributeType.NUMBER},
+            sortKey: {name: 'chat', type: dynamodb.AttributeType.NUMBER},
+            billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
+            removalPolicy: cdk.RemovalPolicy.DESTROY,
+        });
 
         pinsTable.addGlobalSecondaryIndex({
             indexName: 'chatId',
@@ -66,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',
@@ -123,6 +136,7 @@ export class JProfByBotStack extends cdk.Stack {
                 'TABLE_QUIZOJIS': quizojisTable.tableName,
                 'TABLE_MONIES': moniesTable.tableName,
                 'TABLE_PINS': pinsTable.tableName,
+                'TABLE_TIMEZONES': timezonesTable.tableName,
                 'STATE_MACHINE_UNPINS': stateMachineUnpin.stateMachineArn,
                 'TOKEN_TELEGRAM_BOT': props.telegramToken,
                 'TOKEN_YOUTUBE_API': props.youtubeToken,
@@ -144,6 +158,8 @@ export class JProfByBotStack extends cdk.Stack {
         pinsTable.grantReadWriteData(lambdaWebhook);
         pinsTable.grantReadWriteData(lambdaUnpin);
 
+        timezonesTable.grantReadWriteData(lambdaWebhook);
+
         stateMachineUnpin.grantStartExecution(lambdaWebhook)
 
         const api = new apigateway.RestApi(this, 'jprof-by-bot-api', {

.github/workflows/default.yml

@@ -61,6 +61,7 @@ jobs:
       - run: quizoji/dynamodb/src/test/resources/seed.sh
       - run: monies/dynamodb/src/test/resources/seed.sh
       - run: pins/dynamodb/src/test/resources/seed.sh
+      - run: times/timezones/dynamodb/src/test/resources/seed.sh
       - run: ./gradlew clean dbTest
       - uses: actions/upload-artifact@v2
         if: always()

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -18,7 +18,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 @Tag("db")
 @ExtendWith(DynamoDB::class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-internal class VotesDAOTest {
+internal class MoniesDAOTest {
     @AWSClient(endpoint = Endpoint::class)
     private lateinit var dynamoDB: DynamoDbAsyncClient
     private lateinit var sut: MoniesDAO

monies/dynamodb/src/test/kotlin/by/jprof/telegram/bot/monies/dynamodb/dao/MoniesDAOTest.kt

@@ -22,4 +22,6 @@ dependencies {
     implementation(project.projects.currencies)
     implementation(project.projects.herald.processor)
     implementation(project.projects.leetcode)
+    implementation(project.projects.times.timezones.dynamodb)
+    implementation(project.projects.times)
 }

runners/lambda/build.gradle.kts

@@ -5,6 +5,7 @@ import by.jprof.telegram.bot.kotlin.dao.KotlinMentionsDAO
 import by.jprof.telegram.bot.monies.dao.MoniesDAO
 import by.jprof.telegram.bot.pins.dao.PinDAO
 import by.jprof.telegram.bot.quizoji.dao.QuizojiDAO
+import by.jprof.telegram.bot.times.timezones.dao.TimeZoneDAO
 import by.jprof.telegram.bot.votes.dao.VotesDAO
 import by.jprof.telegram.bot.youtube.dao.YouTubeChannelsWhitelistDAO
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -14,10 +15,11 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 import by.jprof.telegram.bot.dialogs.dynamodb.dao.DialogStateDAO as DynamoDBDialogStateDAO
 import by.jprof.telegram.bot.kotlin.dynamodb.dao.KotlinMentionsDAO as DynamoDBKotlinMentionsDAO
 import by.jprof.telegram.bot.monies.dynamodb.dao.MoniesDAO as DynamoDBMoniesDAO
+import by.jprof.telegram.bot.pins.dynamodb.dao.PinDAO as DynamoDBPinDAO
 import by.jprof.telegram.bot.quizoji.dynamodb.dao.QuizojiDAO as DynamoDBQuizojiDAO
+import by.jprof.telegram.bot.times.timezones.dynamodb.dao.TimeZoneDAO as DynamoDBTimeZoneDAO
 import by.jprof.telegram.bot.votes.dynamodb.dao.VotesDAO as DynamoDBVotesDAO
 import by.jprof.telegram.bot.youtube.dynamodb.dao.YouTubeChannelsWhitelistDAO as DynamoDBYouTubeChannelsWhitelistDAO
-import by.jprof.telegram.bot.pins.dynamodb.dao.PinDAO as DynamoDBPinDAO
 
 @ExperimentalSerializationApi
 val databaseModule = module {
@@ -73,4 +75,11 @@ val databaseModule = module {
             get(named(TABLE_PINS))
         )
     }
+
+    single<TimeZoneDAO> {
+        DynamoDBTimeZoneDAO(
+            get(),
+            get(named(TABLE_TIMEZONES))
+        )
+    }
 }

runners/lambda/src/main/kotlin/by/jprof/telegram/bot/runners/lambda/config/database.kt

@@ -12,6 +12,7 @@ const val TABLE_DIALOG_STATES = "TABLE_DIALOG_STATES"
 const val TABLE_QUIZOJIS = "TABLE_QUIZOJIS"
 const val TABLE_MONIES = "TABLE_MONIES"
 const val TABLE_PINS = "TABLE_PINS"
+const val TABLE_TIMEZONES = "TABLE_TIMEZONES"
 const val STATE_MACHINE_UNPINS = "STATE_MACHINE_UNPINS"
 
 val envModule = module {
@@ -25,6 +26,7 @@ val envModule = module {
         TABLE_QUIZOJIS,
         TABLE_MONIES,
         TABLE_PINS,
+        TABLE_TIMEZONES,
         STATE_MACHINE_UNPINS,
     ).forEach { variable ->
         single(named(variable)) {