diff --git a/ApiCollaborateur/CollaborateurApi.cs b/ApiCollaborateur/CollaborateurApi.cs
index 4a172a3..8d70356 100644
--- a/ApiCollaborateur/CollaborateurApi.cs
+++ b/ApiCollaborateur/CollaborateurApi.cs
@@ -1186,7 +1186,7 @@ namespace IO.Swagger.ApiCollaborateur
/// Collaborateur
public Collaborateur ChercherCollabId (Guid? collabId)
{
- ApiResponse localVarResponse = ChercherCollabIdWithHttpInfo(collabId);
+ ApiResponse localVarResponse = ChercherCollabIdWithHttpInfo(collabId);
if(localVarResponse != null)
return localVarResponse.Data;
return null;
diff --git a/ClientCollaborateur/ApiClient.cs b/ClientCollaborateur/ApiClient.cs
index f4a048f..0299b1a 100644
--- a/ClientCollaborateur/ApiClient.cs
+++ b/ClientCollaborateur/ApiClient.cs
@@ -315,11 +315,6 @@ namespace IO.Swagger.ClientCollaborateur
{
return ConvertType(response.Content, type);
}
- Console.WriteLine(response.Content);
- Console.WriteLine("JFPEIOZJEZPIOFJENPOI");
- Console.WriteLine(type.Name);
- Console.WriteLine("18616840684");
- Console.WriteLine(response.Content);
// at this point, it must be a model (json)
try
{
diff --git a/Controllers/CollaborateursApi.cs b/Controllers/CollaborateursApi.cs
index c4cd299..d7da8a3 100644
--- a/Controllers/CollaborateursApi.cs
+++ b/Controllers/CollaborateursApi.cs
@@ -53,7 +53,7 @@ namespace IO.Swagger.Controllers
{
//TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ...
// return StatusCode(200, default(CollaborateurDTO));
- Console.WriteLine("COUCOU");
+
CollaborateurDTO collaborateurDTO = collaborateurService.GetCollaborateurById(idCollaborateur);
if( collaborateurDTO == null)
{
@@ -62,9 +62,9 @@ namespace IO.Swagger.Controllers
Code = "404",
Message = "Le collaborateur n'existe pas",
};
- return StatusCode(404, erreurDTO);
+ return NotFound(erreurDTO);
}
- return StatusCode(200, collaborateurDTO);
+ return Ok(collaborateurDTO);
//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));
diff --git a/IServices/ICollaborateurService.cs b/IServices/ICollaborateurService.cs
index 652c3e8..2f86193 100644
--- a/IServices/ICollaborateurService.cs
+++ b/IServices/ICollaborateurService.cs
@@ -15,11 +15,5 @@ namespace EPAServeur.IServices
ProfilDTO GetProfilByMail(string mail);
List GetCollaborateurs();
List GetCollaborateursByReferent(Guid? idRefent);
-
- //Object to DTO
- CollaborateurDTO GetCollaborateurDTO(Collaborateur collaborateur);
- BusinessUnitDTO GetBusinessUnitDTO(BU businessUnit);
- AgenceDTO GetAgenceDTO(Agence agence);
- ReferentDTO GetReferentDTO(Collaborateur referent);
}
}
diff --git a/Services/CollaborateurService.cs b/Services/CollaborateurService.cs
index f160656..3ffdb30 100644
--- a/Services/CollaborateurService.cs
+++ b/Services/CollaborateurService.cs
@@ -21,40 +21,6 @@ namespace EPAServeur.Services
collaborateurApi = _collaborateurApi;
}
- //
- public AgenceDTO GetAgenceDTO(Agence agence)
- {
- if (agence == null)
- return null;
- AgenceDTO agenceDTO = new AgenceDTO()
- {
- Id = agence.Id,
- Nom = agence.Nom,
- Bu = new List()
- };
- foreach(BU bu in agence.Bus)
- {
- agenceDTO.Bu.Add(new BusinessUnitDTO()
- {
- Id = bu.Id,
- Nom = bu.Nom
- });
- }
- return agenceDTO;
- }
-
- public BusinessUnitDTO GetBusinessUnitDTO(BU businessUnit)
- {
- if (businessUnit == null)
- return null;
- BusinessUnitDTO businessUnitDTO = new BusinessUnitDTO()
- {
- Id = businessUnit.Id,
- Nom = businessUnit.Nom,
- Agence = GetAgenceDTO(businessUnit.Agence)
- };
- return businessUnitDTO;
- }
public CollaborateurDTO GetCollaborateurById(Guid? id)
{
@@ -72,21 +38,6 @@ namespace EPAServeur.Services
return GetCollaborateurDTO(collaborateur);
}
- public CollaborateurDTO GetCollaborateurDTO(Collaborateur collaborateur)
- {
- CollaborateurDTO collaborateurDTO = new CollaborateurDTO()
- {
- Id = collaborateur.Id,
- Prenom = collaborateur.Prenom,
- Nom = collaborateur.Nom,
- MailApside = collaborateur.MailApside,
- DateArrivee = collaborateur.DateArrivee,
-
- };
- collaborateurDTO.BusinessUnit = GetBusinessUnitDTO(collaborateur.BusinessUnit);
- collaborateurDTO.Referent = GetReferentDTO(collaborateur.Referent);
- return collaborateurDTO;
- }
public List GetCollaborateurs()
{
@@ -100,34 +51,85 @@ namespace EPAServeur.Services
public List GetCollaborateursByReferent(Guid? idReferent)
{
- /*
- Collaborateur collaborateur = collaborateurApi.ChercherCollabRef(idReferent);
- CollaborateurDTO collaborateurDTO = new CollaborateurDTO()
+ List collaborateurs = collaborateurApi.ChercherCollabRef(idReferent);
+ List collaborateursDTO = (from c in collaborateurs
+ select GetCollaborateurDTO(c)).ToList();
+ //List collaborateursDTO = collaborateurs.Select(c => GetCollaborateurDTO(c)).ToList();
+
+ return collaborateursDTO;
+ }
+
+ public ProfilDTO GetProfilByMail(string mail)
+ {
+ Collaborateur collaborateur = collaborateurApi.ChercherCollabMail(mail);
+ if (collaborateur == null)
+ return null;
+ return GetProfilDTO(collaborateur);
+ }
+
+ private ProfilDTO GetProfilDTO(Collaborateur collaborateur)
+ {
+ ProfilDTO profilDTO = new ProfilDTO()
{
- Id = collaborateur.Id,
- Prenom = collaborateur.Prenom,
- Nom = collaborateur.Nom,
+ //Id = collaborateur.Id,
+ DateArrivee = collaborateur.DateArrivee,
MailApside = collaborateur.MailApside,
- DateArrivee = collaborateur.DateArrivee
+ Nom = collaborateur.Nom,
+ Prenom = collaborateur.Prenom,
+ BusinessUnit = GetBusinessUnitDTO(collaborateur.BusinessUnit)
};
- collaborateurDTO.Referent = new ReferentDTO()
+ return null;
+ }
+
+ //Object to DTO
+ private AgenceDTO GetAgenceDTO(Agence agence)
+ {
+ if (agence == null)
+ return null;
+ AgenceDTO agenceDTO = new AgenceDTO()
{
- Id = collaborateur.Referent.Id,
- Prenom = collaborateur.Referent.Prenom,
- Nom = collaborateur.Referent.Nom,
- MailApside = collaborateur.Referent.MailApside
+ Id = agence.Id,
+ Nom = agence.Nom,
+ Bu = new List()
};
- return collaborateurDTO;
- */
- throw new NotImplementedException();
+ agenceDTO.Bu = agence.Bus.Select(bu => new BusinessUnitDTO()
+ {
+ Id = bu.Id,
+ Nom = bu.Nom
+ }).ToList();
+ return agenceDTO;
}
- public ProfilDTO GetProfilByMail(string mail)
+ private BusinessUnitDTO GetBusinessUnitDTO(BU businessUnit)
{
- throw new NotImplementedException();
+ if (businessUnit == null)
+ return null;
+ BusinessUnitDTO businessUnitDTO = new BusinessUnitDTO()
+ {
+ Id = businessUnit.Id,
+ Nom = businessUnit.Nom,
+ Agence = GetAgenceDTO(businessUnit.Agence)
+ };
+ return businessUnitDTO;
+ }
+
+ private CollaborateurDTO GetCollaborateurDTO(Collaborateur collaborateur)
+ {
+ CollaborateurDTO collaborateurDTO = new CollaborateurDTO()
+ {
+ Id = collaborateur.Id,
+ Prenom = collaborateur.Prenom,
+ Nom = collaborateur.Nom,
+ MailApside = collaborateur.MailApside,
+ DateArrivee = collaborateur.DateArrivee,
+
+ };
+ collaborateurDTO.BusinessUnit = GetBusinessUnitDTO(collaborateur.BusinessUnit);
+ collaborateurDTO.Referent = GetReferentDTO(collaborateur.Referent);
+ return collaborateurDTO;
}
- public ReferentDTO GetReferentDTO(Collaborateur referent)
+ private ReferentDTO GetReferentDTO(Collaborateur referent)
{
if (referent == null)
return null;
diff --git a/Startup.cs b/Startup.cs
index 96463b9..3e5b0c6 100644
--- a/Startup.cs
+++ b/Startup.cs
@@ -31,7 +31,6 @@ namespace EPAServeur
// This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
- Console.WriteLine("SERVICES");
services.AddControllers();
services.AddAuthentication(BearerAuthenticationHandler.SchemeName)
.AddScheme(BearerAuthenticationHandler.SchemeName, null);