Merge branch 'change-db' into 'master'

Change db

See merge request os-incubator/kicker/kicker-v2!61

Author: Ruslan Molchanov

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- History of stats and relations after every game
+
+### Changed
+- PageRequest
 
 
 ## [1.2.2] - 2019-04-10

backend/src/main/kotlin/io/zensoft/kicker/annotation/Contains.kt

@@ -13,7 +13,7 @@ import kotlin.reflect.KClass
 @Constraint(validatedBy = [(ContainsValidator::class)])
 annotation class Contains(
         val value: String,
-        val set: String,
+        val map: String,
         val message: String = "Collection is not contains value",
         val groups: Array<KClass<out Any>> = [],
         val payload: Array<KClass<out Payload>> = []

backend/src/main/kotlin/io/zensoft/kicker/annotation/validator/ContainsValidator.kt

@@ -11,26 +11,26 @@ import javax.validation.ConstraintValidatorContext
 class ContainsValidator : ConstraintValidator<Contains, Any> {
 
     private lateinit var valueFieldName: String
-    private lateinit var setFieldName: String
+    private lateinit var mapFieldName: String
     private lateinit var message: String
 
 
     override fun initialize(constraintAnnotation: Contains) {
         valueFieldName = constraintAnnotation.value
-        setFieldName = constraintAnnotation.set
+        mapFieldName = constraintAnnotation.map
         message = constraintAnnotation.message
     }
 
     override fun isValid(clazz: Any, context: ConstraintValidatorContext): Boolean {
         val value = ConstraintValidatorUtils.getValueFromField(clazz, valueFieldName)
-        val set = ConstraintValidatorUtils.getValueFromField(clazz, setFieldName) as Set<*>
+        val map = ConstraintValidatorUtils.getValueFromField(clazz, mapFieldName) as Map<*, *>
 
-        val condition = set.contains(value)
+        val condition = map.contains(value)
 
         return when (condition) {
             true -> true
             false -> {
-                ConstraintValidatorUtils.buildConstraintViolation(context, message, setFieldName)
+                ConstraintValidatorUtils.buildConstraintViolation(context, message, mapFieldName)
                 false
             }
         }

backend/src/main/kotlin/io/zensoft/kicker/component/listener/PlayerRelationsListener.kt

@@ -1,9 +1,11 @@
 package io.zensoft.kicker.component.listener
 
 import io.zensoft.kicker.model.Game
+import io.zensoft.kicker.model.PlayerRelations
 import io.zensoft.kicker.service.PlayerRelationsService
 import org.springframework.context.event.EventListener
 import org.springframework.stereotype.Component
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * @author Yauheni Efimenko
@@ -14,18 +16,38 @@ class PlayerRelationsListener(
         private val playerRelationsService: PlayerRelationsService
 ) {
 
+    @Transactional
     @EventListener
     fun handleRegistrationGame(game: Game) {
         with(game) {
             val winner1ToWinner2 = playerRelationsService.getByPlayerAndPartner(winner1.id, winner2.id)
-            val winner2ToWinner3 = playerRelationsService.getByPlayerAndPartner(winner2.id, winner1.id)
+            val winner2ToWinner1 = playerRelationsService.getByPlayerAndPartner(winner2.id, winner1.id)
             val loser1ToLoser2 = playerRelationsService.getByPlayerAndPartner(loser1.id, loser2.id)
             val loser2ToLoser1 = playerRelationsService.getByPlayerAndPartner(loser2.id, loser1.id)
 
-            winner1ToWinner2.addWin()
-            winner2ToWinner3.addWin()
-            loser1ToLoser2.addLoss()
-            loser2ToLoser1.addLoss()
+            if (null == winner1ToWinner2) {
+                playerRelationsService.add(PlayerRelations(winner1, winner2, game, true))
+            } else {
+                playerRelationsService.add(PlayerRelations(winner1ToWinner2, game, true))
+            }
+
+            if (null == winner2ToWinner1) {
+                playerRelationsService.add(PlayerRelations(winner2, winner1, game, true))
+            } else {
+                playerRelationsService.add(PlayerRelations(winner2ToWinner1, game, true))
+            }
+
+            if (null == loser1ToLoser2) {
+                playerRelationsService.add(PlayerRelations(loser1, loser2, game, false))
+            } else {
+                playerRelationsService.add(PlayerRelations(loser1ToLoser2, game, false))
+            }
+
+            if (null == loser2ToLoser1) {
+                playerRelationsService.add(PlayerRelations(loser2, loser1, game, false))
+            } else {
+                playerRelationsService.add(PlayerRelations(loser2ToLoser1, game, false))
+            }
         }
     }
 

backend/src/main/kotlin/io/zensoft/kicker/component/listener/PlayerStatsListener.kt

@@ -10,6 +10,7 @@ import io.zensoft.kicker.service.PlayerToGameService
 import io.zensoft.kicker.utils.RatingUtils
 import org.springframework.context.event.EventListener
 import org.springframework.stereotype.Component
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * @author Yauheni Efimenko
@@ -23,6 +24,7 @@ class PlayerStatsListener(
         private val playerSettingsProperties: PlayerSettingsProperties
 ) {
 
+    @Transactional
     @EventListener
     fun handleRegistrationGame(game: Game) {
         with(game) {
@@ -51,14 +53,14 @@ class PlayerStatsListener(
 
     private fun updatePlayerStats(stats: PlayerStats, game: Game, won: Boolean, delta: Double) {
         if (won) {
-            stats.addGame(won, game.losersGoals, gamesSettingsProperties.defaultMaxScore!!, delta)
+            playerStatsService.add(PlayerStats(stats, game, won, game.losersGoals,
+                    gamesSettingsProperties.defaultMaxScore!!, delta, playerSettingsProperties.countGames!!))
         } else {
-            stats.addGame(won, gamesSettingsProperties.defaultMaxScore!!, game.losersGoals, delta)
+            playerStatsService.add(PlayerStats(stats, game, won, gamesSettingsProperties.defaultMaxScore!!,
+                    game.losersGoals, delta, playerSettingsProperties.countGames!!))
         }
-        stats.active = stats.rated >= playerSettingsProperties.countGames!!
 
-        playerStatsService.save(stats)
-        playerToGameService.save(PlayerToGame(stats.player, game, won, delta))
+        playerToGameService.add(PlayerToGame(stats.player, game, won, delta))
     }
 
-}
+}

backend/src/main/kotlin/io/zensoft/kicker/domain/PageRequest.kt

@@ -9,17 +9,17 @@ import javax.validation.constraints.Min
 /**
  * @author Yauheni Efimenko
  */
-@Contains(value = "sortBy", set = "setSortBy", message = "Collection is not contains value for sorting")
+@Contains(value = "sortBy", map = "mapSortBy", message = "Collection is not contains value for sorting")
 open class PageRequest(
         @field:Min(value = 0) var offset: Int = 0,
         @field:Min(value = 1) @field:Max(100) var limit: Int = 10,
         var sortDirection: Sort.Direction = Sort.Direction.ASC,
-        var sortBy: String = ID_FIELD,
-        private val setSortBy: Set<String> = setOf(ID_FIELD)
+        var sortBy: String = ID_FIELD.first,
+        private val mapSortBy: Map<String, String> = mapOf(ID_FIELD)
 ) : Pageable {
 
     companion object {
-        const val ID_FIELD = "id"
+        val ID_FIELD = "id" to "id"
     }
 
 
@@ -28,25 +28,25 @@ open class PageRequest(
     override fun hasPrevious(): Boolean = offset > 0
 
     override fun getSort(): Sort {
-        if (sortBy == ID_FIELD) {
-            return Sort(sortDirection, ID_FIELD)
+        if (sortBy == ID_FIELD.first) {
+            return Sort(sortDirection, ID_FIELD.second)
         }
-        return Sort(sortDirection, sortBy, ID_FIELD)
+        return Sort(sortDirection, mapSortBy[sortBy], ID_FIELD.second)
     }
 
-    override fun next(): Pageable = PageRequest(offset + limit, limit, sortDirection, sortBy, setSortBy)
+    override fun next(): Pageable = PageRequest(offset + limit, limit, sortDirection, sortBy, mapSortBy)
 
     override fun getPageSize(): Int = limit
 
     override fun getOffset(): Long = offset.toLong()
 
-    override fun first(): Pageable = PageRequest(0, limit, sortDirection, sortBy, setSortBy)
+    override fun first(): Pageable = PageRequest(0, limit, sortDirection, sortBy, mapSortBy)
 
     private fun previous(): Pageable {
         if (hasPrevious()) {
             var newOffset = this.offset - limit
             if (newOffset < 0) newOffset = 0
-            return PageRequest(newOffset, limit, sortDirection, sortBy, setSortBy)
+            return PageRequest(newOffset, limit, sortDirection, sortBy, mapSortBy)
         }
         return first()
     }
@@ -63,7 +63,7 @@ open class PageRequest(
         if (limit != other.limit) return false
         if (sortDirection != other.sortDirection) return false
         if (sortBy != other.sortBy) return false
-        if (setSortBy != other.setSortBy) return false
+        if (mapSortBy != other.mapSortBy) return false
 
         return true
     }
@@ -73,7 +73,7 @@ open class PageRequest(
         result = 31 * result + limit
         result = 31 * result + sortDirection.hashCode()
         result = 31 * result + sortBy.hashCode()
-        result = 31 * result + setSortBy.hashCode()
+        result = 31 * result + mapSortBy.hashCode()
         return result
     }
 

backend/src/main/kotlin/io/zensoft/kicker/domain/model/game/GamePageRequest.kt

@@ -2,10 +2,10 @@ package io.zensoft.kicker.domain.model.game
 
 import io.zensoft.kicker.domain.PageRequest
 
-class GamePageRequest : PageRequest(setSortBy = setOf(ID_FIELD, DATE_FIELD)) {
+class GamePageRequest : PageRequest(mapSortBy = mapOf(ID_FIELD, DATE_FIELD)) {
 
     companion object {
-        const val DATE_FIELD = "date"
+        val DATE_FIELD = "date" to "date"
     }
 
-}
+}

backend/src/main/kotlin/io/zensoft/kicker/domain/model/playerRelations/PlayerRelationsPageRequest.kt

@@ -5,10 +5,10 @@ import io.zensoft.kicker.domain.PageRequest
 /**
  * @author Yauheni Efimenko
  */
-class PlayerRelationsPageRequest : PageRequest(setSortBy = setOf(ID_FIELD, WINNING_PERCENTAGE_FIELD)) {
+class PlayerRelationsPageRequest : PageRequest(mapSortBy = mapOf(ID_FIELD, WINNING_PERCENTAGE_FIELD)) {
 
     companion object {
-        const val WINNING_PERCENTAGE_FIELD = "winningPercentage"
+        val WINNING_PERCENTAGE_FIELD = "winningPercentage" to "winning_percentage"
     }
 
-}
+}

backend/src/main/kotlin/io/zensoft/kicker/domain/model/playerStats/PlayerStatsPageRequest.kt

@@ -2,16 +2,16 @@ package io.zensoft.kicker.domain.model.playerStats
 
 import io.zensoft.kicker.domain.PageRequest
 
-class PlayerStatsPageRequest : PageRequest(setSortBy = setOf(ID_FIELD, RATING_FIELD, COUNT_GAMES_FIELD, RATED_FIELD,
-        LONGEST_WINNING_STREAK, LONGEST_LOSSES_STREAK, WINNING_PERCENTAGE)) {
+class PlayerStatsPageRequest : PageRequest(mapSortBy = mapOf(ID_FIELD, RATING_FIELD, COUNT_GAMES_FIELD, RATED_FIELD,
+        LONGEST_WINNING_STREAK_FIELD, LONGEST_LOSSES_STREAK_FIELD, WINNING_PERCENTAGE_FIELD)) {
 
     companion object {
-        const val RATING_FIELD = "rating"
-        const val COUNT_GAMES_FIELD = "countGames"
-        const val RATED_FIELD = "rated"
-        const val LONGEST_WINNING_STREAK = "longestWinningStreak"
-        const val LONGEST_LOSSES_STREAK = "longestLossesStreak"
-        const val WINNING_PERCENTAGE = "winningPercentage"
+        val RATING_FIELD = "rating" to "rating"
+        val COUNT_GAMES_FIELD = "countGames" to "count_games"
+        val RATED_FIELD = "rated" to "rated"
+        val LONGEST_WINNING_STREAK_FIELD = "longestWinningStreak" to "longest_winning_streak"
+        val LONGEST_LOSSES_STREAK_FIELD = "longestLossesStreak" to "longest_losses_streak"
+        val WINNING_PERCENTAGE_FIELD = "winningPercentage" to "winning_percentage"
     }
 
-}
+}

backend/src/main/kotlin/io/zensoft/kicker/model/Player.kt

@@ -3,7 +3,9 @@ package io.zensoft.kicker.model
 import io.zensoft.kicker.model.base.BaseModel
 import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.userdetails.UserDetails
-import javax.persistence.*
+import javax.persistence.Column
+import javax.persistence.Entity
+import javax.persistence.Table
 
 /**
  * @author Yauheni Efimenko
@@ -26,9 +28,6 @@ class Player(
     @Column(name = "icon_path")
     var iconPath: String? = null
 
-    @OneToOne(mappedBy = "player", fetch = FetchType.LAZY)
-    val playerStats: PlayerStats? = null
-
 
     override fun getAuthorities(): MutableCollection<out GrantedAuthority> = mutableListOf()