From 865947fa9cd5f2ae72cc6bd545c9516b813d7d48 Mon Sep 17 00:00:00 2001
From: Alexis DRAI <alexis.drai@etu.uca.fr>
Date: Sun, 16 Oct 2022 23:30:19 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Data/EF/Dice/ColorDieExtensions.cs    | 11 ++-------
 .../Data/EF/Dice/Faces/ColorFaceExtensions.cs | 23 ++++---------------
 .../Data/EF/Dice/Faces/ImageFaceExtensions.cs | 20 ++++------------
 .../EF/Dice/Faces/NumberFaceExtensions.cs     | 20 ++++------------
 Sources/Data/EF/Dice/ImageDieExtensions.cs    | 10 ++------
 Sources/Data/EF/Dice/NumberDieExtensions.cs   | 10 ++------
 Sources/Data/EF/Games/TurnExtensions.cs       | 10 ++------
 Sources/Data/EF/Players/PlayerExtensions.cs   | 20 ++++------------
 8 files changed, 24 insertions(+), 100 deletions(-)

diff --git a/Sources/Data/EF/Dice/ColorDieExtensions.cs b/Sources/Data/EF/Dice/ColorDieExtensions.cs
index 9a7df6b..03e4dd1 100644
--- a/Sources/Data/EF/Dice/ColorDieExtensions.cs
+++ b/Sources/Data/EF/Dice/ColorDieExtensions.cs
@@ -21,10 +21,7 @@ namespace Data.EF.Dice
             return die;
         }
 
-        public static IEnumerable<ColorDie> ToModels(this IEnumerable<ColorDieEntity> entities)
-        {
-            return entities.Select(entity => entity.ToModel());
-        }
+        public static IEnumerable<ColorDie> ToModels(this IEnumerable<ColorDieEntity> entities) => entities.Select(entity => entity.ToModel());
 
         public static ColorDieEntity ToEntity(this ColorDie model)
         {
@@ -33,10 +30,6 @@ namespace Data.EF.Dice
             return entity;
         }
 
-        public static IEnumerable<ColorDieEntity> ToEntities(this IEnumerable<ColorDie> models)
-        {
-            return models.Select(model => model.ToEntity());
-        }
-
+        public static IEnumerable<ColorDieEntity> ToEntities(this IEnumerable<ColorDie> models) => models.Select(model => model.ToEntity());
     }
 }
diff --git a/Sources/Data/EF/Dice/Faces/ColorFaceExtensions.cs b/Sources/Data/EF/Dice/Faces/ColorFaceExtensions.cs
index 7b789f4..2a36150 100644
--- a/Sources/Data/EF/Dice/Faces/ColorFaceExtensions.cs
+++ b/Sources/Data/EF/Dice/Faces/ColorFaceExtensions.cs
@@ -10,27 +10,12 @@ namespace Data.EF.Dice.Faces
 {
     public static class ColorFaceExtensions
     {
-        public static ColorFace ToModel(this ColorFaceEntity clrFaceEntity)
-        {
-            ColorFace colorFace = new(Color.FromArgb(clrFaceEntity.A, clrFaceEntity.R, clrFaceEntity.G, clrFaceEntity.B));
-            return colorFace;
-        }
+        public static ColorFace ToModel(this ColorFaceEntity clrFaceEntity) => new(Color.FromArgb(clrFaceEntity.A, clrFaceEntity.R, clrFaceEntity.G, clrFaceEntity.B));
 
-        public static IEnumerable<ColorFace> ToModels(this IEnumerable<ColorFaceEntity> entities)
-        {
-            return entities.Select(entity => entity.ToModel());
-        }
+        public static IEnumerable<ColorFace> ToModels(this IEnumerable<ColorFaceEntity> entities) => entities.Select(entity => entity.ToModel());
 
-        public static ColorFaceEntity ToEntity(this ColorFace model)
-        {
-            return new ColorFaceEntity() { A = model.Value.A, R = model.Value.R, G = model.Value.G, B = model.Value.B };
-        }
+        public static ColorFaceEntity ToEntity(this ColorFace model) => new() { A = model.Value.A, R = model.Value.R, G = model.Value.G, B = model.Value.B };
 
-        public static IEnumerable<ColorFaceEntity> ToEntities(this IEnumerable<ColorFace> models)
-        {
-            return models.Select(model => model.ToEntity());
-        }
-
-
+        public static IEnumerable<ColorFaceEntity> ToEntities(this IEnumerable<ColorFace> models) => models.Select(model => model.ToEntity());
     }
 }
diff --git a/Sources/Data/EF/Dice/Faces/ImageFaceExtensions.cs b/Sources/Data/EF/Dice/Faces/ImageFaceExtensions.cs
index 4eb9d53..19597fc 100644
--- a/Sources/Data/EF/Dice/Faces/ImageFaceExtensions.cs
+++ b/Sources/Data/EF/Dice/Faces/ImageFaceExtensions.cs
@@ -11,24 +11,12 @@ namespace Data.EF.Dice.Faces
 {
     public static class ImageFaceExtensions
     {
-        public static ImageFace ToModel(this ImageFaceEntity entity)
-        {
-            return new ImageFace(new Uri(entity.Value));
-        }
+        public static ImageFace ToModel(this ImageFaceEntity entity) => new(new Uri(entity.Value));
 
-        public static IEnumerable<ImageFace> ToModels(this IEnumerable<ImageFaceEntity> entities)
-        {
-            return entities.Select(entity => entity.ToModel());
-        }
+        public static IEnumerable<ImageFace> ToModels(this IEnumerable<ImageFaceEntity> entities) => entities.Select(entity => entity.ToModel());
 
-        public static ImageFaceEntity ToEntity(this ImageFace model)
-        {
-            return new ImageFaceEntity() { Value = model.StringValue };
-        }
+        public static ImageFaceEntity ToEntity(this ImageFace model) => new() { Value = model.StringValue };
 
-        public static IEnumerable<ImageFaceEntity> ToEntities(this IEnumerable<ImageFace> models)
-        {
-            return models.Select(model => model.ToEntity());
-        }
+        public static IEnumerable<ImageFaceEntity> ToEntities(this IEnumerable<ImageFace> models) => models.Select(model => model.ToEntity());
     }
 }
diff --git a/Sources/Data/EF/Dice/Faces/NumberFaceExtensions.cs b/Sources/Data/EF/Dice/Faces/NumberFaceExtensions.cs
index f6c3d9e..448b03f 100644
--- a/Sources/Data/EF/Dice/Faces/NumberFaceExtensions.cs
+++ b/Sources/Data/EF/Dice/Faces/NumberFaceExtensions.cs
@@ -9,24 +9,12 @@ namespace Data.EF.Dice.Faces
 {
     public static class NumberFaceExtensions
     {
-        public static NumberFace ToModel(this NumberFaceEntity entity)
-        {
-            return new NumberFace(entity.Value);
-        }
+        public static NumberFace ToModel(this NumberFaceEntity entity) => new(entity.Value);
 
-        public static IEnumerable<NumberFace> ToModels(this IEnumerable<NumberFaceEntity> entities)
-        {
-            return entities.Select(entity => entity.ToModel());
-        }
+        public static IEnumerable<NumberFace> ToModels(this IEnumerable<NumberFaceEntity> entities) => entities.Select(entity => entity.ToModel());
 
-        public static NumberFaceEntity ToEntity(this NumberFace model)
-        {
-            return new NumberFaceEntity() { Value = model.Value };
-        }
+        public static NumberFaceEntity ToEntity(this NumberFace model) => new() { Value = model.Value };
 
-        public static IEnumerable<NumberFaceEntity> ToEntities(this IEnumerable<NumberFace> models)
-        {
-            return models.Select(model => model.ToEntity());
-        }
+        public static IEnumerable<NumberFaceEntity> ToEntities(this IEnumerable<NumberFace> models) => models.Select(model => model.ToEntity());
     }
 }
diff --git a/Sources/Data/EF/Dice/ImageDieExtensions.cs b/Sources/Data/EF/Dice/ImageDieExtensions.cs
index 2c46c37..be7be00 100644
--- a/Sources/Data/EF/Dice/ImageDieExtensions.cs
+++ b/Sources/Data/EF/Dice/ImageDieExtensions.cs
@@ -21,10 +21,7 @@ namespace Data.EF.Dice
             return die;
         }
 
-        public static IEnumerable<ImageDie> ToModels(this IEnumerable<ImageDieEntity> entities)
-        {
-            return entities.Select(entity => entity.ToModel());
-        }
+        public static IEnumerable<ImageDie> ToModels(this IEnumerable<ImageDieEntity> entities) => entities.Select(entity => entity.ToModel());
 
         public static ImageDieEntity ToEntity(this ImageDie model)
         {
@@ -33,9 +30,6 @@ namespace Data.EF.Dice
             return entity;
         }
 
-        public static IEnumerable<ImageDieEntity> ToEntities(this IEnumerable<ImageDie> models)
-        {
-            return models.Select(model => model.ToEntity());
-        }
+        public static IEnumerable<ImageDieEntity> ToEntities(this IEnumerable<ImageDie> models) => models.Select(model => model.ToEntity());
     }
 }
diff --git a/Sources/Data/EF/Dice/NumberDieExtensions.cs b/Sources/Data/EF/Dice/NumberDieExtensions.cs
index 1706339..7e2e4ac 100644
--- a/Sources/Data/EF/Dice/NumberDieExtensions.cs
+++ b/Sources/Data/EF/Dice/NumberDieExtensions.cs
@@ -21,10 +21,7 @@ namespace Data.EF.Dice
             return die;
         }
 
-        public static IEnumerable<NumberDie> ToModels(this IEnumerable<NumberDieEntity> entities)
-        {
-            return entities.Select(entity => ToModel(entity));
-        }
+        public static IEnumerable<NumberDie> ToModels(this IEnumerable<NumberDieEntity> entities) => entities.Select(entity => ToModel(entity));
 
         public static NumberDieEntity ToEntity(this NumberDie model)
         {
@@ -33,9 +30,6 @@ namespace Data.EF.Dice
             return entity;
         }
 
-        public static IEnumerable<NumberDieEntity> ToEntities(this IEnumerable<NumberDie> models)
-        {
-            return models.Select(model => model.ToEntity());
-        }
+        public static IEnumerable<NumberDieEntity> ToEntities(this IEnumerable<NumberDie> models) => models.Select(model => model.ToEntity());
     }
 }
diff --git a/Sources/Data/EF/Games/TurnExtensions.cs b/Sources/Data/EF/Games/TurnExtensions.cs
index fdb1ba4..469fd64 100644
--- a/Sources/Data/EF/Games/TurnExtensions.cs
+++ b/Sources/Data/EF/Games/TurnExtensions.cs
@@ -45,10 +45,7 @@ namespace Data.EF.Games
             return Turn.CreateWithSpecifiedTime(when: entity.When, player: entity.PlayerEntity.ToModel(), diceNFaces: DiceNFaces);
         }
 
-        public static IEnumerable<Turn> ToModels(this IEnumerable<TurnEntity> entities)
-        {
-            return entities.Select(entity => entity.ToModel());
-        }
+        public static IEnumerable<Turn> ToModels(this IEnumerable<TurnEntity> entities) => entities.Select(entity => entity.ToModel());
 
         public static TurnEntity ToEntity(this Turn model)
         {
@@ -66,9 +63,6 @@ namespace Data.EF.Games
             return new TurnEntity() { When = model.When, PlayerEntity = model.Player.ToEntity(), Dice = DiceEntities, Faces = FaceEntities };
         }
 
-        public static IEnumerable<TurnEntity> ToEntities(this IEnumerable<Turn> models)
-        {
-            return models.Select(model => model.ToEntity());
-        }
+        public static IEnumerable<TurnEntity> ToEntities(this IEnumerable<Turn> models) => models.Select(model => model.ToEntity());
     }
 }
\ No newline at end of file
diff --git a/Sources/Data/EF/Players/PlayerExtensions.cs b/Sources/Data/EF/Players/PlayerExtensions.cs
index 3aa188d..a487010 100644
--- a/Sources/Data/EF/Players/PlayerExtensions.cs
+++ b/Sources/Data/EF/Players/PlayerExtensions.cs
@@ -4,24 +4,12 @@ namespace Data.EF.Players
 {
     public static class PlayerExtensions
     {
-        public static Player ToModel(this PlayerEntity entity)
-        {
-            return new Player(name: entity.Name);
-        }
+        public static Player ToModel(this PlayerEntity entity) => new Player(name: entity.Name);
 
-        public static IEnumerable<Player> ToModels(this IEnumerable<PlayerEntity> entities)
-        {
-            return entities.Select(entity => entity.ToModel());
-        }
+        public static IEnumerable<Player> ToModels(this IEnumerable<PlayerEntity> entities) => entities.Select(entity => entity.ToModel());
 
-        public static PlayerEntity ToEntity(this Player model)
-        {
-            return new PlayerEntity() { Name = model.Name };
-        }
+        public static PlayerEntity ToEntity(this Player model) => new PlayerEntity() { Name = model.Name };
 
-        public static IEnumerable<PlayerEntity> ToEntities(this IEnumerable<Player> models)
-        {
-            return models.Select(model => model.ToEntity());
-        }
+        public static IEnumerable<PlayerEntity> ToEntities(this IEnumerable<Player> models) => models.Select(model => model.ToEntity());
     }
 }