diff --git a/Sources/Model/Grille.cs b/Sources/Model/Grille.cs index 9dca9e5..5049dad 100644 --- a/Sources/Model/Grille.cs +++ b/Sources/Model/Grille.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; namespace Model { - public int Id { get; set; } public class Grille { + public int Id { get; set; } public int NbChaine { get; set; } public int NbZone { get; set; } public int MaxChaine { get; set; } diff --git a/Sources/Model/Turn.cs b/Sources/Model/Turn.cs index 6bddaf0..a8406b9 100644 --- a/Sources/Model/Turn.cs +++ b/Sources/Model/Turn.cs @@ -17,7 +17,7 @@ namespace Model { if (value > 6) { - throw new ArgumentException("a Case must have a value lower or equal to 12"); + throw new ArgumentException("a Cell must have a value lower or equal to 12"); } diceValue1 = value; } @@ -31,7 +31,7 @@ namespace Model { if (value > 6) { - throw new ArgumentException("a Case must have a value lower or equal to 12"); + throw new ArgumentException("a Cell must have a value lower or equal to 12"); } diceValue2 = value; } diff --git a/Sources/Trek12_API/Converter/GameConverter.cs b/Sources/Trek12_API/Converter/GameConverter.cs new file mode 100644 index 0000000..af8899e --- /dev/null +++ b/Sources/Trek12_API/Converter/GameConverter.cs @@ -0,0 +1,9 @@ +using Model; +using Trek12_API.DTO; + +namespace Trek12_API.Converter +{ + public class GameConverter + { + } +} diff --git a/Sources/Trek12_API/DTO/GameDTO.cs b/Sources/Trek12_API/DTO/GameDTO.cs index 6af1a1a..82ccfba 100644 --- a/Sources/Trek12_API/DTO/GameDTO.cs +++ b/Sources/Trek12_API/DTO/GameDTO.cs @@ -1,6 +1,31 @@ -namespace Trek12_API.DTO +using Model; +using System.Collections.ObjectModel; + +namespace Trek12_API.DTO { public class GameDTO { + public int Id { get; set; } + public TimeSpan Duration { get; set; } + public DateOnly Date { get; set; } + public List Turns { get; set; } + + public Dictionary Grilles { get; set; } + + public Dictionary Scores { get; set; } + + public GamemodeDTO GameMode { get; set; } + + public GameDTO(int id, DateOnly date, PlayerDTO owner, GamemodeDTO gameMode) + { + Date = date; + Grilles = new Dictionary(); + Scores = new Dictionary(); + Turns = new List(); + Grilles.Add(owner, new GrilleDTO()); + Scores.Add(owner, 0); + GameMode = gameMode; + Id = id; + } } } diff --git a/Sources/Trek12_API/DTO/GamemodeDTO.cs b/Sources/Trek12_API/DTO/GamemodeDTO.cs new file mode 100644 index 0000000..2bb62d0 --- /dev/null +++ b/Sources/Trek12_API/DTO/GamemodeDTO.cs @@ -0,0 +1,8 @@ +namespace Trek12_API.DTO +{ + public class GamemodeDTO + { + public string Name { get; set; } + public int Id { get; set; } + } +} diff --git a/Sources/Trek12_API/DTO/GrilleDTO.cs b/Sources/Trek12_API/DTO/GrilleDTO.cs new file mode 100644 index 0000000..a8e283b --- /dev/null +++ b/Sources/Trek12_API/DTO/GrilleDTO.cs @@ -0,0 +1,11 @@ +namespace Trek12_API.DTO +{ + public class GrilleDTO + { + public int Id { get; set; } + public int NbChaines { get; set; } + public int NbZones { get; set; } + public int MaxChaines { get; set; } + public int MaxZones { get; set; } + } +} diff --git a/Sources/Trek12_API/DTO/TurnDTO.cs b/Sources/Trek12_API/DTO/TurnDTO.cs new file mode 100644 index 0000000..3c7c37b --- /dev/null +++ b/Sources/Trek12_API/DTO/TurnDTO.cs @@ -0,0 +1,10 @@ +namespace Trek12_API.DTO +{ + public class TurnDTO + { + public int Id { get; set; } + public int diceValue1 { get; set; } + public string diceValue2 { get; set; } + + } +}