release: 1.2.5 (#135)

Author: devxb

docs/api/rank/get_rank.md

@@ -6,7 +6,7 @@
 ### Http method: `GET`
 ### URL: `https://render.gitanimals.org/ranks`
 ### Parameter
-- rank: 1 //특정 랭크를 입력하면 해당 랭크부터 {size} 수 만큼 응답합니다.
+- rank: 0 //특정 랭크를 입력하면 해당 랭크부터 {size} 수 만큼 응답합니다.
 - size: 10 // 조회할 랭크의 수 입니다. default: 10 
 - type: WEEKLY_GUILD_CONTRIBUTIONS, WEEKLY_USER_CONTRIBUTIONS // 조회할 랭크의 타입을 입력합니다.
 
@@ -16,12 +16,14 @@
 {
   "ranks": [
     {
+      "id": "123", // user면 user의 id guild면 guild의 id
       "rank": 1,
       "image": "https://static.gitanimals.org/...",
       "name": "dog",
       "contributions": 3,
     },
     {
+      "id": "124", 
       "rank": 2,
       "image": "https://static.gitanimals.org/...",
       "name": "cat",

docs/api/rank/get_rank_by_username.md

@@ -9,6 +9,7 @@
 ## Response
 ```json
 {
+  "id": "123", // user면 user의 id guild면 guild의 id
   "rank": 100,
   "image": "https://static.gitanimals.org/...",
   "name": "dog",

src/main/kotlin/org/gitanimals/quiz/domain/context/QuizSolveContextRepository.kt

@@ -13,10 +13,16 @@ interface QuizSolveContextRepository : JpaRepository<QuizSolveContext, Long> {
         solvedAt: LocalDate,
     ): QuizSolveContext?
 
-    @Lock(LockModeType.PESSIMISTIC_WRITE)
     @Query("select q from QuizSolveContext q join fetch q.quizSolveContextQuiz where q.id = :id and q.userId = :userId")
     fun findByIdAndUserId(
         id: Long,
         userId: Long,
     ): QuizSolveContext?
+
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("select q from QuizSolveContext q join fetch q.quizSolveContextQuiz where q.id = :id and q.userId = :userId")
+    fun findByIdAndUserIdWithLock(
+        id: Long,
+        userId: Long,
+    ): QuizSolveContext?
 }

src/main/kotlin/org/gitanimals/quiz/domain/context/QuizSolveContextService.kt

@@ -44,18 +44,26 @@ class QuizSolveContextService(
 
     @Transactional
     fun solveQuiz(id: Long, userId: Long, answer: String) {
-        val quizSolveContext = getQuizSolveContextByIdAndUserId(id, userId)
+        val quizSolveContext = getQuizSolveContextByIdAndUserIdWithLock(id, userId)
 
         quizSolveContext.solve(answer)
     }
 
     @Transactional
     fun stopQuizByIdAndUserId(id: Long, userId: Long) {
-        val quizSolveContext = getQuizSolveContextByIdAndUserId(id, userId)
+        val quizSolveContext = getQuizSolveContextByIdAndUserIdWithLock(id, userId)
 
         quizSolveContext.stopSolve()
     }
 
+    private fun getQuizSolveContextByIdAndUserIdWithLock(
+        id: Long,
+        userId: Long
+    ): QuizSolveContext {
+        return quizSolveContextRepository.findByIdAndUserIdWithLock(id, userId)
+            ?: throw IllegalArgumentException("Cannot find quizContext by id: \"$id\" and userId: \"$userId\"")
+    }
+
     fun getQuizSolveContextByIdAndUserId(
         id: Long,
         userId: Long