Adding stubs for extra controllers

orchestr7 · Nov 2, 2024 · a27fb63 · a27fb63
1 parent bfc65d7
commit a27fb63
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,11 @@ hs_err_pid*
 replay_pid*
 
 .DS_Store
+
+/backend/build/
+/frontend/build/
+/common/build/
+build/
+.idea/
+.gradle/
+.kotlin
diff --git a/backend/src/main/kotlin/ru/posidata/backend/controller/TestController.kt b/backend/src/main/kotlin/ru/posidata/backend/controller/TestController.kt
@@ -3,6 +3,7 @@ package ru.posidata.backend.controller
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
+import ru.posidata.backend.entity.UserEntityFromDb
 import ru.posidata.backend.service.UserService
 import ru.posidata.common.RoundResult
 import ru.posidata.common.UserDataFromTelegram
@@ -41,6 +42,29 @@ class TestController(
                 "blabla",
             )
         )
+        println("${a?.map { RoundResult(it.roundNumber, it.result) }}")
         return ResponseEntity.status(HttpStatus.OK).body(a?.map { RoundResult(it.roundNumber, it.result) })
     }
+
+    @GetMapping("/test3")
+    fun nextRound(): ResponseEntity<Any> {
+        val a = userService.getResultsByUser(
+            UserDataFromTelegram(
+                1234567,
+                "a",
+                "a",
+                "",
+                123,
+                "",
+                "blabla",
+            )
+        )
+        println("======")
+        return ResponseEntity.status(HttpStatus.OK).body(a?.map { RoundResult(it.roundNumber, it.result) })
+    }
+
+    @GetMapping("/test4")
+    fun randomUser(): String? {
+        return userService.getRandomUser().username
+    }
 }
diff --git a/backend/src/main/kotlin/ru/posidata/backend/controller/UserController.kt b/backend/src/main/kotlin/ru/posidata/backend/controller/UserController.kt
@@ -5,8 +5,7 @@ import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import ru.posidata.backend.service.TelegramAuthService
 import ru.posidata.backend.service.UserService
-import ru.posidata.common.ResourceType
-import ru.posidata.common.Resources
+import ru.posidata.common.QuestionAndAnswer
 import ru.posidata.common.UserDataFromTelegram
 
 
@@ -17,7 +16,7 @@ class UserController(
     private val userService: UserService
 ) {
     @GetMapping("/get")
-    fun getResults(
+    fun createAndReturnUser(
         userDataFromTelegram: UserDataFromTelegram,
     ): ResponseEntity<Any> {
 
@@ -34,9 +33,16 @@ class UserController(
         return ResponseEntity.status(HttpStatus.OK).body(responseUser.toDTO())
     }
 
+    @GetMapping("/again")
+    fun tryAgainNextRound(): ResponseEntity<Any> {
+        // TODO: add logic for incrementing to next round
+        return ResponseEntity.status(HttpStatus.OK).body("")
+    }
+
     @GetMapping("/update")
     fun submitAnswer(
         userDataFromTelegram: UserDataFromTelegram,
+        questionAndAnswer: QuestionAndAnswer
     ): ResponseEntity<Any> {
 
         println("Received a request to get results from $userDataFromTelegram. " +
@@ -46,6 +52,9 @@ class UserController(
             return ResponseEntity(HttpStatus.FORBIDDEN)
         }
 
+        // TODO: add logic for checking questionAndAnswer
+        // and incrementing result
+
         return ResponseEntity.status(HttpStatus.OK).body("")
     }
 }
diff --git a/common/src/commonMain/kotlin/ru/posidata/common/Answer.kt b/common/src/commonMain/kotlin/ru/posidata/common/Answer.kt
@@ -0,0 +1,9 @@
+package ru.posidata.common
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class QuestionAndAnswer(
+    val answer: ResourceType,
+    val question: Resource
+)
diff --git a/...in/kotlin/ru/posidata/common/Resources.kt → ...ain/kotlin/ru/posidata/common/Resource.kt b/...in/kotlin/ru/posidata/common/Resources.kt → ...ain/kotlin/ru/posidata/common/Resource.kt
@@ -8,7 +8,7 @@ enum class ResourceType {
     BIG_DATA,
 }
 
-enum class Resources(
+enum class Resource(
     val id: Int,
     val description: String,
     val type: ResourceType,
@@ -75,8 +75,8 @@ enum class Resources(
     ;
 
     companion object {
-        fun getById(i: Int): Resources = Resources.entries.find { it.id == i }!!
-        fun getByName(name: String): Resources? = Resources.entries.find { it.name.uppercase() == name }
+        fun getById(i: Int): Resource = Resource.entries.find { it.id == i }!!
+        fun getByName(name: String): Resource? = Resource.entries.find { it.name.uppercase() == name }
     }
 
     fun getName(): String {

diff --git a/frontend/.DS_Store b/frontend/.DS_Store
diff --git a/frontend/src/jsMain/kotlin/ru/posidata/views/main/AnswerCard.kt b/frontend/src/jsMain/kotlin/ru/posidata/views/main/AnswerCard.kt
@@ -12,7 +12,7 @@ import react.dom.html.ReactHTML.img
 import react.useState
 import ru.posidata.common.ResourceType.BIG_DATA
 import ru.posidata.common.ResourceType.POKEMON
-import ru.posidata.common.Resources
+import ru.posidata.common.Resource
 import ru.posidata.common.Answer
 import ru.posidata.common.Selection
 import ru.posidata.common.Selection.QUESTION
@@ -22,7 +22,7 @@ import web.cssom.*
 val answerCard = FC<AnswerProps> { props ->
     var (loading, setLoading) = useState(true)
 
-    val pokemon = Resources.getById(props.pokemonId)
+    val pokemon = Resource.getById(props.pokemonId)
     div {
         style = jso {
             display = (if (loading) "none" else "block").unsafeCast<Display>()

diff --git a/frontend/src/jsMain/kotlin/ru/posidata/views/main/QuestionCard.kt b/frontend/src/jsMain/kotlin/ru/posidata/views/main/QuestionCard.kt
@@ -19,17 +19,17 @@ import kotlin.random.Random
 
 val questionCard = FC<QuestionCard> { props ->
     useEffectOnce {
-        var randomNumber = Random.nextInt(0, Resources.entries.size)
+        var randomNumber = Random.nextInt(0, Resource.entries.size)
         while (true) {
             if (!props.uniqueRandom.contains(randomNumber)) {
                 props.setUniqueRandom(props.uniqueRandom + randomNumber)
                 props.setPokemonId(randomNumber)
                 break
             }
-            randomNumber = Random.nextInt(0, Resources.entries.size)
+            randomNumber = Random.nextInt(0, Resource.entries.size)
         }
     }
-    val pokemon = Resources.getById(props.pokemonId)
+    val pokemon = Resource.getById(props.pokemonId)
 
     val updateResult = useDeferredRequest {
         if (props.tgUser != null) {