From 4fe26e52f6aa25890bc346eb963aff8375204a60 Mon Sep 17 00:00:00 2001
From: Clement FERRERE <clement.ferrere@apside-groupe.com>
Date: Tue, 5 Jul 2022 11:22:48 +0200
Subject: [PATCH] =?UTF-8?q?ajout=20des=20champs=20non=20obligatoires=20et?=
 =?UTF-8?q?=20de=20l'issue=20ind=C3=A9termin=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CollaborateursControllerTest.cs                       | 4 ++--
 .../PeriodeEssaiApiDto.cs                                 | 2 +-
 .../Values/EnumIssueApi.cs                                | 3 ++-
 .../PeriodeEssaiSqlDto.cs                                 | 8 ++++----
 .../Values/EnumIssueSql.cs                                | 3 ++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Collaborateur_Epa_Back/espacecollab.backend.api.tests/CollaborateursControllerTest.cs b/Collaborateur_Epa_Back/espacecollab.backend.api.tests/CollaborateursControllerTest.cs
index 0a02142..5799e4b 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.api.tests/CollaborateursControllerTest.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.api.tests/CollaborateursControllerTest.cs
@@ -15,10 +15,10 @@ public class CollaborateursControllerTest : BaseControllerTest<CollaborateursCon
         
         NewApiDo = new CollaborateurApiDto(0, "Dupont", "Jean", new DateTime(1980, 12, 10),
             EnumGenreApi.MASCULIN, EnumStatutApi.NONCADRE, 0, "1 rue du Louvre, 63000, Clermont-Ferrand", "0660258644",
-            "jean.dupont@gmail.com", "jean.dupont@apside-groupe.com", new DateTime(2023, 12, 17), 2, 1);
+            "jean.dupont@gmail.com", "jean.dupont@apside-groupe.com", new DateTime(2023, 12, 17), 1);
         
         UpdateApiDo = new CollaborateurApiDto(1, "Dupont 2", "Jean", new DateTime(1980, 12, 10),
             EnumGenreApi.MASCULIN, EnumStatutApi.NONCADRE, 0, "1 rue du Louvre, 63000, Clermont-Ferrand", "0660258644",
-            "jean.dupont@gmail.com", "jean.dupont@apside-groupe.com", new DateTime(2023, 12, 17), 2, 1);
+            "jean.dupont@gmail.com", "jean.dupont@apside-groupe.com", new DateTime(2023, 12, 17), 1);
     }
 }
\ No newline at end of file
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.appservices.dtos/PeriodeEssaiApiDto.cs b/Collaborateur_Epa_Back/espacecollab.backend.appservices.dtos/PeriodeEssaiApiDto.cs
index f243bb8..9597028 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.appservices.dtos/PeriodeEssaiApiDto.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.appservices.dtos/PeriodeEssaiApiDto.cs
@@ -3,7 +3,7 @@ using espacecollab.backend.appservices.dtos.Values;
 
 namespace espacecollab.backend.appservices.dtos;
 
-public record PeriodeEssaiApiDto(uint Id, DateTime StartingDate, DateTime PlannedEndingDate, DateTime RealEndingDate, string Comment, EnumIssueApi Issue, uint CollaborateurId) : IGenericIdApiDto
+public record PeriodeEssaiApiDto(uint Id, DateTime StartingDate, DateTime PlannedEndingDate, DateTime? RealEndingDate, string? Comment, EnumIssueApi? Issue, uint CollaborateurId) : IGenericIdApiDto
 {
     public uint Id { get; set; } = Id;
 }
\ No newline at end of file
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.appservices.dtos/Values/EnumIssueApi.cs b/Collaborateur_Epa_Back/espacecollab.backend.appservices.dtos/Values/EnumIssueApi.cs
index c36160e..3087d06 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.appservices.dtos/Values/EnumIssueApi.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.appservices.dtos/Values/EnumIssueApi.cs
@@ -6,5 +6,6 @@ public enum EnumIssueApi
     PROLONGEE_COLLAB,
     PROLONGEE_APSIDE,
     ARRETEE_COLLAB,
-    ARRETEE_APSIDE
+    ARRETEE_APSIDE,
+    INDETERMINEE
 }
\ No newline at end of file
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql.dtos/PeriodeEssaiSqlDto.cs b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql.dtos/PeriodeEssaiSqlDto.cs
index 78e8327..f2ceb8a 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql.dtos/PeriodeEssaiSqlDto.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql.dtos/PeriodeEssaiSqlDto.cs
@@ -13,9 +13,9 @@ public class PeriodeEssaiSqlDto : IGenericIdSqlDto
     public int Id { get; set; }
     public DateTime StartingDate { get; set; }
     public DateTime PlannedEndingDate { get; set; }
-    public DateTime RealEndingDate { get; set; }
-    public string Comment { get; set; }
-    public EnumIssueSql Issue { get; set; }
+    public DateTime? RealEndingDate { get; set; }
+    public string? Comment { get; set; }
+    public EnumIssueSql? Issue { get; set; }
     public int CollaborateurId { get; set; }
 
     [ExcludeFromCodeCoverage]
@@ -24,7 +24,7 @@ public class PeriodeEssaiSqlDto : IGenericIdSqlDto
         Comment = string.Empty;
     }
 
-    public PeriodeEssaiSqlDto(int id, DateTime startingDate, DateTime plannedEndingDate, DateTime realEndingDate, string comment, EnumIssueSql issue, int collaborateurId)
+    public PeriodeEssaiSqlDto(int id, DateTime startingDate, DateTime plannedEndingDate, DateTime? realEndingDate, string? comment, EnumIssueSql? issue, int collaborateurId)
     {
         Id = id;
         StartingDate = startingDate;
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql.dtos/Values/EnumIssueSql.cs b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql.dtos/Values/EnumIssueSql.cs
index fa9fd6a..e7cd401 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql.dtos/Values/EnumIssueSql.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql.dtos/Values/EnumIssueSql.cs
@@ -6,5 +6,6 @@ public enum EnumIssueSql
     PROLONGEE_COLLAB,
     PROLONGEE_APSIDE,
     ARRETEE_COLLAB,
-    ARRETEE_APSIDE
+    ARRETEE_APSIDE,
+    INDETERMINEE
 }
\ No newline at end of file