From 7bd4ca886015e69c19687568082a868b53ca40f9 Mon Sep 17 00:00:00 2001 From: Noan07 <84435602+Noan07@users.noreply.github.com> Date: Mon, 27 Feb 2023 15:38:36 +0100 Subject: [PATCH] =?UTF-8?q?:hammer:=20modification=20des=20dto=20et=20autr?= =?UTF-8?q?es=20classes=20en=20cons=C3=A9quences?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiLeapHit/Controllers/ChatController.cs | 31 +++++++--------- .../ApiLeapHit/Controllers/GameController.cs | 19 +++++----- .../Controllers/MessageController.cs | 33 ++++++++---------- code/server/ApiLeapHit/Mapper/ChatMapper.cs | 12 +++---- code/server/ApiLeapHit/Mapper/GameMapper.cs | 12 +++---- .../server/ApiLeapHit/Mapper/MessageMapper.cs | 19 ++++++++-- code/server/DTO/DTOChat.cs | 4 +-- code/server/DTO/DTOGame.cs | 4 +-- code/server/DTO/DTOMessage.cs | 4 +-- code/server/DataBase/PongDB.db-shm | Bin 32768 -> 0 bytes code/server/DataBase/PongDB.db-wal | 0 11 files changed, 72 insertions(+), 66 deletions(-) delete mode 100644 code/server/DataBase/PongDB.db-shm delete mode 100644 code/server/DataBase/PongDB.db-wal diff --git a/code/server/ApiLeapHit/Controllers/ChatController.cs b/code/server/ApiLeapHit/Controllers/ChatController.cs index 8ed49ba..3bc0b15 100644 --- a/code/server/ApiLeapHit/Controllers/ChatController.cs +++ b/code/server/ApiLeapHit/Controllers/ChatController.cs @@ -27,10 +27,10 @@ namespace ApiLeapHit.Controllers { try { - var player1 = await _dataManager.GetPlayer(dtoChat.PlayerId1.playerId); - var player2 = await _dataManager.GetPlayer(dtoChat.PlayerId2.playerId); + var player1 = await _dataManager.GetPlayer(dtoChat.PlayerId1); + var player2 = await _dataManager.GetPlayer(dtoChat.PlayerId2); - await _dataManager.AddChat(dtoChat.ToChat(player1, player2)); + await _dataManager.AddChat(dtoChat.ToChat()); var success_message = $"Le chat entre {player1.name} et {player2.name} a été ajouté avec succès."; _logger.LogInformation(success_message); @@ -60,10 +60,10 @@ namespace ApiLeapHit.Controllers var dtoChats = new List(); foreach (var chat in chats) { - var player1 = await _dataManager.GetPlayer(chat.player1); - var player2 = await _dataManager.GetPlayer(chat.player2); + //var player1 = await _dataManager.GetPlayer(chat.player1); + //var player2 = await _dataManager.GetPlayer(chat.player2); - var dtoChat = chat.ToDto(player1, player2); + var dtoChat = chat.ToDto(); dtoChats.Add(dtoChat); } @@ -93,10 +93,10 @@ namespace ApiLeapHit.Controllers return NotFound(new ApiResponse(message)); } - var player1 = await _dataManager.GetPlayer(chat.player1); - var player2 = await _dataManager.GetPlayer(chat.player2); + //var player1 = await _dataManager.GetPlayer(chat.player1); + //var player2 = await _dataManager.GetPlayer(chat.player2); - var dtoChat = chat.ToDto(player1, player2); + var dtoChat = chat.ToDto(); var success_message = $"La récupération du chat a réussi pour le chat {id}."; _logger.LogInformation(success_message); @@ -126,12 +126,7 @@ namespace ApiLeapHit.Controllers var dtoChats = new List(); foreach (var chat in chats) { - var player1 = await _dataManager.GetPlayer(chat.player1); - var player2 = await _dataManager.GetPlayer(chat.player2); - - var dtoChat = chat.ToDto(player1, player2); - - dtoChats.Add(dtoChat); + dtoChats.Add(chat.ToDto()); } var success_message = $"La récupération des chats a réussi pour l'id : {id}. Nombre de chats : {dtoChats.Count}"; @@ -162,10 +157,10 @@ namespace ApiLeapHit.Controllers var dtoChats = new List(); foreach (var chat in chats) { - var player1 = await _dataManager.GetPlayer(chat.player1); - var player2 = await _dataManager.GetPlayer(chat.player2); + //var player1 = await _dataManager.GetPlayer(chat.player1); + //var player2 = await _dataManager.GetPlayer(chat.player2); - dtoChats.Add(chat.ToDto(player1, player2)); + dtoChats.Add(chat.ToDto()); } var success_message = $"La récupération des chats a réussi pour les joueurs {idPlayer1} et {idPlayer2}. Nombre de chats : {dtoChats.Count}"; diff --git a/code/server/ApiLeapHit/Controllers/GameController.cs b/code/server/ApiLeapHit/Controllers/GameController.cs index 306d809..9dc5947 100644 --- a/code/server/ApiLeapHit/Controllers/GameController.cs +++ b/code/server/ApiLeapHit/Controllers/GameController.cs @@ -40,12 +40,9 @@ namespace ApiLeapHit.Controllers return NotFound(new ApiResponse(message)); } - var winner = await _dataManager.GetPlayer(game.winner); - var loser = await _dataManager.GetPlayer(game.loser); - _logger.LogInformation("Récupération des joueurs pour la game avec l'identifiant {id}", id); - return Ok(new ApiResponse("Récupération de la game réussie.", game.ToDto(winner, loser))); + return Ok(new ApiResponse("Récupération de la game réussie.", game.ToDto())); } catch (Exception ex) { @@ -83,7 +80,7 @@ namespace ApiLeapHit.Controllers continue; } - dtoGames.Add(game.ToDto(winner, loser)); + dtoGames.Add(game.ToDto()); } _logger.LogInformation("{Count} games ont été récupérées.", dtoGames.Count); @@ -118,7 +115,13 @@ namespace ApiLeapHit.Controllers var winner = await _dataManager.GetPlayer(game.winner); var loser = await _dataManager.GetPlayer(game.loser); - dtoGames.Add(game.ToDto(winner, loser)); + //ce cas n'est jamais censé arrivé + if (winner == null || loser == null) + { + _logger.LogError($"Le joueur gagnant ou le joueur perdant n'existe pas pour le jeu avec l'identifiant {game.gameId}."); + continue; + } + dtoGames.Add(game.ToDto()); } var successMessage = $"Récupération réussie des games pour le joueur avec l'id {id}."; @@ -134,7 +137,7 @@ namespace ApiLeapHit.Controllers } [HttpPost] - public async Task AddGame([FromBody] DTOGameWithIdPlayer dtoGame) + public async Task AddGame([FromBody] DTOGame dtoGame) { try { @@ -148,7 +151,7 @@ namespace ApiLeapHit.Controllers // return NotFound(new ApiResponse(errorMessage)); //} - var game = dtoGame.ToGame(winner, loser); + var game = dtoGame.ToGame(); await _dataManager.AddGame(game); var successMessage = "La partie avec l'identifiant " + game.gameId + " a été ajoutée avec succès."; diff --git a/code/server/ApiLeapHit/Controllers/MessageController.cs b/code/server/ApiLeapHit/Controllers/MessageController.cs index 683c1e6..097fe5b 100644 --- a/code/server/ApiLeapHit/Controllers/MessageController.cs +++ b/code/server/ApiLeapHit/Controllers/MessageController.cs @@ -1,4 +1,5 @@ -using DataBase.DataManager; +using ApiLeapHit.Mapper; +using DataBase.DataManager; using DataBase.Entity; using DTO; using DTO.Factory; @@ -27,25 +28,17 @@ namespace ApiLeapHit.Controllers { try { - var player = await _dataManager.GetPlayer(dtoMessage.PlayerId.playerId); + var player = await _dataManager.GetPlayer(dtoMessage.PlayerId); if (player == null) { - _logger.LogWarning($"Le joueur avec l'identifiant {dtoMessage.PlayerId.playerId} n'existe pas."); - return NotFound(new ApiResponse($"Le joueur avec l'identifiant {dtoMessage.PlayerId.playerId} n'existe pas.")); + _logger.LogWarning($"Le joueur avec l'identifiant {dtoMessage.PlayerId} n'existe pas."); + return NotFound(new ApiResponse($"Le joueur avec l'identifiant {dtoMessage.PlayerId} n'existe pas.")); } - var message = new Message - { - messageId = dtoMessage.messageId, - message = dtoMessage.message, - timestamp = dtoMessage.timestamp, - player = player.playerId - }; - - await _dataManager.SendMessage(message); + await _dataManager.SendMessage(dtoMessage.ToMessage()); - _logger.LogInformation($"Le message avec l'identifiant {message.messageId} a été envoyé avec succès."); - return Ok(new ApiResponse($"Le message avec l'identifiant {message.messageId} a été envoyé avec succès.")); + _logger.LogInformation($"Le message avec l'identifiant {dtoMessage.messageId} a été envoyé avec succès."); + return Ok(new ApiResponse($"Le message avec l'identifiant {dtoMessage.messageId} a été envoyé avec succès.")); } catch (Exception ex) { @@ -92,7 +85,7 @@ namespace ApiLeapHit.Controllers } _logger.LogInformation($"Le message avec l'identifiant {id} a été reçu avec succès."); - return Ok(new ApiResponse("Message reçu avec succès.", message)); + return Ok(new ApiResponse("Message reçu avec succès.", message.ToDto())); } catch (Exception ex) { @@ -106,16 +99,18 @@ namespace ApiLeapHit.Controllers { try { - var message = await _dataManager.ReceiveAllMessages(); + var messages = await _dataManager.ReceiveAllMessages(); - if (message == null || message.Count() == 0) + if (messages == null || messages.Count() == 0) { _logger.LogWarning($"Aucun message n'a été trouvé."); return NotFound(new ApiResponse("Aucun message n'a pas été trouvé.")); } + var dtosMessages = messages.Select(message => message.ToDto()).ToList(); + _logger.LogInformation($"Les messages ont été reçus avec succès."); - return Ok(new ApiResponse>("Messages reçus avec succès.", message)); + return Ok(new ApiResponse>("Messages reçus avec succès.", dtosMessages)); } catch (Exception ex) { diff --git a/code/server/ApiLeapHit/Mapper/ChatMapper.cs b/code/server/ApiLeapHit/Mapper/ChatMapper.cs index ced8900..220daa4 100644 --- a/code/server/ApiLeapHit/Mapper/ChatMapper.cs +++ b/code/server/ApiLeapHit/Mapper/ChatMapper.cs @@ -5,24 +5,24 @@ namespace ApiLeapHit.Mapper { public static class ChatMapper { - public static DTOChat ToDto(this Chat chat, Player player1, Player player2) + public static DTOChat ToDto(this Chat chat) { DTOChat dtoChat = new DTOChat() { chatId = chat.chatId, - PlayerId1 = player1.ToDto(), - PlayerId2 = player2.ToDto() + PlayerId1 = chat.player1, + PlayerId2 = chat.player2 }; return dtoChat; } - public static Chat ToChat(this DTOChat dtoChat, Player player1, Player player2) + public static Chat ToChat(this DTOChat dtoChat) { return new Chat { chatId = dtoChat.chatId, - player1 = player1.playerId, - player2 = player2.playerId + player1 = dtoChat.PlayerId1, + player2 = dtoChat.PlayerId2 }; } } diff --git a/code/server/ApiLeapHit/Mapper/GameMapper.cs b/code/server/ApiLeapHit/Mapper/GameMapper.cs index fe6f6db..fa7d34a 100644 --- a/code/server/ApiLeapHit/Mapper/GameMapper.cs +++ b/code/server/ApiLeapHit/Mapper/GameMapper.cs @@ -5,27 +5,27 @@ namespace ApiLeapHit.Mapper { public static class GameMapper { - public static DTOGame ToDto(this Game game, Player winner, Player loser) + public static DTOGame ToDto(this Game game) { DTOGame dtoGame = new DTOGame() { gameId = game.gameId, durationGame = game.durationGame, nbMaxEchanges = game.nbMaxEchanges, - playerWinner = winner.ToDto(), - playerLoser = loser.ToDto() + playerWinner = game.winner, + playerLoser = game.loser }; return dtoGame; } - public static Game ToGame(this DTOGame dtoGame, Player winner, Player loser) + public static Game ToGame(this DTOGame dtoGame) { return new Game { durationGame = dtoGame.durationGame, nbMaxEchanges = dtoGame.nbMaxEchanges, - winner = winner.playerId, - loser = loser.playerId + winner = dtoGame.playerWinner, + loser = dtoGame.playerLoser }; } } diff --git a/code/server/ApiLeapHit/Mapper/MessageMapper.cs b/code/server/ApiLeapHit/Mapper/MessageMapper.cs index 573f1a4..f354d04 100644 --- a/code/server/ApiLeapHit/Mapper/MessageMapper.cs +++ b/code/server/ApiLeapHit/Mapper/MessageMapper.cs @@ -5,17 +5,30 @@ namespace ApiLeapHit.Mapper { public static class MessageMapper { - public static DTOMessage ToDto(this Message message, Player player, Chat chat) + public static DTOMessage ToDto(this Message message) { DTOMessage dtoMessage = new DTOMessage() { messageId = message.messageId, message = message.message, timestamp = message.timestamp, - PlayerId = player.ToDto(), - //ChatId = chat.ToDto() + PlayerId = message.player, + ChatId = message.chat }; return dtoMessage; } + + public static Message ToMessage(this DTOMessage dtoMessage) + { + Message message = new Message() + { + messageId = dtoMessage.messageId, + message = dtoMessage.message, + timestamp = dtoMessage.timestamp, + player = dtoMessage.PlayerId, + chat = dtoMessage.ChatId + }; + return message; + } } } diff --git a/code/server/DTO/DTOChat.cs b/code/server/DTO/DTOChat.cs index e86896c..1765d3e 100644 --- a/code/server/DTO/DTOChat.cs +++ b/code/server/DTO/DTOChat.cs @@ -9,7 +9,7 @@ namespace DTO public class DTOChat { public int chatId { get; set; } - public DTOPlayer PlayerId1 { get; set; } - public DTOPlayer PlayerId2 { get; set; } + public int PlayerId1 { get; set; } + public int PlayerId2 { get; set; } } } diff --git a/code/server/DTO/DTOGame.cs b/code/server/DTO/DTOGame.cs index 8e12a3f..ff430e8 100644 --- a/code/server/DTO/DTOGame.cs +++ b/code/server/DTO/DTOGame.cs @@ -11,7 +11,7 @@ namespace DTO public int gameId { get; set; } public int durationGame { get; set; } public int nbMaxEchanges { get; set; } - public DTOPlayer playerWinner { get; set; } - public DTOPlayer playerLoser { get; set; } + public int playerWinner { get; set; } + public int playerLoser { get; set; } } } diff --git a/code/server/DTO/DTOMessage.cs b/code/server/DTO/DTOMessage.cs index 47154c0..df21cde 100644 --- a/code/server/DTO/DTOMessage.cs +++ b/code/server/DTO/DTOMessage.cs @@ -11,7 +11,7 @@ namespace DTO public int messageId { get; set; } public string message { get; set; } public DateTime timestamp { get; set; } - public DTOPlayer PlayerId { get; set; } - public DTOChat ChatId { get; set; } + public int PlayerId { get; set; } + public int ChatId { get; set; } } } diff --git a/code/server/DataBase/PongDB.db-shm b/code/server/DataBase/PongDB.db-shm deleted file mode 100644 index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuAr62r3