From d3481797f90c052e5baee57d97cabb7d90e978fa Mon Sep 17 00:00:00 2001 From: luevard Date: Thu, 6 Jun 2024 13:04:58 +0200 Subject: [PATCH] :sparkles: Fix code smell --- .../allin/data/mock/MockBetDataSource.kt | 40 +++++------ .../src/main/kotlin/allin/model/ApiMessage.kt | 5 ++ .../main/kotlin/allin/routing/betRouter.kt | 57 ++++++++-------- .../main/kotlin/allin/routing/friendRouter.kt | 48 +++++++------ .../main/kotlin/allin/routing/userRouter.kt | 67 +++++++++---------- 5 files changed, 112 insertions(+), 105 deletions(-) diff --git a/Sources/src/main/kotlin/allin/data/mock/MockBetDataSource.kt b/Sources/src/main/kotlin/allin/data/mock/MockBetDataSource.kt index 82e8448..8a8f1dd 100644 --- a/Sources/src/main/kotlin/allin/data/mock/MockBetDataSource.kt +++ b/Sources/src/main/kotlin/allin/data/mock/MockBetDataSource.kt @@ -87,32 +87,32 @@ class MockBetDataSource(private val mockData: MockDataSource.MockData) : BetData override fun updateBetStatuses(date: ZonedDateTime) { bets.forEachIndexed { idx, bet -> - if (bet.status != CANCELLED && bet.status != FINISHED) { - if (date >= bet.endRegistration) { - if (date >= bet.endBet) { - if (date.plusWeeks(1) >= bet.endBet) { - bets[idx] = bet.copy(status = CANCELLED) - - participations - .filter { it.betId == bets[idx].id } - .forEach { p -> - users.replaceAll { - if (it.username == p.username) { - it.copy(nbCoins = it.nbCoins + p.stake) - } else it - } - } - } else { - bets[idx] = bet.copy(status = CLOSING) - } - } else { - bets[idx] = bet.copy(status = WAITING) + if (bet.status != CANCELLED && bet.status != FINISHED && date >= bet.endRegistration) { + bets[idx] = when { + date >= bet.endBet && date.plusWeeks(1) >= bet.endBet -> { + cancelBet(bet) } + + date >= bet.endBet -> bet.copy(status = CLOSING) + else -> bet.copy(status = WAITING) } } } } + private fun cancelBet(bet: Bet): Bet { + participations + .filter { it.betId == bet.id } + .forEach { p -> + users.replaceAll { user -> + if (user.username == p.username) { + user.copy(nbCoins = user.nbCoins + p.stake) + } else user + } + } + return bet.copy(status = CANCELLED) + } + override fun getToConfirm(user: UserDTO): List = bets.filter { it.createdBy == user.id && it.status == CLOSING } .map { it.toBetDetail(user.username) } diff --git a/Sources/src/main/kotlin/allin/model/ApiMessage.kt b/Sources/src/main/kotlin/allin/model/ApiMessage.kt index 0a01c92..ec92d09 100644 --- a/Sources/src/main/kotlin/allin/model/ApiMessage.kt +++ b/Sources/src/main/kotlin/allin/model/ApiMessage.kt @@ -19,4 +19,9 @@ object ApiMessage { const val FRIENDS_REQUEST_HIMSELF = "The receiver can't be the sender." const val FILE_NOT_FOUND = "File not found." const val USER_DOESNT_HAVE_PERMISSION = "This user can't delete or modify this." + const val JWT_TOKEN_INFO = "JWT token of the logged user" + const val ID_BET_INFO = "Id of the desired bet" + const val BET_NOT_FOUND_INFO = "Bet not found in the selected source" + const val NOT_CREATOR_INFO = "The user is not the creator of the bet" + const val USER_UPDATE_INFO = "New User information" } \ No newline at end of file diff --git a/Sources/src/main/kotlin/allin/routing/betRouter.kt b/Sources/src/main/kotlin/allin/routing/betRouter.kt index c143f86..34ec014 100644 --- a/Sources/src/main/kotlin/allin/routing/betRouter.kt +++ b/Sources/src/main/kotlin/allin/routing/betRouter.kt @@ -30,7 +30,7 @@ fun Application.betRouter() { post("/bets/add", { description = "Allows a user to create a new bet" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) body { description = "Bet to add in the selected source" } @@ -73,7 +73,7 @@ fun Application.betRouter() { post("/bets/gets", { description = "Allows you to recover all bets" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) body> { description = "List of filters" } @@ -105,7 +105,7 @@ fun Application.betRouter() { get("/bets/popular", { description = "Allows you to recover the most popular public bets" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.Accepted to { @@ -134,7 +134,7 @@ fun Application.betRouter() { get("/bets/get/{id}", { description = "Retrieves a specific bet" request { - pathParameter("Id of the desired bet") + pathParameter(ApiMessage.ID_BET_INFO) } response { HttpStatusCode.Accepted to { @@ -144,7 +144,7 @@ fun Application.betRouter() { } } HttpStatusCode.NotFound to { - description = "Bet not found in the selected source" + description = ApiMessage.BET_NOT_FOUND_INFO body(ApiMessage.BET_NOT_FOUND) } } @@ -162,7 +162,7 @@ fun Application.betRouter() { description = "Delete a specific bet" request { body> { - description = "Id of the desired bet" + description = ApiMessage.ID_BET_INFO } } response { @@ -170,7 +170,7 @@ fun Application.betRouter() { description = "The bet has been deleted" } HttpStatusCode.NotFound to { - description = "Bet not found in the selected source" + description = ApiMessage.BET_NOT_FOUND_INFO body(ApiMessage.BET_NOT_FOUND) } } @@ -198,7 +198,7 @@ fun Application.betRouter() { description = "The bet has been updated" } HttpStatusCode.NotFound to { - description = "Bet not found in the selected source" + description = ApiMessage.BET_NOT_FOUND_INFO body(ApiMessage.BET_NOT_FOUND) } } @@ -218,7 +218,7 @@ fun Application.betRouter() { get("/bets/toConfirm", { description = "Allows a user to know which bets can be validated" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.Accepted to { @@ -244,7 +244,7 @@ fun Application.betRouter() { get("/bets/getWon", { description = "Allows a user to know their won bets" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.Accepted to { @@ -269,7 +269,7 @@ fun Application.betRouter() { get("/bets/history", { description = "Allows a user to know own history of bets" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.Accepted to { @@ -297,7 +297,7 @@ fun Application.betRouter() { get("/bets/current", { description = "Allows a user to know current bets" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.Accepted to { @@ -323,10 +323,10 @@ fun Application.betRouter() { authenticate { post("/bets/confirm/{id}", { - description = "allows the creator of a bet to confrm the final answer" + description = "allows the creator of a bet to confirm the final answer" request { - headerParameter("JWT token of the logged user") - pathParameter("Id of the desired bet") + headerParameter(ApiMessage.JWT_TOKEN_INFO) + pathParameter(ApiMessage.ID_BET_INFO) body { description = "Final answer of the bet" } @@ -336,7 +336,7 @@ fun Application.betRouter() { description = "The final answer has been set" } HttpStatusCode.Unauthorized to { - description = "The user is not the creator of the bet" + description = ApiMessage.NOT_CREATOR_INFO } } }) { @@ -360,47 +360,44 @@ fun Application.betRouter() { post("/bets/users", { description = "gets all userDTO of a bet" request { - headerParameter("JWT token of the logged user") - pathParameter("Id of the desired bet") + headerParameter(ApiMessage.JWT_TOKEN_INFO) + pathParameter(ApiMessage.ID_BET_INFO) body> { description = "UserDTO of the bet" } } response { - HttpStatusCode.OK to { - description = "The final answer has been set" - } - HttpStatusCode.Unauthorized to { - description = "The user is not the creator of the bet" + HttpStatusCode.Accepted to { + description = "List of 4 user of the selected bet" } } }) { logManager.log("Routing", "POST /bets/users") hasToken { principal -> - verifyUserFromToken(userDataSource, principal) { user, _ -> + verifyUserFromToken(userDataSource, principal) { _, _ -> val id = call.receive>()["id"] ?: "" val participations = participationDataSource.getParticipationFromBetId(id) val users = participations.map { userDataSource.getUserByUsername(it.username).first }.toSet().take(4) .toList() - call.respond(users) + call.respond(HttpStatusCode.Accepted, users) } } } post("/bets/pvbet/update", { description = "Add new users to a private bet" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) body { description = "Bet id and list of new users" } } response { - HttpStatusCode.OK to { - description = "The final answer has been set" + HttpStatusCode.Accepted to { + description = "Invited users list updated" } HttpStatusCode.Unauthorized to { - description = "The user is not the creator of the bet" + description = ApiMessage.NOT_CREATOR_INFO } } }) { @@ -410,7 +407,7 @@ fun Application.betRouter() { val updateRequest = call.receive() val bet = betDataSource.getBetById(updateRequest.betid) if (user.username != bet?.createdBy) { - call.respond(HttpStatusCode.Forbidden, ApiMessage.USER_DOESNT_HAVE_PERMISSION) + call.respond(HttpStatusCode.Unauthorized, ApiMessage.USER_DOESNT_HAVE_PERMISSION) } betDataSource.addUserInPrivatebet(updateRequest) call.respond(HttpStatusCode.Accepted, updateRequest) diff --git a/Sources/src/main/kotlin/allin/routing/friendRouter.kt b/Sources/src/main/kotlin/allin/routing/friendRouter.kt index d9261ac..22aeba6 100644 --- a/Sources/src/main/kotlin/allin/routing/friendRouter.kt +++ b/Sources/src/main/kotlin/allin/routing/friendRouter.kt @@ -27,7 +27,7 @@ fun Application.friendRouter() { get("/friends/gets", { description = "Allows you to recover all friends of a JWT Token" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.Accepted to { @@ -38,12 +38,15 @@ fun Application.friendRouter() { } } }) { - logManager.log("Routing","GET /friends/gets") + logManager.log("Routing", "GET /friends/gets") hasToken { principal -> verifyUserFromToken(userDataSource, principal) { _, _ -> val username = tokenManagerBet.getUsernameFromToken(principal) val user = userDataSource.getUserByUsername(username).first - logManager.log("Routing","ACCEPTED /friends/gets\t${friendDataSource.getFriendFromUserId(user?.id.toString())}") + logManager.log( + "Routing", + "ACCEPTED /friends/gets\t${friendDataSource.getFriendFromUserId(user?.id.toString())}" + ) call.respond(HttpStatusCode.Accepted, friendDataSource.getFriendFromUserId(user?.id.toString())) } } @@ -52,7 +55,7 @@ fun Application.friendRouter() { get("/friends/requests", { description = "Allows you to recover all friend requests of a JWT Token" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.Accepted to { @@ -63,13 +66,16 @@ fun Application.friendRouter() { } } }) { - logManager.log("Routing","GET /friends/requests") + logManager.log("Routing", "GET /friends/requests") hasToken { principal -> verifyUserFromToken(userDataSource, principal) { _, _ -> val username = tokenManagerBet.getUsernameFromToken(principal) val user = userDataSource.getUserByUsername(username).first - logManager.log("Routing","ACCEPTED /friends/requests\t${friendDataSource.getFriendRequestsFromUserId(user?.id.toString()) - }") + logManager.log( + "Routing", "ACCEPTED /friends/requests\t${ + friendDataSource.getFriendRequestsFromUserId(user?.id.toString()) + }" + ) call.respond( HttpStatusCode.Accepted, friendDataSource.getFriendRequestsFromUserId(user?.id.toString()) @@ -81,7 +87,7 @@ fun Application.friendRouter() { post("/friends/add", { description = "Allows a user to add a friend" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) body { description = "User to add in the friends list" } @@ -99,7 +105,7 @@ fun Application.friendRouter() { } } }) { - logManager.log("Routing","POST /friends/add") + logManager.log("Routing", "POST /friends/add") hasToken { principal -> val requestMap = call.receive>() val usernameFriend = requestMap["username"] ?: return@hasToken call.respond( @@ -112,18 +118,18 @@ fun Application.friendRouter() { val userFriend = userDataSource.getUserByUsername(usernameFriend).first if (user == null || userFriend == null) { - logManager.log("Routing","${ApiMessage.USER_NOT_FOUND} /friends/add") + logManager.log("Routing", "${ApiMessage.USER_NOT_FOUND} /friends/add") call.respond(HttpStatusCode.Conflict, ApiMessage.USER_NOT_FOUND) } else if (userFriend == user) { - logManager.log("Routing","${ApiMessage.FRIENDS_REQUEST_HIMSELF} /friends/add") + logManager.log("Routing", "${ApiMessage.FRIENDS_REQUEST_HIMSELF} /friends/add") call.respond(HttpStatusCode.Conflict, ApiMessage.FRIENDS_REQUEST_HIMSELF) } else { val friendlist = friendDataSource.getFriendFromUserId(user.id) if (friendlist.map { it.id }.contains(userFriend.id)) { - logManager.log("Routing","${ApiMessage.FRIENDS_ALREADY_EXISTS} /friends/add") + logManager.log("Routing", "${ApiMessage.FRIENDS_ALREADY_EXISTS} /friends/add") call.respond(HttpStatusCode.Conflict, ApiMessage.FRIENDS_ALREADY_EXISTS) } else { - logManager.log("Routing","ACCEPTED /friends/add\t${usernameFriend}") + logManager.log("Routing", "ACCEPTED /friends/add\t${usernameFriend}") friendDataSource.addFriend(user.id, userFriend.id) call.respond(HttpStatusCode.Created, usernameFriend) } @@ -133,7 +139,7 @@ fun Application.friendRouter() { post("/friends/delete", { description = "Allows a user to delete a friend" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) body { description = "User to delete in the friends list" } @@ -151,7 +157,7 @@ fun Application.friendRouter() { } } }) { - logManager.log("Routing","POST /friends/delete") + logManager.log("Routing", "POST /friends/delete") hasToken { principal -> val requestMap = call.receive>() val usernameFriend = requestMap["username"] ?: return@hasToken call.respond( @@ -164,14 +170,14 @@ fun Application.friendRouter() { val userFriend = userDataSource.getUserByUsername(usernameFriend).first if (user == null || userFriend == null) { - logManager.log("Routing","${ApiMessage.USER_NOT_FOUND} /friends/delete") + logManager.log("Routing", "${ApiMessage.USER_NOT_FOUND} /friends/delete") call.respond(HttpStatusCode.Conflict, ApiMessage.USER_NOT_FOUND) } else { if (friendDataSource.deleteFriend(user.id, userFriend.id)) { - logManager.log("Routing","ACCEPTED /friends/delete\t${usernameFriend}") + logManager.log("Routing", "ACCEPTED /friends/delete\t${usernameFriend}") call.respond(HttpStatusCode.Created, usernameFriend) } else { - logManager.log("Routing","${ApiMessage.FRIENDS_DOESNT_EXISTS} /friends/delete") + logManager.log("Routing", "${ApiMessage.FRIENDS_DOESNT_EXISTS} /friends/delete") call.respond(HttpStatusCode.Conflict, ApiMessage.FRIENDS_DOESNT_EXISTS) } } @@ -182,7 +188,7 @@ fun Application.friendRouter() { get("/friends/search/{search}", { description = "Search for users based on username" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) pathParameter("Search string") } response { @@ -194,14 +200,14 @@ fun Application.friendRouter() { } }) { - logManager.log("Routing","GET /friends/search/{search}") + logManager.log("Routing", "GET /friends/search/{search}") hasToken { principal -> verifyUserFromToken(userDataSource, principal) { userDto, _ -> val users = friendDataSource.filterUsersByUsername( fromUserId = userDto.id, search = call.parameters["search"] ?: "" ) - logManager.log("Routing","ACCEPTED /friends/search/{search}\t${users}") + logManager.log("Routing", "ACCEPTED /friends/search/{search}\t${users}") call.respond(HttpStatusCode.OK, users) } } diff --git a/Sources/src/main/kotlin/allin/routing/userRouter.kt b/Sources/src/main/kotlin/allin/routing/userRouter.kt index ec9400e..84c7e7c 100644 --- a/Sources/src/main/kotlin/allin/routing/userRouter.kt +++ b/Sources/src/main/kotlin/allin/routing/userRouter.kt @@ -37,7 +37,7 @@ fun Application.userRouter() { description = "Allows a user to register" request { body { - description = "User information" + description = ApiMessage.USER_UPDATE_INFO } } response { @@ -57,16 +57,16 @@ fun Application.userRouter() { } } }) { - logManager.log("Routing","POST /users/register") + logManager.log("Routing", "POST /users/register") val tempUser = call.receive() if (RegexCheckerUser.isEmailInvalid(tempUser.email)) { - logManager.log("Routing","${ApiMessage.INVALID_MAIL} /users/register") + logManager.log("Routing", "${ApiMessage.INVALID_MAIL} /users/register") call.respond(HttpStatusCode.Forbidden, ApiMessage.INVALID_MAIL) } else if (userDataSource.userExists(tempUser.username)) { - logManager.log("Routing","${ApiMessage.USER_ALREADY_EXISTS} /users/register") + logManager.log("Routing", "${ApiMessage.USER_ALREADY_EXISTS} /users/register") call.respond(HttpStatusCode.Conflict, ApiMessage.USER_ALREADY_EXISTS) } else if (userDataSource.emailExists(tempUser.email)) { - logManager.log("Routing","${ApiMessage.MAIL_ALREADY_EXISTS} /users/register") + logManager.log("Routing", "${ApiMessage.MAIL_ALREADY_EXISTS} /users/register") call.respond(HttpStatusCode.Conflict, ApiMessage.MAIL_ALREADY_EXISTS) } else { val user = User( @@ -83,7 +83,7 @@ fun Application.userRouter() { CryptManagerUser.passwordCrypt(user) user.token = tokenManagerUser.generateOrReplaceJWTToken(user) userDataSource.addUser(user) - logManager.log("Routing","ACCEPTED /users/register\t${user}") + logManager.log("Routing", "ACCEPTED /users/register\t${user}") call.respond(HttpStatusCode.Created, user) } } @@ -92,7 +92,7 @@ fun Application.userRouter() { description = "Allows a user to login" request { body { - description = "User information" + description = ApiMessage.USER_UPDATE_INFO } } response { @@ -106,25 +106,24 @@ fun Application.userRouter() { } } }) { - logManager.log("Routing","POST /users/login") + logManager.log("Routing", "POST /users/login") val checkUser = call.receive() val user = userDataSource.getUserByUsername(checkUser.login) if (CryptManagerUser.passwordDecrypt(user.second ?: "", checkUser.password)) { user.first?.let { userDtoWithToken -> userDtoWithToken.token = tokenManagerUser.generateOrReplaceJWTToken(userDtoWithToken) - logManager.log("Routing","ACCEPTED /users/login\t${userDtoWithToken}") + logManager.log("Routing", "ACCEPTED /users/login\t${userDtoWithToken}") call.respond(HttpStatusCode.OK, userDtoWithToken) - } ?: - logManager.log("Routing","${ApiMessage.USER_NOT_FOUND} /users/login") + } ?: logManager.log("Routing", "${ApiMessage.USER_NOT_FOUND} /users/login") call.respond(HttpStatusCode.NotFound, ApiMessage.USER_NOT_FOUND) } else { - logManager.log("Routing","${ApiMessage.INCORRECT_LOGIN_PASSWORD} /users/login") + logManager.log("Routing", "${ApiMessage.INCORRECT_LOGIN_PASSWORD} /users/login") call.respond(HttpStatusCode.NotFound, ApiMessage.INCORRECT_LOGIN_PASSWORD) } } get("/users/images/{fileName}") { - logManager.log("Routing","GET /users/images/{fileName}") + logManager.log("Routing", "GET /users/images/{fileName}") val fileName = call.parameters["fileName"] val urlfile = "images/$fileName" val file = File("$urlfile.png") @@ -134,10 +133,10 @@ fun Application.userRouter() { val imageBytes = userDataSource.getImage(fileName.toString()) if (imageBytes != null) { imageManagerUser.saveImage(urlfile, imageBytes) - logManager.log("Routing","ACCEPTED /users/images/{fileName}") + logManager.log("Routing", "ACCEPTED /users/images/{fileName}") call.respondFile(file) } else { - logManager.log("Routing","${ApiMessage.FILE_NOT_FOUND} /users/images/{fileName}") + logManager.log("Routing", "${ApiMessage.FILE_NOT_FOUND} /users/images/{fileName}") call.respond(HttpStatusCode.NotFound, ApiMessage.FILE_NOT_FOUND) } } @@ -148,9 +147,9 @@ fun Application.userRouter() { description = "Allow you to delete your account" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) body { - description = "User information" + description = ApiMessage.USER_UPDATE_INFO } } response { @@ -170,19 +169,19 @@ fun Application.userRouter() { } }) { - logManager.log("Routing","POST /users/delete") + logManager.log("Routing", "POST /users/delete") hasToken { principal -> verifyUserFromToken(userDataSource, principal) { _, password -> val checkUser = call.receive() if (CryptManagerUser.passwordDecrypt(password, checkUser.password)) { if (!userDataSource.deleteUser(checkUser.login)) { - logManager.log("Routing","${ApiMessage.USER_CANT_BE_DELETE} /users/delete") + logManager.log("Routing", "${ApiMessage.USER_CANT_BE_DELETE} /users/delete") call.respond(HttpStatusCode.InternalServerError, ApiMessage.USER_CANT_BE_DELETE) } - logManager.log("Routing","ACCEPTED /users/delete") + logManager.log("Routing", "ACCEPTED /users/delete") call.respond(HttpStatusCode.Accepted, password) } else { - logManager.log("Routing","${ApiMessage.INCORRECT_LOGIN_PASSWORD} /users/delete") + logManager.log("Routing", "${ApiMessage.INCORRECT_LOGIN_PASSWORD} /users/delete") call.respond(HttpStatusCode.NotFound, ApiMessage.INCORRECT_LOGIN_PASSWORD) } @@ -193,7 +192,7 @@ fun Application.userRouter() { get("/users/token", { description = "Allows you to retrieve the user linked to a JWT token" request { - headerParameter("JWT token of the user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.OK to { @@ -203,10 +202,10 @@ fun Application.userRouter() { } } }) { - logManager.log("Routing","GET /users/token") + logManager.log("Routing", "GET /users/token") hasToken { principal -> verifyUserFromToken(userDataSource, principal) { userDto, _ -> - logManager.log("Routing","ACCEPTED /users/token\t${userDto}") + logManager.log("Routing", "ACCEPTED /users/token\t${userDto}") call.respond(HttpStatusCode.OK, userDto) } } @@ -214,7 +213,7 @@ fun Application.userRouter() { get("/users/gift", { description = "Allows you to collect your daily gift" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) } response { HttpStatusCode.OK to { @@ -230,15 +229,15 @@ fun Application.userRouter() { } }) { - logManager.log("Routing","GET /users/gift") + logManager.log("Routing", "GET /users/gift") hasToken { principal -> verifyUserFromToken(userDataSource, principal) { userDto, _ -> if (userDataSource.canHaveDailyGift(userDto.username)) { val dailyGift = (DAILY_GIFT_MIN..DAILY_GIFT_MAX).random() userDataSource.addCoins(userDto.username, dailyGift) - logManager.log("Routing","ACCEPTED /users/gift\t${dailyGift}") + logManager.log("Routing", "ACCEPTED /users/gift\t${dailyGift}") call.respond(HttpStatusCode.OK, dailyGift) - logManager.log("Routing","${ApiMessage.NO_GIFT} /users/gift") + logManager.log("Routing", "${ApiMessage.NO_GIFT} /users/gift") } else call.respond(HttpStatusCode.MethodNotAllowed, ApiMessage.NO_GIFT) } } @@ -248,9 +247,9 @@ fun Application.userRouter() { description = "Allow you to add a profil image" request { - headerParameter("JWT token of the logged user") + headerParameter(ApiMessage.JWT_TOKEN_INFO) body { - description = "User information" + description = ApiMessage.USER_UPDATE_INFO } } response { @@ -264,7 +263,7 @@ fun Application.userRouter() { } }) { - logManager.log("Routing","POST /users/images") + logManager.log("Routing", "POST /users/images") hasToken { principal -> verifyUserFromToken(userDataSource, principal) { user, _ -> @@ -276,11 +275,11 @@ fun Application.userRouter() { if (imageByteArray != null && imageByteArray.isNotEmpty()) { userDataSource.removeImage(user.id) userDataSource.addImage(user.id, imageByteArray) - logManager.log("Routing","ACCEPTED /users/images") + logManager.log("Routing", "ACCEPTED /users/images") call.respond(HttpStatusCode.OK, "${urlManager.getURL()}users/${urlfile}") } - logManager.log("Routing","${ApiMessage.FILE_NOT_FOUND} /users/images") - call.respond(HttpStatusCode.Conflict,ApiMessage.FILE_NOT_FOUND) + logManager.log("Routing", "${ApiMessage.FILE_NOT_FOUND} /users/images") + call.respond(HttpStatusCode.Conflict, ApiMessage.FILE_NOT_FOUND) } } }