HOTFIX remove conflicts (#631)

bounswe · Dec 24, 2023 · f4d4a11 · f4d4a11
1 parent a7029ad
commit f4d4a11
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/app/backend/src/main/kotlin/com/gamelounge/backend/model/DTO/UserGameRatingDTO.kt b/app/backend/src/main/kotlin/com/gamelounge/backend/model/DTO/UserGameRatingDTO.kt
@@ -1,12 +1,7 @@
 package com.gamelounge.backend.model.DTO
 
-class UserGameRatingDTO (
-    var user: UserDTO,
-    var game: GameDTO,
-    var rating: Int
-)
-
 data class UserGameRatingDTO(
+    var user: UserDTO,
     var gameDTO: GameDTO,
     var score: Int
 )

diff --git a/app/backend/src/main/kotlin/com/gamelounge/backend/model/response/GetUserInfoResponse.kt b/app/backend/src/main/kotlin/com/gamelounge/backend/model/response/GetUserInfoResponse.kt
@@ -9,7 +9,6 @@ data class GetUserInfoResponse(
     val profilePicture: String? = null,
     val about: String? = null,
     val isAdmin: Boolean = false,
-    val isVisible: Boolean = false,
     val isDeleted: Boolean = false,
     val tags: List<TagDTO>? = null,
     val title: String? = null,

diff --git a/app/backend/src/main/kotlin/com/gamelounge/backend/service/UserService.kt b/app/backend/src/main/kotlin/com/gamelounge/backend/service/UserService.kt
@@ -111,6 +111,7 @@ class UserService(
             user.profilePicture,
             user.about,
             user.isAdmin,
+            user.isDeleted,
             convertBulkToTagDTO(user.tags),
             user.title,
             user.company,

diff --git a/app/backend/src/main/kotlin/com/gamelounge/backend/util/ConverterDTO.kt b/app/backend/src/main/kotlin/com/gamelounge/backend/util/ConverterDTO.kt
@@ -146,6 +146,7 @@ object ConverterDTO {
 
     fun converToUserGameRatingDTO(userGameRating: UserGameRating): UserGameRatingDTO{
         return UserGameRatingDTO(
+            convertToUserDTO(userGameRating.user),
             convertToGameDTO(userGameRating.game),
             userGameRating.score
         )
@@ -184,4 +185,4 @@ object ConverterDTO {
         )
     }
 }
-}
+