change leaderboard behaviour

backend/api-spec/Makefile

@@ -0,0 +1,28 @@
+# Define Hurl scripts
+HURL_SCRIPTS = leaderboard_post.hurl leaderboard_get.hurl statistic_post.hurl statistic_get.hurl
+
+# Default target to run all Hurl scripts
+all: run_all
+
+# Target to run leaderboard POST
+leaderboard_post: leaderboard_post.hurl
+	hurl leaderboard_post.hurl | jq .
+
+# Target to run leaderboard GET
+leaderboard_get: leaderboard_get.hurl
+	hurl leaderboard_get.hurl | jq .
+
+# Target to run statistic POST
+statistic_post: statistic_post.hurl
+	hurl statistic_post.hurl | jq .
+
+# Target to run statistic GET
+statistic_get: statistic_get.hurl
+	hurl statistic_get.hurl | jq .
+
+# Target to run all Hurl scripts
+run_all: leaderboard_post leaderboard_get statistic_post statistic_get
+
+# Clean target to remove .run files
+clean:
+	rm -f *.run

backend/api-spec/leaderboard_get.hurl

@@ -0,0 +1,6 @@
+GET http://localhost:8080/api/statistics/leaderboard?limit=10
+
+HTTP/1.1 200
+[Asserts]
+jsonpath "$[0].userId" exists
+jsonpath "$[0].speed" exists

backend/api-spec/leaderboard_post.hurl

@@ -0,0 +1,12 @@
+POST http://localhost:8080/api/statistics/leaderboard
+Content-Type: application/json
+
+{
+  "userId": "user-1",
+  "speed": 235.5
+}
+
+HTTP/1.1 201
+GET http://localhost:8080/api/statistics/leaderboard?limit=10
+
+HTTP/1.1 200

backend/api-spec/statistic_get.hurl

@@ -0,0 +1,11 @@
+GET http://localhost:8080/api/statistics/user123
+
+HTTP/1.1 200
+[Asserts]
+jsonpath "$.userId" equals "user123"
+jsonpath "$.completedDuels" greaterThanOrEqual 0
+jsonpath "$.averageSpeed" greaterThanOrEqual 0.0
+jsonpath "$.totalReward" greaterThanOrEqual 0.0
+jsonpath "$.overallWinsInDuels" greaterThanOrEqual 0
+jsonpath "$.maxSpeed" greaterThanOrEqual 0.0
+jsonpath "$.topSpeeds" exists

backend/api-spec/statistic_post.hurl

@@ -0,0 +1,14 @@
+POST http://localhost:8080/api/statistics
+Content-Type: application/json
+
+{
+  "userId": "user123",
+  "completedDuels": 5,
+  "averageSpeed": 110.2,
+  "totalReward": 500.0,
+  "overallWinsInDuels": 3,
+  "maxSpeed": 120.5,
+  "topSpeeds": [120.5, 115.3, 110.0, 105.5, 100.0]
+}
+
+HTTP/1.1 201

backend/src/main/kotlin/com/retypeme/project/statistic/repository/LeaderboardRepository.kt

@@ -5,32 +5,29 @@ import org.springframework.data.redis.core.RedisTemplate
 import org.springframework.data.redis.core.ZSetOperations
 import org.springframework.stereotype.Repository
 
-
 interface LeaderboardRepository {
     fun addUserScore(userId: String, score: Double)
     fun getTopUsers(limit: Int): List<LeaderboardItemModel>
 }
 
 @Repository
-class LeaderboardRepositoryImpl(private val redisTemplate: RedisTemplate<String, LeaderboardItemModel>) :
-    LeaderboardRepository {
+class LeaderboardRepositoryImpl(private val redisTemplate: RedisTemplate<String, String>) : LeaderboardRepository {
 
     private val leaderboardKey = "leaderboard"
 
+    private val zSetOps: ZSetOperations<String, String> by lazy {
+        redisTemplate.opsForZSet()
+    }
+
     override fun addUserScore(userId: String, score: Double) {
-        val zSetOps: ZSetOperations<String, LeaderboardItemModel> = redisTemplate.opsForZSet()
         val existingScore = zSetOps.score(leaderboardKey, userId)
-
         if (existingScore == null || score > existingScore) {
-            zSetOps.add(leaderboardKey, LeaderboardItemModel(userId, score), score)
+            zSetOps.add(leaderboardKey, userId, score)
         }
     }
 
     override fun getTopUsers(limit: Int): List<LeaderboardItemModel> {
-        val zSetOps: ZSetOperations<String, LeaderboardItemModel> = redisTemplate.opsForZSet()
-        val topUsers: MutableSet<ZSetOperations.TypedTuple<LeaderboardItemModel>> =
-            zSetOps.reverseRangeWithScores(leaderboardKey, 0, (limit - 1).toLong()) ?: return emptyList()
-
-        return topUsers.map { it.value!! }
+        val topUsers = zSetOps.reverseRangeWithScores(leaderboardKey, 0, (limit - 1).toLong())
+        return topUsers?.map { LeaderboardItemModel(it.value ?: "", it.score ?: 0.0) } ?: emptyList()
     }
-}
+}