From f01fa3099f3733da7a978db8ed0dd1117a122759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yana=C3=ABl=20GRETTE?= <yanael.grette@outlook.com>
Date: Mon, 7 Sep 2020 10:15:31 +0200
Subject: [PATCH] =?UTF-8?q?Changement=20du=20type=20des=20IdAuteur=20et=20?=
 =?UTF-8?q?Collaborateur=20et=20impl=C3=A9mentation=20des=20m=C3=A9thodes?=
 =?UTF-8?q?=20NoteToDTO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Models/Notes/Note.cs    |  4 ++--
 Services/NoteService.cs | 51 +++++++++++++++++++++++++++++++++++------
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Models/Notes/Note.cs b/Models/Notes/Note.cs
index 3de824a..c47fd50 100644
--- a/Models/Notes/Note.cs
+++ b/Models/Notes/Note.cs
@@ -10,8 +10,8 @@ namespace EPAServeur.Models.Notes
 		public int Id { get; set; }
 		public string Titre { get; set; }
 		public string Texte { get; set; }
-		public string IdAuteur { get; set; }
-		public string IdCollaborateur { get; set; }
+		public Guid IdAuteur { get; set; }
+		public Guid IdCollaborateur { get; set; }
 		public DateTime DateCreation { get; set; }
 		public DateTime DateUpdate { get; set; }
 	}
diff --git a/Services/NoteService.cs b/Services/NoteService.cs
index e818d76..880b3a4 100644
--- a/Services/NoteService.cs
+++ b/Services/NoteService.cs
@@ -1,6 +1,8 @@
-using EPAServeur.IServices;
+using EPAServeur.Context;
+using EPAServeur.IServices;
 using EPAServeur.Models.Notes;
 using IO.Swagger.DTO;
+using IO.Swagger.ModelCollaborateur;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,6 +12,15 @@ namespace EPAServeur.Services
 {
 	public class NoteService : INoteService
 	{
+		private readonly CollaborateurService collaborateurService;
+		private readonly EpContext context;
+
+		public NoteService(CollaborateurService _collaborateurService, EpContext _context)
+		{
+			collaborateurService = _collaborateurService;
+			context = _context;
+		}
+
 		public bool AjouterNote(DetailsNoteDTO nouvelleNote)
 		{
 			throw new NotImplementedException();
@@ -46,20 +57,46 @@ namespace EPAServeur.Services
 		}
 
 		//Object to DTO
-		public AffichageNoteDTO NoteToAffichageDTO(Note note)
+		private AffichageNoteDTO NoteToAffichageDTO(Note note)
 		{
-			return null;
+			CollaborateurDTO collaborateur = collaborateurService.GetCollaborateurById(note.IdCollaborateur);
+			AffichageNoteDTO affichage = new AffichageNoteDTO()
+			{
+				Id = note.Id,
+				Collaborateur = collaborateur.Prenom + collaborateur.Nom,
+				Titre = note.Titre,
+				DateMiseAjour = note.DateUpdate
+			};
+			return affichage;
 		}
 
-		public DetailsNoteDTO NoteToDetailSDTO(Note note)
+		private DetailsNoteDTO NoteToDetailSDTO(Note note)
 		{
-			return null;
+			DetailsNoteDTO details = new DetailsNoteDTO()
+			{
+				Id = note.Id,
+				DateCreation = note.DateCreation,
+				DateMiseAjour = note.DateUpdate,
+				Titre = note.Titre,
+				Texte = note.Texte,
+				IdAuteur = note.IdAuteur,
+				Collaborateur = collaborateurService.GetCollaborateurById(note.IdCollaborateur)
+			};
+			return details;
 		}
 
 		//DTO to Object
-		public Note DetailsNoteDTOToNote(DetailsNoteDTO detailsNoteDTO)
+		private Note DetailsNoteDTOToNouvelleNote(DetailsNoteDTO detailsNoteDTO)
 		{
-			return null;
+			Note note = new Note()
+			{
+				IdAuteur = detailsNoteDTO.IdAuteur.Value,
+				IdCollaborateur = detailsNoteDTO.Collaborateur.Id.Value,
+				Texte = detailsNoteDTO.Texte,
+				Titre = detailsNoteDTO.Titre,
+				DateCreation = DateTime.Now
+			};
+			return note;
 		}
 	}
 }