ygrette
/
Digitalisation_EPA_Serveur
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ajout d'un test async dans le service engagement et de l'api engagement

Browse Source
develop
jboinembalome 4 years ago
parent cd6439a643
commit 6b3e8ec32a
3 changed files with 76 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      Controllers/EngagementsApi.cs
  2. 8
      IServices/IEngagementService.cs
  3. 80
      Services/EngagementService.cs

9
Controllers/EngagementsApi.cs
Unescape View File

@ -19,6 +19,7 @@ using IO.Swagger.Security;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using IO.Swagger.DTO; using IO.Swagger.DTO;
using EPAServeur.IServices; using EPAServeur.IServices;
using System.Threading.Tasks;
namespace IO.Swagger.Controllers namespace IO.Swagger.Controllers
{ {
@ -125,10 +126,10 @@ namespace IO.Swagger.Controllers
[SwaggerOperation("GetEngagementsRepondus")] [SwaggerOperation("GetEngagementsRepondus")]
[SwaggerResponse(statusCode: 200, type: typeof(List<EngagementDTO>), description: "OK")] [SwaggerResponse(statusCode: 200, type: typeof(List<EngagementDTO>), description: "OK")]
[SwaggerResponse(statusCode: 403, type: typeof(ErreurDTO), description: "Acces interdit")] [SwaggerResponse(statusCode: 403, type: typeof(ErreurDTO), description: "Acces interdit")]
public virtual IActionResult GetEngagementsRepondus([FromQuery][Required()]bool? asc, [FromQuery][Required()]int? numPage, [FromQuery][Required()]int? parPAge, [FromQuery]long? idAgence, [FromQuery]string texte, [FromQuery]string tri) public virtual async Task<IActionResult> GetEngagementsRepondus([FromQuery][Required()]bool? asc, [FromQuery][Required()]int? numPage, [FromQuery][Required()]int? parPAge, [FromQuery]long? idAgence, [FromQuery]string texte, [FromQuery]string tri)
{ {
//TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ...
IEnumerable<EngagementDTO> engagements = engagementService.GetEngagementsRepondus(asc, numPage, parPAge, idAgence, texte, tri); IEnumerable<EngagementDTO> engagements = await engagementService.GetEngagementsRepondus(asc, numPage, parPAge, idAgence, texte, tri);
if (engagements == null) if (engagements == null)
{ {
ErreurDTO erreur = new ErreurDTO() ErreurDTO erreur = new ErreurDTO()
@ -156,12 +157,12 @@ namespace IO.Swagger.Controllers
[ValidateModelState] [ValidateModelState]
[SwaggerOperation("RepondreEngagement")] [SwaggerOperation("RepondreEngagement")]
[SwaggerResponse(statusCode: 403, type: typeof(ErreurDTO), description: "Acces interdit")] [SwaggerResponse(statusCode: 403, type: typeof(ErreurDTO), description: "Acces interdit")]
public virtual IActionResult RepondreEngagement([FromBody]EngagementDTO body, [FromRoute][Required]long? idEngagement) public virtual async Task<IActionResult> RepondreEngagement([FromBody]EngagementDTO body, [FromRoute][Required]long? idEngagement)
{ {
//if (body != null && body.Realise == false && string.IsNullOrWhiteSpace(body.RaisonNonRealisable)) //if (body != null && body.Realise == false && string.IsNullOrWhiteSpace(body.RaisonNonRealisable))
// return null; // A traiter ! Retourner une erreur // return null; // A traiter ! Retourner une erreur
EngagementDTO engagement = engagementService.RepondreEngagement(body, idEngagement); EngagementDTO engagement = await engagementService.RepondreEngagement(body, idEngagement);
return Ok(engagement); return Ok(engagement);
} }

8
IServices/IEngagementService.cs
Unescape View File

@ -11,10 +11,10 @@ namespace EPAServeur.IServices
public interface IEngagementService public interface IEngagementService
{ {
IEnumerable<EngagementDTO> GetEngagements(bool? asc, int? numPage, int? parPAge, long? idAgence, string texte, string tri); IEnumerable<EngagementDTO> GetEngagements(bool? asc, int? numPage, int? parPAge, long? idAgence, string texte, string tri);
IEnumerable<EngagementDTO> GetEngagementsEnAttente(bool? asc, int? numPage, int? parPAge, long? idAgence, string texte, string tri); IEnumerable<EngagementDTO> GetEngagementsEnAttente(bool? asc, int? numPage, int? parPAge, long? idAgence, string texte, string tri);
IEnumerable<EngagementDTO> GetEngagementsRepondus(bool? asc, int? numPage, int? parPAge, long? idAgence, string texte, string tri); Task<IList<EngagementDTO>> GetEngagementsRepondus(bool? asc, int? numPage, int? parPAge, long? idAgence, string texte, string tri);
EngagementDTO RepondreEngagement(EngagementDTO engagement, long? idEngagement); Task<EngagementDTO> RepondreEngagement(EngagementDTO engagement, long? idEngagement);
} }
} }

80
Services/EngagementService.cs
Unescape View File

@ -10,6 +10,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace EPAServeur.Services namespace EPAServeur.Services
{ {
@ -98,7 +99,7 @@ namespace EPAServeur.Services
{ {
try try
{ {
engagements = epContext.Engagement.Include(engagement => engagement.Ep).Where(engagement => engagement.Ep.IdAgence == idAgence && engagement.Realise == null); engagements = epContext.Engagement.Include(engagement => engagement.Ep).Where(engagement => engagement.Ep.IdAgence == idAgence && engagement.Realise == null).ToList();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -109,7 +110,7 @@ namespace EPAServeur.Services
{ {
try try
{ {
engagements = epContext.Engagement.Include(engagement => engagement.Ep).Where(engagement => engagement.Realise == null); engagements = epContext.Engagement.Include(engagement => engagement.Ep).Where(engagement => engagement.Realise == null).ToList();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -125,10 +126,10 @@ namespace EPAServeur.Services
return engagementDTOs; return engagementDTOs;
} }
public IEnumerable<EngagementDTO> GetEngagementsRepondus(bool? asc, int? numPage, int? parPAge, long? idAgence, string texte, string tri) public async Task<IList<EngagementDTO>> GetEngagementsRepondus(bool? asc, int? numPage, int? parPAge, long? idAgence, string texte, string tri)
{ {
IEnumerable<Engagement> engagements; IEnumerable<Engagement> engagements;
IEnumerable<EngagementDTO> engagementDTOs; //<EngagementDTO> engagementDTOs = new List<EngagementDTO>();
if (texte == null) if (texte == null)
texte = ""; texte = "";
@ -142,7 +143,7 @@ namespace EPAServeur.Services
{ {
try try
{ {
engagements = epContext.Engagement.Include(engagement => engagement.Ep).Where(engagement => engagement.Ep.IdAgence == idAgence && engagement.Realise != null); engagements = epContext.Engagement.Include(engagement => engagement.Ep).Where(engagement => engagement.Ep.IdAgence == idAgence && engagement.Modalite.ToLower().Contains(texte));
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -153,7 +154,7 @@ namespace EPAServeur.Services
{ {
try try
{ {
engagements = epContext.Engagement.Include(engagement => engagement.Ep).Where(engagement => engagement.Realise != null); engagements = epContext.Engagement.Include(engagement => engagement.Ep).Where(engagement => engagement.Realise != null && engagement.Modalite.ToLower().Contains(texte));
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -165,8 +166,14 @@ namespace EPAServeur.Services
if (engagements == null) if (engagements == null)
return null; return null;
engagementDTOs = engagements.Where(engagement => engagement.Modalite.ToLower().Contains(texte)).Select(engagement => GetEngagementDTO(engagement)); var engagementDTOs = engagements.Where(engagement => engagement.Modalite.ToLower().Contains(texte)).Select(engagement => GetEngagementDTOAsync(engagement));
return engagementDTOs; var results = await Task.WhenAll(engagementDTOs);
//foreach (var engagement in engagements)
//{
// engagementDTOs.Add(await GetEngagementDTOAsync(engagement));
//}
return results;
} }
/// <summary> /// <summary>
@ -175,7 +182,7 @@ namespace EPAServeur.Services
/// <param name="engagementDTO"></param> /// <param name="engagementDTO"></param>
/// <param name="idEngagement"></param> /// <param name="idEngagement"></param>
/// <returns></returns> /// <returns></returns>
public EngagementDTO RepondreEngagement(EngagementDTO engagementDTO, long? idEngagement) public async Task<EngagementDTO> RepondreEngagement(EngagementDTO engagementDTO, long? idEngagement)
{ {
if (!IsEngagementValide(engagementDTO)) if (!IsEngagementValide(engagementDTO))
@ -202,7 +209,7 @@ namespace EPAServeur.Services
epContext.SaveChanges(); epContext.SaveChanges();
return GetEngagementDTO(engagement); return await GetEngagementDTOAsync(engagement);
} }
@ -215,6 +222,7 @@ namespace EPAServeur.Services
} }
#region Object to DTO #region Object to DTO
/// <summary> /// <summary>
/// Récupère un objet EngagementDTO en fonction d'un objet Engagement /// Récupère un objet EngagementDTO en fonction d'un objet Engagement
/// </summary> /// </summary>
@ -238,12 +246,35 @@ namespace EPAServeur.Services
return engagementDTO; return engagementDTO;
} }
/// <summary>
/// Récupère un objet EngagementDTO en fonction d'un objet Engagement
/// </summary>
/// <param name="engagement"></param>
/// <returns></returns>
private async Task<EngagementDTO> GetEngagementDTOAsync(Engagement engagement)
{
EngagementDTO engagementDTO = new EngagementDTO()
{
Id = engagement.Id,
Action = engagement.Action,
DatePrevisionnelle = engagement.DateLimite,
Dispositif = engagement.Disposition,
Modalite = engagement.Modalite,
RaisonNonRealisable = engagement.RaisonNonRealisable,
Realisable = engagement.Realisable,
Realise = engagement.Realise,
Ep = await GetEpInformationDTOAsync(engagement.Ep)
};
return engagementDTO;
}
/// <summary> /// <summary>
/// Récupère un objet EpInformationDTO en fonction d'un objet Ep /// Récupère un objet EpInformationDTO en fonction d'un objet Ep
/// </summary> /// </summary>
/// <param name="ep"></param> /// <param name="ep"></param>
/// <returns></returns> /// <returns></returns>
private EpInformationDTO GetEpInformationDTO(Ep ep) private EpInformationDTO GetEpInformationDTO(Ep ep)
{ {
EpInformationDTO epInformationDTO = new EpInformationDTO() EpInformationDTO epInformationDTO = new EpInformationDTO()
{ {
@ -252,13 +283,36 @@ namespace EPAServeur.Services
Statut = ep.Statut.ToString(), Statut = ep.Statut.ToString(),
DatePrevisionnelle = ep.DatePrevisionnelle, DatePrevisionnelle = ep.DatePrevisionnelle,
Obligatoire = ep.Obligatoire, Obligatoire = ep.Obligatoire,
Collaborateur = collaborateurService.GetProfilById(ep.IdCollaborateur) Collaborateur = collaborateurService.GetCollaborateurById(ep.IdCollaborateur),
//Referent = null //collaborateurService.GetProfilById(ep.IdReferent) Referent = collaborateurService.GetCollaborateurById(ep.IdReferent)
//Ajouter la date de disponibilité //Ajouter la date de disponibilité
}; };
return epInformationDTO; return epInformationDTO;
} }
/// <summary>
/// Récupère un objet EpInformationDTO en fonction d'un objet Ep
/// </summary>
/// <param name="ep"></param>
/// <returns></returns>
private async Task<EpInformationDTO> GetEpInformationDTOAsync(Ep ep)
{
EpInformationDTO epInformationDTO = new EpInformationDTO()
{
Id = ep.Id,
Type = ep.TypeEP.ToString(),
Statut = ep.Statut.ToString(),
DatePrevisionnelle = ep.DatePrevisionnelle,
Obligatoire = ep.Obligatoire,
Collaborateur = await collaborateurService.GetCollaborateurByIdAsync(ep.IdCollaborateur),
Referent = await collaborateurService.GetCollaborateurByIdAsync(ep.IdReferent)
//Ajouter la date de disponibilité
};
return epInformationDTO;
}
#endregion #endregion
#region DTO to Object #region DTO to Object

Write Preview
Loading…
Cancel
Save