From a2d1965ca702c127fd43e173ba4d571643863c38 Mon Sep 17 00:00:00 2001
From: Alexandre Ruiz <alexandre.ruiz@apside-groupe.com>
Date: Tue, 22 Feb 2022 13:03:11 +0100
Subject: [PATCH] Fix merge

---
 .../Controllers/BusinessUnitsController.cs    |  4 +--
 .../Controllers/FonctionsController.cs        |  2 +-
 .../{AgenceServices.cs => AgenceService.cs}   |  2 +-
 .../BusinessUnitService.cs                    | 10 ++++--
 .../BusinessUnitServices.cs                   | 19 -----------
 .../FonctionServices.cs                       | 14 --------
 .../FakeBusinessUnitRepository.cs             |  5 +++
 .../IBusinessUnitRepository.cs                |  2 +-
 .../MainDbContext.cs                          | 33 +++++++++----------
 9 files changed, 34 insertions(+), 57 deletions(-)
 rename Collaborateur_Epa_Back/espacecollab.backend.appservices/{AgenceServices.cs => AgenceService.cs} (84%)
 delete mode 100644 Collaborateur_Epa_Back/espacecollab.backend.appservices/BusinessUnitServices.cs
 delete mode 100644 Collaborateur_Epa_Back/espacecollab.backend.appservices/FonctionServices.cs

diff --git a/Collaborateur_Epa_Back/espacecollab.backend.api/Controllers/BusinessUnitsController.cs b/Collaborateur_Epa_Back/espacecollab.backend.api/Controllers/BusinessUnitsController.cs
index 60fa49b..6dd0b39 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.api/Controllers/BusinessUnitsController.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.api/Controllers/BusinessUnitsController.cs
@@ -8,9 +8,9 @@ namespace espacecollab.backend.api.Controllers
     //[ApiController]
     public class BusinessUnitsController : BaseController<BusinessUnitApiDto>
     {
-        private BusinessUnitServices BusinessUnitServices { get; }
+        private BusinessUnitService BusinessUnitServices { get; }
 
-        public BusinessUnitsController(BusinessUnitServices businessUnitServices) : base(businessUnitServices)
+        public BusinessUnitsController(BusinessUnitService businessUnitServices) : base(businessUnitServices)
         {
             BusinessUnitServices = businessUnitServices;
         }
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.api/Controllers/FonctionsController.cs b/Collaborateur_Epa_Back/espacecollab.backend.api/Controllers/FonctionsController.cs
index 431862a..81b0cf7 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.api/Controllers/FonctionsController.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.api/Controllers/FonctionsController.cs
@@ -5,7 +5,7 @@ namespace espacecollab.backend.api.Controllers
 {
     public class FonctionsController : BaseController<FonctionApiDto>
     {
-        public FonctionsController(FonctionServices fonctionService) : base(fonctionService)
+        public FonctionsController(FonctionService fonctionService) : base(fonctionService)
         {
         }
     }
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.appservices/AgenceServices.cs b/Collaborateur_Epa_Back/espacecollab.backend.appservices/AgenceService.cs
similarity index 84%
rename from Collaborateur_Epa_Back/espacecollab.backend.appservices/AgenceServices.cs
rename to Collaborateur_Epa_Back/espacecollab.backend.appservices/AgenceService.cs
index 3a72ae6..e081882 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.appservices/AgenceServices.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.appservices/AgenceService.cs
@@ -5,7 +5,7 @@ using espacecollab.backend.infrastructure.sql.dtos;
 
 namespace espacecollab.backend.appservices;
 
-public class AgenceServices : GenericsServices<AgenceSqlDto, AgenceApiDto>
+public class AgenceService : GenericsServices<AgenceSqlDto, AgenceApiDto>
 {
     public AgenceService(IAgenceRepository agenceRepository)
             : base(agenceRepository, AgenceMapper.ToApi, AgenceMapper.ToSql)
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.appservices/BusinessUnitService.cs b/Collaborateur_Epa_Back/espacecollab.backend.appservices/BusinessUnitService.cs
index a12024e..fd306c0 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.appservices/BusinessUnitService.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.appservices/BusinessUnitService.cs
@@ -7,8 +7,14 @@ namespace espacecollab.backend.appservices;
 
 public class BusinessUnitService : GenericsServices<BusinessUnitSqlDto, BusinessUnitApiDto>
 {
-    public BusinessUnitService(IBusinessUnitRepository genericRepository)
-        : base(genericRepository, BusinessUnitMapper.ToApi, BusinessUnitMapper.ToSql)
+    private IBusinessUnitRepository BusinessUnitRepository { get; }
+
+    public BusinessUnitService(IBusinessUnitRepository businessUnitRepository)
+            :base(businessUnitRepository, BusinessUnitMapper.ToApi, BusinessUnitMapper.ToSql)
+    {}
+
+    public IEnumerable<BusinessUnitApiDto> GetBusinessUnitsByAgence(uint agenceId)
     {
+        return BusinessUnitRepository.GetBusinessUnitsByAgence((int)agenceId).Select(bu => bu.ToApi());
     }
 }
\ No newline at end of file
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.appservices/BusinessUnitServices.cs b/Collaborateur_Epa_Back/espacecollab.backend.appservices/BusinessUnitServices.cs
deleted file mode 100644
index 10e4df5..0000000
--- a/Collaborateur_Epa_Back/espacecollab.backend.appservices/BusinessUnitServices.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using espacecollab.backend.appservices.dtos;
-using espacecollab.backend.appservices.dtos.Mappers;
-using espacecollab.backend.infrastructure.interfaces;
-using espacecollab.backend.infrastructure.sql.dtos;
-
-namespace espacecollab.backend.appservices;
-
-public class BusinessUnitServices : GenericsServices<BusinessUnitSqlDto, BusinessUnitApiDto>
-{
-    private IBusinessUnitRepository BusinessUnitRepository { get; }
-    public BusinessUnitServices(IBusinessUnitRepository businessUnitRepository)
-            :base(businessUnitRepository, BusinessUnitMapper.ToApi, BusinessUnitMapper.ToSql)
-    {}
-
-    public IEnumerable<BusinessUnitApiDto> GetBusinessUnitsByAgence(uint agenceId)
-    {
-        return BusinessUnitRepository.GetBusinessUnitsByAgence((int)agenceId).Select(bu => bu.ToApi());
-    }
-}
\ No newline at end of file
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.appservices/FonctionServices.cs b/Collaborateur_Epa_Back/espacecollab.backend.appservices/FonctionServices.cs
deleted file mode 100644
index ad02b9a..0000000
--- a/Collaborateur_Epa_Back/espacecollab.backend.appservices/FonctionServices.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using espacecollab.backend.appservices.dtos;
-using espacecollab.backend.appservices.dtos.Mappers;
-using espacecollab.backend.infrastructure.interfaces;
-using espacecollab.backend.infrastructure.sql.dtos;
-
-namespace espacecollab.backend.appservices;
-
-public class FonctionServices : GenericsServices<FonctionSqlDto, FonctionApiDto>
-{
-    public FonctionServices(IFonctionRepository fonctionRepository)
-            :base(fonctionRepository, FonctionMapper.ToApi, FonctionMapper.ToSql)
-    {
-    }
-}
\ No newline at end of file
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.fake/FakeBusinessUnitRepository.cs b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.fake/FakeBusinessUnitRepository.cs
index f7ba96b..fcd8637 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.fake/FakeBusinessUnitRepository.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.fake/FakeBusinessUnitRepository.cs
@@ -13,4 +13,9 @@ public class FakeBusinessUnitRepository : GenericFakeRepository<BusinessUnitSqlD
             new(2, "BU 2", 1)
         };
     }
+
+    public IList<BusinessUnitSqlDto> GetBusinessUnitsByAgence(int agenceId)
+    {
+        return Context.Where(c => c.AgenceId == agenceId).ToList();
+    }
 }
\ No newline at end of file
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.interfaces/IBusinessUnitRepository.cs b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.interfaces/IBusinessUnitRepository.cs
index b098768..0689055 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.interfaces/IBusinessUnitRepository.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.interfaces/IBusinessUnitRepository.cs
@@ -1,6 +1,6 @@
 using espacecollab.backend.infrastructure.sql.dtos;
 
-namespace espacecollab.backend.infrastructure.interfaces
+namespace espacecollab.backend.infrastructure.interfaces;
 
 public interface IBusinessUnitRepository : IGenericRepository<BusinessUnitSqlDto>
 {
diff --git a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql/MainDbContext.cs b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql/MainDbContext.cs
index 37f983a..1f7f0bd 100644
--- a/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql/MainDbContext.cs
+++ b/Collaborateur_Epa_Back/espacecollab.backend.infrastructure.sql/MainDbContext.cs
@@ -21,21 +21,20 @@ public class MainDbContext : DbContext
             .EnableSensitiveDataLogging();
     }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<BusinessUnitSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
-            modelBuilder.Entity<AgenceSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
-            modelBuilder.Entity<FonctionSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
-            modelBuilder.Entity<TechnologieSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
-            modelBuilder.Entity<CollaborateurSqlDto>().Property(p=> p.Id).UseMySqlIdentityColumn();
-            modelBuilder
-                .Entity<CollaborateurSqlDto>()
-                .Property(e => e.Gender)
-                .HasConversion<string>();
-            modelBuilder
-               .Entity<CollaborateurSqlDto>()
-               .Property(e => e.Status)
-               .HasConversion<string>();
-        }
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<BusinessUnitSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
+        modelBuilder.Entity<AgenceSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
+        modelBuilder.Entity<FonctionSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
+        modelBuilder.Entity<TechnologieSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
+        modelBuilder.Entity<CollaborateurSqlDto>().Property(p => p.Id).UseMySqlIdentityColumn();
+        modelBuilder
+            .Entity<CollaborateurSqlDto>()
+            .Property(e => e.Gender)
+            .HasConversion<string>();
+        modelBuilder
+           .Entity<CollaborateurSqlDto>()
+           .Property(e => e.Status)
+           .HasConversion<string>();
     }
-}
+}
\ No newline at end of file