From 5443b49388b08e5d544948789e85350829146788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yana=C3=ABl=20GRETTE?= Date: Mon, 7 Sep 2020 16:12:19 +0200 Subject: [PATCH] Transformation des List en IEnumerable dans le service Collaborateur --- Controllers/CollaborateursApi.cs | 2 +- IServices/ICollaborateurService.cs | 4 ++-- Services/CollaborateurService.cs | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Controllers/CollaborateursApi.cs b/Controllers/CollaborateursApi.cs index c9e9c70..05f1eb5 100644 --- a/Controllers/CollaborateursApi.cs +++ b/Controllers/CollaborateursApi.cs @@ -157,7 +157,7 @@ namespace IO.Swagger.Controllers { //TODO: Uncomment the next line to return response 403 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(403, default(ErreurDTO)); - List collaborateurs = collaborateurService.GetCollaborateursByReferent(idReferent, asc, numPage, parPAge, texte, tri); + IEnumerable collaborateurs = collaborateurService.GetCollaborateursByReferent(idReferent, asc, numPage, parPAge, texte, tri); if(collaborateurs == null) { ErreurDTO erreurDTO = new ErreurDTO() diff --git a/IServices/ICollaborateurService.cs b/IServices/ICollaborateurService.cs index 1c02ed0..83012a5 100644 --- a/IServices/ICollaborateurService.cs +++ b/IServices/ICollaborateurService.cs @@ -15,7 +15,7 @@ namespace EPAServeur.IServices CollaborateurDTO GetCollaborateurByMail(string mail); ProfilDTO GetProfilById(Guid? idCollaborateur); ProfilDTO GetProfilByMail(string mail); - List GetCollaborateurs(bool? asc, int? numPage, int? parPage, List fonctions, int? idAgence, int? idBU, String texte, string tri); - List GetCollaborateursByReferent(Guid? idReferent, bool? asc, int? numPage, int? parPage, String texte, string tri); + IEnumerable GetCollaborateurs(bool? asc, int? numPage, int? parPage, List fonctions, int? idAgence, int? idBU, string texte, string tri); + IEnumerable GetCollaborateursByReferent(Guid? idReferent, bool? asc, int? numPage, int? parPage, string texte, string tri); } } diff --git a/Services/CollaborateurService.cs b/Services/CollaborateurService.cs index b2eea39..c88ab83 100644 --- a/Services/CollaborateurService.cs +++ b/Services/CollaborateurService.cs @@ -39,14 +39,14 @@ namespace EPAServeur.Services } - public List GetCollaborateurs(bool? asc, int? numPage, int? parPage, List fonctions, int? idAgence, int? idBU, String texte, string tri) + public IEnumerable GetCollaborateurs(bool? asc, int? numPage, int? parPage, List fonctions, int? idAgence, int? idBU, string texte, string tri) { if (texte == null) texte = ""; else texte = texte.ToLower(); - List collaborateurs; - List collaborateursDTO; + IEnumerable collaborateurs; + IEnumerable collaborateursDTO; if(idBU != null) collaborateurs = collaborateurApi.ChercherCollabBU(idBU); else if( idAgence != null) @@ -59,12 +59,12 @@ namespace EPAServeur.Services int take = parPage.Value; collaborateursDTO = (from c in collaborateurs where (c.Nom + " " + c.Prenom).ToLower().Contains(texte) || (c.Prenom + " " + c.Nom).ToLower().Contains(texte) - select GetCollaborateurDTO(c)).Skip(skip).Take(take).ToList(); + select GetCollaborateurDTO(c)).Skip(skip).Take(take); return collaborateursDTO; } - public List GetCollaborateursByReferent(Guid? idReferent, bool? asc, int? numPage, int? parPage, String texte, string tri) + public IEnumerable GetCollaborateursByReferent(Guid? idReferent, bool? asc, int? numPage, int? parPage, string texte, string tri) { if (texte == null) texte = ""; @@ -73,12 +73,12 @@ namespace EPAServeur.Services Collaborateur referent = collaborateurApi.ChercherCollabId(idReferent); if (referent == null) return null; - List collaborateurs = collaborateurApi.ChercherCollabRef(idReferent); + IEnumerable collaborateurs = collaborateurApi.ChercherCollabRef(idReferent); int skip = (numPage.Value - 1) * parPage.Value; int take = parPage.Value; - List collaborateursDTO = (from c in collaborateurs + IEnumerable collaborateursDTO = (from c in collaborateurs where (c.Nom + " " + c.Prenom).ToLower().Contains(texte) || (c.Prenom + " " + c.Nom).ToLower().Contains(texte) - select GetCollaborateurDTO(c)).Skip(skip).Take(take).ToList(); + select GetCollaborateurDTO(c)).Skip(skip).Take(take); return collaborateursDTO; }