feat: PvP (#4)

* wip: pvp

* new queue for pvp, playerCode

* update: rename file

* feat: pvp

* feat: match tests for pvp

* feat: store codes for pvp seperate

* feat: pvp game tests

* fix: pvp response

* feat: add self match for pvp

* update: pagination for get user-matches

* feat : PvP leaderboard (#5)

* feat : PvP leaderboard

* fix : commit bugs

* fix : commit bugs

* fix: pvp leaderbord

* fix: variable names

* fix: queue name

* fix: pvp fixes

* fix: pvp commit history

* fix(player_code): python state typecast

* fix: pvp initial code

* feat: abilities

---------

Co-authored-by: Mughil Srinivasan R S <[email protected]>
Co-authored-by: shubham-1806 <[email protected]>

library/.openapi-generator/FILES

@@ -1,10 +1,4 @@
-.openapi-generator-ignore
-README.md
-build.gradle.kts
-pom.xml
-settings.gradle
 src/main/kotlin/delta/codecharacter/SpringDocConfiguration.kt
-src/main/kotlin/delta/codecharacter/core/ApiUtil.kt
 src/main/kotlin/delta/codecharacter/core/AuthApi.kt
 src/main/kotlin/delta/codecharacter/core/CodeApi.kt
 src/main/kotlin/delta/codecharacter/core/CurrentUserApi.kt
@@ -14,6 +8,7 @@ src/main/kotlin/delta/codecharacter/core/LeaderboardApi.kt
 src/main/kotlin/delta/codecharacter/core/MapApi.kt
 src/main/kotlin/delta/codecharacter/core/MatchApi.kt
 src/main/kotlin/delta/codecharacter/core/NotificationApi.kt
+src/main/kotlin/delta/codecharacter/core/PvpGameApi.kt
 src/main/kotlin/delta/codecharacter/core/UserApi.kt
 src/main/kotlin/delta/codecharacter/dtos/ActivateUserRequestDto.kt
 src/main/kotlin/delta/codecharacter/dtos/AuthStatusResponseDto.kt
@@ -46,6 +41,11 @@ src/main/kotlin/delta/codecharacter/dtos/NotificationDto.kt
 src/main/kotlin/delta/codecharacter/dtos/PasswordLoginRequestDto.kt
 src/main/kotlin/delta/codecharacter/dtos/PasswordLoginResponseDto.kt
 src/main/kotlin/delta/codecharacter/dtos/PublicUserDto.kt
+src/main/kotlin/delta/codecharacter/dtos/PvPGameDto.kt
+src/main/kotlin/delta/codecharacter/dtos/PvPGameStatusDto.kt
+src/main/kotlin/delta/codecharacter/dtos/PvPLeaderBoardResponseDto.kt
+src/main/kotlin/delta/codecharacter/dtos/PvPMatchDto.kt
+src/main/kotlin/delta/codecharacter/dtos/PvPUserStatsDto.kt
 src/main/kotlin/delta/codecharacter/dtos/RatingHistoryDto.kt
 src/main/kotlin/delta/codecharacter/dtos/RegisterUserRequestDto.kt
 src/main/kotlin/delta/codecharacter/dtos/ResetPasswordRequestDto.kt

library/src/main/kotlin/delta/codecharacter/SpringDocConfiguration.kt

@@ -10,7 +10,6 @@ import io.swagger.v3.oas.models.info.License
 import io.swagger.v3.oas.models.Components
 import io.swagger.v3.oas.models.security.SecurityScheme
 
-// @jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
 @Configuration
 class SpringDocConfiguration {
 

library/src/main/kotlin/delta/codecharacter/core/CodeApi.kt

@@ -78,7 +78,7 @@ interface CodeApi {
             value = ["/user/code/revisions"],
             produces = ["application/json"]
     )
-    fun getCodeRevisions(@Parameter(description = "code type", schema = Schema(allowableValues = ["NORMAL", "DAILY_CHALLENGE"], defaultValue = "NORMAL")) @Valid @RequestParam(value = "type", required = false, defaultValue = "NORMAL") type: CodeTypeDto): ResponseEntity<List<CodeRevisionDto>> {
+    fun getCodeRevisions(@Parameter(description = "code type", schema = Schema(allowableValues = ["NORMAL", "DAILY_CHALLENGE", "PVP"], defaultValue = "NORMAL")) @Valid @RequestParam(value = "type", required = false, defaultValue = "NORMAL") type: CodeTypeDto): ResponseEntity<List<CodeRevisionDto>> {
         return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
     }
 
@@ -97,7 +97,7 @@ interface CodeApi {
             value = ["/user/code/latest"],
             produces = ["application/json"]
     )
-    fun getLatestCode(@Parameter(description = "code type", schema = Schema(allowableValues = ["NORMAL", "DAILY_CHALLENGE"], defaultValue = "NORMAL")) @Valid @RequestParam(value = "type", required = false, defaultValue = "NORMAL") type: CodeTypeDto): ResponseEntity<CodeDto> {
+    fun getLatestCode(@Parameter(description = "code type", schema = Schema(allowableValues = ["NORMAL", "DAILY_CHALLENGE", "PVP"], defaultValue = "NORMAL")) @Valid @RequestParam(value = "type", required = false, defaultValue = "NORMAL") type: CodeTypeDto): ResponseEntity<CodeDto> {
         return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
     }
 

library/src/main/kotlin/delta/codecharacter/core/DailyChallengesApi.kt

@@ -9,6 +9,7 @@ import delta.codecharacter.dtos.DailyChallengeGetRequestDto
 import delta.codecharacter.dtos.DailyChallengeLeaderBoardResponseDto
 import delta.codecharacter.dtos.DailyChallengeMatchRequestDto
 import delta.codecharacter.dtos.GenericErrorDto
+import delta.codecharacter.dtos.MatchDto
 import io.swagger.v3.oas.annotations.*
 import io.swagger.v3.oas.annotations.enums.*
 import io.swagger.v3.oas.annotations.media.*
@@ -102,4 +103,23 @@ interface DailyChallengesApi {
     fun getDailyChallengeLeaderBoard(@Parameter(description = "Index of the page") @Valid @RequestParam(value = "page", required = false) page: kotlin.Int?,@Parameter(description = "Size of the page") @Valid @RequestParam(value = "size", required = false) size: kotlin.Int?): ResponseEntity<List<DailyChallengeLeaderBoardResponseDto>> {
         return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
     }
+
+    @Operation(
+        summary = "Get user daily challenge matches",
+        operationId = "getUserDCMatches",
+        description = """Get daily-challenge matches played by authenticated user""",
+        responses = [
+            ApiResponse(responseCode = "200", description = "OK", content = [Content(array = ArraySchema(schema = Schema(implementation = MatchDto::class)))]),
+            ApiResponse(responseCode = "401", description = "Unauthorized")
+        ],
+        security = [ SecurityRequirement(name = "http-bearer") ]
+    )
+    @RequestMapping(
+            method = [RequestMethod.GET],
+            value = ["/dc/matches"],
+            produces = ["application/json"]
+    )
+    fun getUserDCMatches(@Parameter(description = "Index of the page") @Valid @RequestParam(value = "page", required = false) page: kotlin.Int?,@Parameter(description = "Size of the page") @Valid @RequestParam(value = "size", required = false) size: kotlin.Int?): ResponseEntity<List<MatchDto>> {
+        return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
+    }
 }

library/src/main/kotlin/delta/codecharacter/core/LeaderboardApi.kt

@@ -6,6 +6,7 @@
 package delta.codecharacter.core
 
 import delta.codecharacter.dtos.LeaderboardEntryDto
+import delta.codecharacter.dtos.PvPLeaderBoardResponseDto
 import delta.codecharacter.dtos.TierTypeDto
 import io.swagger.v3.oas.annotations.*
 import io.swagger.v3.oas.annotations.enums.*
@@ -56,4 +57,23 @@ interface LeaderboardApi {
     fun getLeaderboard(@Parameter(description = "Index of the page") @Valid @RequestParam(value = "page", required = false) page: kotlin.Int?,@Parameter(description = "Size of the page") @Valid @RequestParam(value = "size", required = false) size: kotlin.Int?,@Parameter(description = "Leaderboard Tier", schema = Schema(allowableValues = ["TIER_PRACTICE", "TIER1", "TIER2", "TIER3", "TIER4"])) @Valid @RequestParam(value = "tier", required = false) tier: TierTypeDto?): ResponseEntity<List<LeaderboardEntryDto>> {
         return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
     }
+
+    @Operation(
+        summary = "Get PvP leaderboard",
+        operationId = "getPvPLeaderboard",
+        description = """Get PvP leaderboard""",
+        responses = [
+            ApiResponse(responseCode = "200", description = "OK", content = [Content(array = ArraySchema(schema = Schema(implementation = PvPLeaderBoardResponseDto::class)))]),
+            ApiResponse(responseCode = "401", description = "Unauthorized")
+        ],
+        security = [ SecurityRequirement(name = "http-bearer") ]
+    )
+    @RequestMapping(
+            method = [RequestMethod.GET],
+            value = ["/pvpleaderboard"],
+            produces = ["application/json"]
+    )
+    fun getPvPLeaderboard(@Parameter(description = "Index of the page") @Valid @RequestParam(value = "page", required = false) page: kotlin.Int?,@Parameter(description = "Size of the page") @Valid @RequestParam(value = "size", required = false) size: kotlin.Int?): ResponseEntity<List<PvPLeaderBoardResponseDto>> {
+        return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
+    }
 }

library/src/main/kotlin/delta/codecharacter/core/MatchApi.kt

@@ -8,6 +8,7 @@ package delta.codecharacter.core
 import delta.codecharacter.dtos.CreateMatchRequestDto
 import delta.codecharacter.dtos.GenericErrorDto
 import delta.codecharacter.dtos.MatchDto
+import delta.codecharacter.dtos.PvPMatchDto
 import io.swagger.v3.oas.annotations.*
 import io.swagger.v3.oas.annotations.enums.*
 import io.swagger.v3.oas.annotations.media.*
@@ -65,7 +66,7 @@ interface MatchApi {
         operationId = "getTopMatches",
         description = """Get top matches""",
         responses = [
-            ApiResponse(responseCode = "200", description = "OK", content = [Content(array = ArraySchema(schema = Schema(implementation = MatchDto::class)))]),
+            ApiResponse(responseCode = "200", description = "OK", content = [Content(array = ArraySchema(schema = Schema(implementation = kotlin.Any::class)))]),
             ApiResponse(responseCode = "401", description = "Unauthorized")
         ],
         security = [ SecurityRequirement(name = "http-bearer") ]
@@ -75,14 +76,14 @@ interface MatchApi {
             value = ["/top-matches"],
             produces = ["application/json"]
     )
-    fun getTopMatches(): ResponseEntity<List<MatchDto>> {
+    fun getTopMatches(): ResponseEntity<List<kotlin.Any>> {
         return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
     }
 
     @Operation(
         summary = "Get user matches",
-        operationId = "getUserMatches",
-        description = """Get matches played by authenticated user""",
+        operationId = "getUserNormalMatches",
+        description = """Get normal matches played by authenticated user""",
         responses = [
             ApiResponse(responseCode = "200", description = "OK", content = [Content(array = ArraySchema(schema = Schema(implementation = MatchDto::class)))]),
             ApiResponse(responseCode = "401", description = "Unauthorized")
@@ -94,7 +95,26 @@ interface MatchApi {
             value = ["/user/matches"],
             produces = ["application/json"]
     )
-    fun getUserMatches(): ResponseEntity<List<MatchDto>> {
+    fun getUserNormalMatches(@Parameter(description = "Index of the page") @Valid @RequestParam(value = "page", required = false) page: kotlin.Int?,@Parameter(description = "Size of the page") @Valid @RequestParam(value = "size", required = false) size: kotlin.Int?): ResponseEntity<List<MatchDto>> {
+        return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
+    }
+
+    @Operation(
+        summary = "Get user pvp matches",
+        operationId = "getUserPvPMatches",
+        description = """Get pvp matches played by authenticated user""",
+        responses = [
+            ApiResponse(responseCode = "200", description = "OK", content = [Content(array = ArraySchema(schema = Schema(implementation = PvPMatchDto::class)))]),
+            ApiResponse(responseCode = "401", description = "Unauthorized")
+        ],
+        security = [ SecurityRequirement(name = "http-bearer") ]
+    )
+    @RequestMapping(
+            method = [RequestMethod.GET],
+            value = ["/user/pvpmatches"],
+            produces = ["application/json"]
+    )
+    fun getUserPvPMatches(@Parameter(description = "Index of the page") @Valid @RequestParam(value = "page", required = false) page: kotlin.Int?,@Parameter(description = "Size of the page") @Valid @RequestParam(value = "size", required = false) size: kotlin.Int?): ResponseEntity<List<PvPMatchDto>> {
         return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
     }
 }

library/src/main/kotlin/delta/codecharacter/core/PvpGameApi.kt

@@ -0,0 +1,56 @@
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.1.0).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+*/
+package delta.codecharacter.core
+
+import io.swagger.v3.oas.annotations.*
+import io.swagger.v3.oas.annotations.enums.*
+import io.swagger.v3.oas.annotations.media.*
+import io.swagger.v3.oas.annotations.responses.*
+import io.swagger.v3.oas.annotations.security.*
+import org.springframework.http.HttpStatus
+import org.springframework.http.MediaType
+import org.springframework.http.ResponseEntity
+
+import org.springframework.web.bind.annotation.*
+import org.springframework.validation.annotation.Validated
+import org.springframework.web.context.request.NativeWebRequest
+import org.springframework.beans.factory.annotation.Autowired
+
+import jakarta.validation.constraints.DecimalMax
+import jakarta.validation.constraints.DecimalMin
+import jakarta.validation.constraints.Email
+import jakarta.validation.constraints.Max
+import jakarta.validation.constraints.Min
+import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Pattern
+import jakarta.validation.constraints.Size
+import jakarta.validation.Valid
+
+import kotlin.collections.List
+import kotlin.collections.Map
+
+@Validated
+@RequestMapping("\${api.base-path:}")
+interface PvpGameApi {
+
+    @Operation(
+        summary = "Get pvp game logs by game ID",
+        operationId = "getPvpGameLogsByGameId",
+        description = """Get pvp game logs by game ID""",
+        responses = [
+            ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = kotlin.String::class))])
+        ],
+        security = [ SecurityRequirement(name = "http-bearer") ]
+    )
+    @RequestMapping(
+            method = [RequestMethod.GET],
+            value = ["/pvpgames/{gameId}/logs"],
+            produces = ["application/json"]
+    )
+    fun getPvpGameLogsByGameId(@Parameter(description = "UUID of the game", required = true) @PathVariable("gameId") gameId: java.util.UUID): ResponseEntity<kotlin.String> {
+        return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
+    }
+}

library/src/main/kotlin/delta/codecharacter/dtos/CodeRevisionDto.kt

@@ -3,6 +3,7 @@ package delta.codecharacter.dtos
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
+import delta.codecharacter.dtos.CodeTypeDto
 import delta.codecharacter.dtos.LanguageDto
 import jakarta.validation.constraints.DecimalMax
 import jakarta.validation.constraints.DecimalMin
@@ -22,6 +23,7 @@ import io.swagger.v3.oas.annotations.media.Schema
  * @param message 
  * @param language 
  * @param createdAt 
+ * @param codeType 
  * @param parentRevision 
  */
 data class CodeRevisionDto(
@@ -42,6 +44,10 @@ data class CodeRevisionDto(
     @Schema(example = "null", required = true, description = "")
     @get:JsonProperty("createdAt", required = true) val createdAt: java.time.Instant,
 
+    @field:Valid
+    @Schema(example = "null", required = true, description = "")
+    @get:JsonProperty("codeType", required = true) val codeType: CodeTypeDto = CodeTypeDto.NORMAL,
+
     @Schema(example = "123e4567-e89b-12d3-a456-426614174111", description = "")
     @get:JsonProperty("parentRevision") val parentRevision: java.util.UUID? = null
 ) {

library/src/main/kotlin/delta/codecharacter/dtos/CodeTypeDto.kt

@@ -16,11 +16,12 @@ import io.swagger.v3.oas.annotations.media.Schema
 
 /**
 * 
-* Values: NORMAL,DAILY_CHALLENGE
+* Values: NORMAL,DAILY_CHALLENGE,PVP
 */
 enum class CodeTypeDto(val value: kotlin.String) {
 
     @JsonProperty("NORMAL") NORMAL("NORMAL"),
-    @JsonProperty("DAILY_CHALLENGE") DAILY_CHALLENGE("DAILY_CHALLENGE")
+    @JsonProperty("DAILY_CHALLENGE") DAILY_CHALLENGE("DAILY_CHALLENGE"),
+    @JsonProperty("PVP") PVP("PVP")
 }
 

library/src/main/kotlin/delta/codecharacter/dtos/CreateMatchRequestDto.kt

@@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.media.Schema
  * @param opponentUsername Username of the opponent
  * @param mapRevisionId Revision ID of the map
  * @param codeRevisionId Revision of the code
+ * @param codeRevisionId2 Revision of the code (for SELF-PVP mode)
  */
 data class CreateMatchRequestDto(
 
@@ -35,7 +36,10 @@ data class CreateMatchRequestDto(
     @get:JsonProperty("mapRevisionId") val mapRevisionId: java.util.UUID? = null,
 
     @Schema(example = "null", description = "Revision of the code")
-    @get:JsonProperty("codeRevisionId") val codeRevisionId: java.util.UUID? = null
+    @get:JsonProperty("codeRevisionId") val codeRevisionId: java.util.UUID? = null,
+
+    @Schema(example = "null", description = "Revision of the code (for SELF-PVP mode)")
+    @get:JsonProperty("codeRevisionId2") val codeRevisionId2: java.util.UUID? = null
 ) {
 
 }

library/src/main/kotlin/delta/codecharacter/dtos/MatchModeDto.kt

@@ -16,13 +16,15 @@ import io.swagger.v3.oas.annotations.media.Schema
 
 /**
 * Match Mode
-* Values: SELF,MANUAL,AUTO,DAILYCHALLENGE
+* Values: SELF,MANUAL,AUTO,DAILYCHALLENGE,PVP,SELFPVP
 */
 enum class MatchModeDto(val value: kotlin.String) {
 
     @JsonProperty("SELF") SELF("SELF"),
     @JsonProperty("MANUAL") MANUAL("MANUAL"),
     @JsonProperty("AUTO") AUTO("AUTO"),
-    @JsonProperty("DAILYCHALLENGE") DAILYCHALLENGE("DAILYCHALLENGE")
+    @JsonProperty("DAILYCHALLENGE") DAILYCHALLENGE("DAILYCHALLENGE"),
+    @JsonProperty("PVP") PVP("PVP"),
+    @JsonProperty("SELFPVP") SELFPVP("SELFPVP")
 }
 

library/src/main/kotlin/delta/codecharacter/dtos/PvPGameDto.kt

@@ -0,0 +1,42 @@
+package delta.codecharacter.dtos
+
+import java.util.Objects
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonValue
+import delta.codecharacter.dtos.PvPGameStatusDto
+import jakarta.validation.constraints.DecimalMax
+import jakarta.validation.constraints.DecimalMin
+import jakarta.validation.constraints.Email
+import jakarta.validation.constraints.Max
+import jakarta.validation.constraints.Min
+import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Pattern
+import jakarta.validation.constraints.Size
+import jakarta.validation.Valid
+import io.swagger.v3.oas.annotations.media.Schema
+
+/**
+ * PvP Game model
+ * @param id 
+ * @param scorePlayer1 
+ * @param scorePlayer2 
+ * @param status 
+ */
+data class PvPGameDto(
+
+    @Schema(example = "123e4567-e89b-12d3-a456-426614174000", required = true, description = "")
+    @get:JsonProperty("id", required = true) val id: java.util.UUID,
+
+    @Schema(example = "69", required = true, description = "")
+    @get:JsonProperty("scorePlayer1", required = true) val scorePlayer1: kotlin.Int,
+
+    @Schema(example = "69", required = true, description = "")
+    @get:JsonProperty("scorePlayer2", required = true) val scorePlayer2: kotlin.Int,
+
+    @field:Valid
+    @Schema(example = "null", required = true, description = "")
+    @get:JsonProperty("status", required = true) val status: PvPGameStatusDto
+) {
+
+}
+

library/src/main/kotlin/delta/codecharacter/dtos/PvPGameStatusDto.kt

@@ -0,0 +1,28 @@
+package delta.codecharacter.dtos
+
+import java.util.Objects
+import com.fasterxml.jackson.annotation.JsonValue
+import com.fasterxml.jackson.annotation.JsonProperty
+import jakarta.validation.constraints.DecimalMax
+import jakarta.validation.constraints.DecimalMin
+import jakarta.validation.constraints.Email
+import jakarta.validation.constraints.Max
+import jakarta.validation.constraints.Min
+import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Pattern
+import jakarta.validation.constraints.Size
+import jakarta.validation.Valid
+import io.swagger.v3.oas.annotations.media.Schema
+
+/**
+* 
+* Values: IDLE,EXECUTING,EXECUTED,EXECUTE_ERROR
+*/
+enum class PvPGameStatusDto(val value: kotlin.String) {
+
+    @JsonProperty("IDLE") IDLE("IDLE"),
+    @JsonProperty("EXECUTING") EXECUTING("EXECUTING"),
+    @JsonProperty("EXECUTED") EXECUTED("EXECUTED"),
+    @JsonProperty("EXECUTE_ERROR") EXECUTE_ERROR("EXECUTE_ERROR")
+}
+