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

Compare commits

base: ygrette:559cec8611bfb7debe83a566f7f3c6846ecab00f
Branches Tags
ygrette:develop
ygrette:master
ygrette:upgrade-docker
...
compare: ygrette:d15c4a3a3b81a5064df07b8618d31f118c3e795e
Branches Tags
ygrette:develop
ygrette:master
ygrette:upgrade-docker

2 Commits
559cec8611 ... d15c4a3a3b

Author SHA1 Message Date
Yanaël GRETTE d15c4a3a3b Corrections de bugs pour la gestion des clés étrangères
4 years ago
Yanaël GRETTE 2a8d199020 Mise à jour des tests EP en cours
4 years ago
7 changed files with 18 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 4
      EPAServeur.Tests/Controllers/EpInformationApiTests.cs
  2. 1
      EPAServeur.Tests/Services/EpDetailsServiceTests.cs
  3. 20
      EPAServeur.Tests/Services/EpInformationTests.cs
  4. 1
      EPAServeur/Context/EpContext.cs
  5. 2
      EPAServeur/Models/EP/DemandeEPI.cs
  6. 2
      EPAServeur/Models/EP/RdvEntretien.cs
  7. 2
      EPAServeur/Startup.cs

4
EPAServeur.Tests/Controllers/EpInformationApiTests.cs
Unescape View File

@ -61,7 +61,7 @@ namespace EPAServeur.Tests.Controllers
public async Task GetEpEnCours() public async Task GetEpEnCours()
{ {
EpApiController epApiController = new EpApiController(epInformationService, logger); EpApiController epApiController = new EpApiController(epInformationService, logger);
Task<IActionResult> task = epApiController.GetEPEnCours(new List<long?>() { 1, 2 }, true, 1, 15, "", "", null, null); Task<IActionResult> task = epApiController.GetEPEnCours(new List<long?>() { 1, 2 }, true, 1, 15, "", true, "", null, null);
OkObjectResult result = task.Result as OkObjectResult; OkObjectResult result = task.Result as OkObjectResult;
Assert.AreEqual(200, result.StatusCode); Assert.AreEqual(200, result.StatusCode);
Assert.IsInstanceOf<IEnumerable<EpInformationDTO>>(result.Value); Assert.IsInstanceOf<IEnumerable<EpInformationDTO>>(result.Value);
@ -71,7 +71,7 @@ namespace EPAServeur.Tests.Controllers
public async Task GetEpEnCoursCount() public async Task GetEpEnCoursCount()
{ {
EpApiController epApiController = new EpApiController(epInformationService, logger); EpApiController epApiController = new EpApiController(epInformationService, logger);
Task<IActionResult> task = epApiController.GetEPEnCoursCount(new List<long?>() { 1, 2 }, "", null, null); Task<IActionResult> task = epApiController.GetEPEnCoursCount(new List<long?>() { 1, 2 }, "", true, null, null);
OkObjectResult result = task.Result as OkObjectResult; OkObjectResult result = task.Result as OkObjectResult;
Assert.AreEqual(200, result.StatusCode); Assert.AreEqual(200, result.StatusCode);
Assert.IsInstanceOf<int>(result.Value); Assert.IsInstanceOf<int>(result.Value);

1
EPAServeur.Tests/Services/EpDetailsServiceTests.cs
Unescape View File

@ -15,6 +15,7 @@ using System.Threading.Tasks;
namespace EPAServeur.Tests.Services namespace EPAServeur.Tests.Services
{ {
[TestFixture]
public class EpDetailsServiceTests public class EpDetailsServiceTests
{ {
#region variables #region variables

20
EPAServeur.Tests/Services/EpInformationTests.cs
Unescape View File

@ -63,8 +63,8 @@ namespace EPAServeur.Tests.Services
{ {
IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO);
IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?>{ idBUs }, true, 1, 15, "", "", null, null); IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?>{ idBUs }, true, 1, 15, "", false,"", null, null);
int count = await epInformationService.GetEPEnCoursCount(new List<long?> { idBUs }, "", null, null); int count = await epInformationService.GetEPEnCoursCount(new List<long?> { idBUs }, "", false, null, null);
Assert.AreEqual(count, nbElements); Assert.AreEqual(count, nbElements);
Assert.AreEqual(count, epInformationDTOs.Count()); Assert.AreEqual(count, epInformationDTOs.Count());
foreach(EpInformationDTO ep in epInformationDTOs) foreach(EpInformationDTO ep in epInformationDTOs)
@ -79,8 +79,8 @@ namespace EPAServeur.Tests.Services
{ {
IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO);
IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1,2 }, true, 1, 15, "", "", null, null); IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1,2 }, true, 1, 15, "", false, "", null, null);
int count = await epInformationService.GetEPEnCoursCount(new List<long?> { 1, 2 }, "", null, null); int count = await epInformationService.GetEPEnCoursCount(new List<long?> { 1, 2 }, "", false, null, null);
Assert.AreEqual(count, 6); Assert.AreEqual(count, 6);
Assert.AreEqual(count, epInformationDTOs.Count()); Assert.AreEqual(count, epInformationDTOs.Count());
long? bu; long? bu;
@ -104,7 +104,7 @@ namespace EPAServeur.Tests.Services
public async Task GetEpEnCours_TriColonneASC(string tri) public async Task GetEpEnCours_TriColonneASC(string tri)
{ {
IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO);
IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, "", tri, null, null); IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, "", false, tri, null, null);
EpInformationDTO ep1, ep2; EpInformationDTO ep1, ep2;
int compare = 0; int compare = 0;
for(int i = 0; i < epInformationDTOs.Count()-1; ++i) for(int i = 0; i < epInformationDTOs.Count()-1; ++i)
@ -157,7 +157,7 @@ namespace EPAServeur.Tests.Services
public async Task GetEpEnCours_TriColonneDESC(string tri) public async Task GetEpEnCours_TriColonneDESC(string tri)
{ {
IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO);
IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, false, 1, 15, "", tri, null, null); IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, false, 1, 15, "", false, tri, null, null);
EpInformationDTO ep1, ep2; EpInformationDTO ep1, ep2;
int compare = 0; int compare = 0;
for (int i = 0; i < epInformationDTOs.Count() - 1; ++i) for (int i = 0; i < epInformationDTOs.Count() - 1; ++i)
@ -206,7 +206,7 @@ namespace EPAServeur.Tests.Services
DateTime date = new DateTime(a, m, j); DateTime date = new DateTime(a, m, j);
IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO);
IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, "", "", date, null); IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, "", false, "", date, null);
Assert.AreEqual(epInformationDTOs.Count(), count); Assert.AreEqual(epInformationDTOs.Count(), count);
foreach(EpInformationDTO ep in epInformationDTOs) foreach(EpInformationDTO ep in epInformationDTOs)
{ {
@ -222,7 +222,7 @@ namespace EPAServeur.Tests.Services
{ {
DateTime date = new DateTime(a, m, j); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO); DateTime date = new DateTime(a, m, j); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO);
IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, "", "", null, date); IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, "", false, "", null, date);
Assert.AreEqual(epInformationDTOs.Count(), count); Assert.AreEqual(epInformationDTOs.Count(), count);
foreach (EpInformationDTO ep in epInformationDTOs) foreach (EpInformationDTO ep in epInformationDTOs)
{ {
@ -242,7 +242,7 @@ namespace EPAServeur.Tests.Services
DateTime date2 = new DateTime(a2, m2, j2); DateTime date2 = new DateTime(a2, m2, j2);
IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO);
IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, "", "", date1, date2); IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, "", false, "", date1, date2);
Assert.AreEqual(epInformationDTOs.Count(), count); Assert.AreEqual(epInformationDTOs.Count(), count);
foreach (EpInformationDTO ep in epInformationDTOs) foreach (EpInformationDTO ep in epInformationDTOs)
{ {
@ -263,7 +263,7 @@ namespace EPAServeur.Tests.Services
public async Task GetEpEnCours_texte(string texte, int count) public async Task GetEpEnCours_texte(string texte, int count)
{ {
IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO); IEpInformationService epInformationService = new EpInformationService(context, collaborateurService, transformDTO);
IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, texte, "", null, null); IEnumerable<EpInformationDTO> epInformationDTOs = await epInformationService.GetEPEnCours(new List<long?> { 1, 2 }, true, 1, 15, texte, false, "", null, null);
Assert.AreEqual(count, epInformationDTOs.Count()); Assert.AreEqual(count, epInformationDTOs.Count());
foreach (EpInformationDTO ep in epInformationDTOs) foreach (EpInformationDTO ep in epInformationDTOs)
{ {

1
EPAServeur/Context/EpContext.cs
Unescape View File

@ -90,7 +90,6 @@ namespace EPAServeur.Context
entity.HasOne<DemandeEPI>(e => e.DemandeEPI).WithOne(a => a.Ep).HasForeignKey<DemandeEPI>(a => a.IdEP); entity.HasOne<DemandeEPI>(e => e.DemandeEPI).WithOne(a => a.Ep).HasForeignKey<DemandeEPI>(a => a.IdEP);
}); });
modelBuilder.Entity<Objectif>(entity => modelBuilder.Entity<Objectif>(entity =>
{ {
entity.HasKey(e => e.IdObjectif); entity.HasKey(e => e.IdObjectif);

2
EPAServeur/Models/EP/DemandeEPI.cs
Unescape View File

@ -49,7 +49,7 @@ namespace EPAServeur.Models.EP
/// <summary> /// <summary>
/// Id de l'EP /// Id de l'EP
/// </summary> /// </summary>
public long IdEP { get; set; } public long? IdEP { get; set; }
/// <summary> /// <summary>
/// EP qui est lié à la demande d'EPI /// EP qui est lié à la demande d'EPI

2
EPAServeur/Models/EP/RdvEntretien.cs
Unescape View File

@ -18,7 +18,7 @@ namespace EPAServeur.Models.EP
/// <summary> /// <summary>
/// Id EP concernant le choix du rendez-vous /// Id EP concernant le choix du rendez-vous
/// </summary> /// </summary>
public long IdEPChoixRDV { get; set; } public long? IdEPChoixRDV { get; set; }
/// <summary> /// <summary>
/// Date proposée/prévue pour l’entretien /// Date proposée/prévue pour l’entretien

2
EPAServeur/Startup.cs
Unescape View File

@ -109,8 +109,8 @@ namespace EPAServeur
DataSeeder.AddChamps(context); DataSeeder.AddChamps(context);
DataSeeder.AddNotes(context); DataSeeder.AddNotes(context);
DataSeeder.AddDemandeDelegationEP(context); DataSeeder.AddDemandeDelegationEP(context);
DataSeeder.AddEp(context);
DataSeeder.AddEngagements(context); DataSeeder.AddEngagements(context);
DataSeeder.AddEp(context);
DataSeeder.AddRereferentEP(context); DataSeeder.AddRereferentEP(context);
} }
//faire using, check si kekchoz exkist puis appeler les m<EFBFBD>thodes de cr<EFBFBD>ation si il n'y a rien //faire using, check si kekchoz exkist puis appeler les m<EFBFBD>thodes de cr<EFBFBD>ation si il n'y a rien

Write Preview
Loading…
Cancel
Save