From 6197d6d0a6df267d70fe3f8a81972a91bb8d1309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yana=C3=ABl=20GRETTE?= Date: Mon, 15 Mar 2021 11:38:13 +0100 Subject: [PATCH] =?UTF-8?q?R=C3=A9cup=C3=A9ration=20du=20nom=20et=20du=20p?= =?UTF-8?q?r=C3=A9nom=20de=20l'assistant=20qui=20a=20=C3=A9crit=20la=20not?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EPAServeur/DTO/CommentaireAssistantDTO.cs | 55 ++++++++++++++--------- EPAServeur/Services/EpDetailsService.cs | 6 ++- EPAServeur/Services/TransformDTO.cs | 3 +- 3 files changed, 41 insertions(+), 23 deletions(-) diff --git a/EPAServeur/DTO/CommentaireAssistantDTO.cs b/EPAServeur/DTO/CommentaireAssistantDTO.cs index b3f3568..4f9427a 100644 --- a/EPAServeur/DTO/CommentaireAssistantDTO.cs +++ b/EPAServeur/DTO/CommentaireAssistantDTO.cs @@ -3,7 +3,7 @@ * * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire. * - * OpenAPI spec version: 1.3.6 + * OpenAPI spec version: 1.3.7 * * Generated by: https://github.com/swagger-api/swagger-codegen.git */ @@ -19,33 +19,40 @@ using System.Runtime.Serialization; using Newtonsoft.Json; namespace IO.Swagger.DTO -{ +{ /// /// DTO contenant le commentaire d'un assistant sur l'EP. /// [DataContract] public partial class CommentaireAssistantDTO : IEquatable - { + { /// /// Id du commentaire assistant /// /// Id du commentaire assistant - [DataMember(Name="id")] + [DataMember(Name = "id")] public long? Id { get; set; } /// /// Id de l'assistant qui a écrit le commentaire /// /// Id de l'assistant qui a écrit le commentaire - [DataMember(Name="idAssistante")] - public Guid? IdAssistante { get; set; } + [Required] + [DataMember(Name = "idAssistant")] + public Guid? IdAssistant { get; set; } + + /// + /// Gets or Sets Assistant + /// + [DataMember(Name = "assistant")] + public string Assistant { get; set; } /// /// Le commentaire de l’assistant /// /// Le commentaire de l’assistant [Required] - [DataMember(Name="commentaire")] + [DataMember(Name = "commentaire")] public string Commentaire { get; set; } /// @@ -57,7 +64,8 @@ namespace IO.Swagger.DTO var sb = new StringBuilder(); sb.Append("class CommentaireAssistantDTO {\n"); sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" IdAssistante: ").Append(IdAssistante).Append("\n"); + sb.Append(" IdAssistant: ").Append(IdAssistant).Append("\n"); + sb.Append(" Assistant: ").Append(Assistant).Append("\n"); sb.Append(" Commentaire: ").Append(Commentaire).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -94,17 +102,22 @@ namespace IO.Swagger.DTO if (ReferenceEquals(null, other)) return false; if (ReferenceEquals(this, other)) return true; - return + return ( Id == other.Id || Id != null && Id.Equals(other.Id) - ) && + ) && + ( + IdAssistant == other.IdAssistant || + IdAssistant != null && + IdAssistant.Equals(other.IdAssistant) + ) && ( - IdAssistante == other.IdAssistante || - IdAssistante != null && - IdAssistante.Equals(other.IdAssistante) - ) && + Assistant == other.Assistant || + Assistant != null && + Assistant.Equals(other.Assistant) + ) && ( Commentaire == other.Commentaire || Commentaire != null && @@ -122,18 +135,20 @@ namespace IO.Swagger.DTO { var hashCode = 41; // Suitable nullity checks etc, of course :) - if (Id != null) + if (Id != null) hashCode = hashCode * 59 + Id.GetHashCode(); - if (IdAssistante != null) - hashCode = hashCode * 59 + IdAssistante.GetHashCode(); - if (Commentaire != null) + if (IdAssistant != null) + hashCode = hashCode * 59 + IdAssistant.GetHashCode(); + if (Assistant != null) + hashCode = hashCode * 59 + Assistant.GetHashCode(); + if (Commentaire != null) hashCode = hashCode * 59 + Commentaire.GetHashCode(); return hashCode; } } #region Operators - #pragma warning disable 1591 +#pragma warning disable 1591 public static bool operator ==(CommentaireAssistantDTO left, CommentaireAssistantDTO right) { @@ -145,7 +160,7 @@ namespace IO.Swagger.DTO return !Equals(left, right); } - #pragma warning restore 1591 +#pragma warning restore 1591 #endregion Operators } } diff --git a/EPAServeur/Services/EpDetailsService.cs b/EPAServeur/Services/EpDetailsService.cs index 28babed..232804b 100644 --- a/EPAServeur/Services/EpDetailsService.cs +++ b/EPAServeur/Services/EpDetailsService.cs @@ -38,8 +38,10 @@ namespace EPAServeur.Services throw new EpNotFoundException(); //ajouter tous les guids liés à l'EP et aux attributs de l'EP - List guids = new List(); - guids.Add(ep.IdCollaborateur); + List guids = new List + { + ep.IdCollaborateur + }; if (ep.IdReferent.HasValue) guids.Add(ep.IdCollaborateur); if (ep.Participants != null && ep.Participants.Any()) diff --git a/EPAServeur/Services/TransformDTO.cs b/EPAServeur/Services/TransformDTO.cs index cac4444..b01c7ce 100644 --- a/EPAServeur/Services/TransformDTO.cs +++ b/EPAServeur/Services/TransformDTO.cs @@ -225,7 +225,8 @@ namespace EPAServeur.Services { Commentaire = ca.Commentaire, Id = ca.IdCommentaireAssistant, - IdAssistante = ca.IdAssistant + IdAssistant = ca.IdAssistant, + Assistant = c.Nom + " " + c.Prenom }); } }