From f4a44ea80f0daf966f7714d30d62cc535b79bf46 Mon Sep 17 00:00:00 2001 From: Nestisse Date: Sat, 16 Mar 2024 10:48:40 +0100 Subject: [PATCH] =?UTF-8?q?Suppression=20des=20constructeurs=20des=20entit?= =?UTF-8?q?=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntityFramework/InquiryTableEntity.cs | 21 +------ .../Shared/Mapper/InquiryTableMapper.cs | 22 ++++++-- .../StubbedContextLib/StubbedContext.cs | 27 +++++++-- .../EntitiesTests/TestInquiryTableEntity.cs | 55 ++++++++++++------- 4 files changed, 72 insertions(+), 53 deletions(-) diff --git a/API_SQLuedo/EntityFramework/InquiryTableEntity.cs b/API_SQLuedo/EntityFramework/InquiryTableEntity.cs index c8798b9..c8154e9 100644 --- a/API_SQLuedo/EntityFramework/InquiryTableEntity.cs +++ b/API_SQLuedo/EntityFramework/InquiryTableEntity.cs @@ -11,27 +11,8 @@ public class InquiryTableEntity [DatabaseGenerated(DatabaseGeneratedOption.Identity)] [Required] public int OwnerId { get; set; } + public InquiryEntity Owner { get; set; } public string DatabaseName { get; set; } public string ConnectionInfo { get; set; } - - public InquiryTableEntity() { } - - public InquiryTableEntity(int inquiryId) - { - OwnerId = inquiryId; - } - public InquiryTableEntity(int inquiryId, string databaseName, string connectionInfo) - { - OwnerId = inquiryId; - DatabaseName = databaseName; - ConnectionInfo = connectionInfo; - } - - public InquiryTableEntity(InquiryEntity owner, string databaseName, string connectionInfo) - { - Owner = owner; - DatabaseName = databaseName; - ConnectionInfo = connectionInfo; - } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs b/API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs index 3dc11ca..cd303ac 100644 --- a/API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs +++ b/API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs @@ -6,7 +6,7 @@ namespace Shared.Mapper; public static class InquiryTableMapper { - public static InquiryTable FromDTOToModel(this InquiryTableDTO inqTDto) + public static InquiryTable FromDtoToModel(this InquiryTableDTO inqTDto) { return new InquiryTable(inqTDto.OwnerId, inqTDto.ConnectionInfo, inqTDto.DatabaseName); } @@ -16,23 +16,33 @@ public static class InquiryTableMapper return new InquiryTable(inqTEntity.OwnerId, inqTEntity.ConnectionInfo, inqTEntity.DatabaseName); } - public static InquiryTableDTO FromModelToDTO(this InquiryTable inqT) + public static InquiryTableDTO FromModelToDto(this InquiryTable inqT) { return new InquiryTableDTO(inqT.OwnerId, inqT.DatabaseName, inqT.ConnectionInfo); } - public static InquiryTableDTO FromEntityToDTO(this InquiryTableEntity inqTEntity) + public static InquiryTableDTO FromEntityToDto(this InquiryTableEntity inqTEntity) { return new InquiryTableDTO(inqTEntity.OwnerId, inqTEntity.DatabaseName, inqTEntity.ConnectionInfo); } public static InquiryTableEntity FromModelToEntity(this InquiryTable inqT) { - return new InquiryTableEntity(inqT.OwnerId, inqT.DatabaseName, inqT.ConnectionInfo); + return new InquiryTableEntity + { + OwnerId = inqT.OwnerId, + DatabaseName = inqT.DatabaseName, + ConnectionInfo = inqT.ConnectionInfo + }; } - public static InquiryTableEntity FromDTOToEntity(this InquiryTableDTO dto) + public static InquiryTableEntity FromDtoToEntity(this InquiryTableDTO dto) { - return new InquiryTableEntity(dto.OwnerId, dto.DatabaseName, dto.ConnectionInfo); + return new InquiryTableEntity + { + OwnerId = dto.OwnerId, + DatabaseName = dto.DatabaseName, + ConnectionInfo = dto.ConnectionInfo + }; } } \ No newline at end of file diff --git a/API_SQLuedo/StubbedContextLib/StubbedContext.cs b/API_SQLuedo/StubbedContextLib/StubbedContext.cs index 263f6ee..cd17f40 100644 --- a/API_SQLuedo/StubbedContextLib/StubbedContext.cs +++ b/API_SQLuedo/StubbedContextLib/StubbedContext.cs @@ -49,12 +49,27 @@ public class StubbedContext : UserDbContext numBytesRequested: 256 / 8)), "Victor.GABORIT@etu.uca.fr", true)); modelBuilder.Entity().HasData( - new InquiryTableEntity(1, "Inquiry1", - "Server=localhost;Database=Inquiry1;Trusted_Connection=True;MultipleActiveResultSets=true"), - new InquiryTableEntity(2, "Inquiry2", - "Server=localhost;Database=Inquiry2;Trusted_Connection=True;MultipleActiveResultSets=true"), - new InquiryTableEntity(3, "Inquiry3", - "Server=localhost;Database=Inquiry3;Trusted_Connection=True;MultipleActiveResultSets=true")); + new InquiryTableEntity + { + OwnerId = 1, + DatabaseName = "Inquiry1", + ConnectionInfo = + "Server=localhost;Database=Inquiry1;Trusted_Connection=True;MultipleActiveResultSets=true" + }, + new InquiryTableEntity + { + OwnerId = 2, + DatabaseName = "Inquiry2", + ConnectionInfo = + "Server=localhost;Database=Inquiry2;Trusted_Connection=True;MultipleActiveResultSets=true" + }, + new InquiryTableEntity + { + OwnerId = 3, + DatabaseName = "Inquiry3", + ConnectionInfo = + "Server=localhost;Database=Inquiry3;Trusted_Connection=True;MultipleActiveResultSets=true" + }); modelBuilder.Entity().HasData( new SolutionEntity(1, "Maxime", "Sapountzis", "La cuisine", "Le couteau", "Parce que c'est Maxime"), diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs index 7751046..48ff9e2 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs @@ -1,52 +1,65 @@ using Entities; -namespace TestEF; +namespace TestEF.EntitiesTests; public class TestInquiryTableEntity { - private const int _inquiryId = 42; - private static InquiryEntity _inquiry = new InquiryEntity(); - private const string _databaseName = "Database"; - private const string _connectionInfo = "Connection"; + private const int InquiryId = 42; + private static readonly InquiryEntity Inquiry = new InquiryEntity(); + private const string DatabaseName = "Database"; + private const string ConnectionInfo = "Connection"; [Fact] public void TestDefaultConstructor() { InquiryTableEntity tableEntity = new InquiryTableEntity(); - Assert.Equal(0,tableEntity.OwnerId); + Assert.Equal(0, tableEntity.OwnerId); Assert.Null(tableEntity.Owner); Assert.Null(tableEntity.DatabaseName); Assert.Null(tableEntity.ConnectionInfo); } - + [Fact] public void TestConstructorWithOnlyId() { - InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiryId); - Assert.Equal(_inquiryId,tableEntity.OwnerId); + InquiryTableEntity tableEntity = new InquiryTableEntity + { + OwnerId = InquiryId + }; + Assert.Equal(InquiryId, tableEntity.OwnerId); Assert.Null(tableEntity.Owner); Assert.Null(tableEntity.DatabaseName); Assert.Null(tableEntity.ConnectionInfo); } - - + + [Fact] public void TestConstructorWithoutId() { - InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiry,_databaseName,_connectionInfo); - Assert.Equal(0,tableEntity.OwnerId); - Assert.Equal(_inquiry,tableEntity.Owner); - Assert.Equal(_databaseName,tableEntity.DatabaseName); - Assert.Equal(_connectionInfo,tableEntity.ConnectionInfo); + InquiryTableEntity tableEntity = new InquiryTableEntity + { + Owner = Inquiry, + DatabaseName = DatabaseName, + ConnectionInfo = ConnectionInfo + }; + Assert.Equal(0, tableEntity.OwnerId); + Assert.Equal(Inquiry, tableEntity.Owner); + Assert.Equal(DatabaseName, tableEntity.DatabaseName); + Assert.Equal(ConnectionInfo, tableEntity.ConnectionInfo); } - + [Fact] public void TestConstructorWithoutNavigationProperty() { - InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiryId,_databaseName,_connectionInfo); - Assert.Equal(_inquiryId,tableEntity.OwnerId); + InquiryTableEntity tableEntity = new InquiryTableEntity + { + OwnerId = InquiryId, + DatabaseName = DatabaseName, + ConnectionInfo = ConnectionInfo + }; + Assert.Equal(InquiryId, tableEntity.OwnerId); Assert.Null(tableEntity.Owner); - Assert.Equal(_databaseName,tableEntity.DatabaseName); - Assert.Equal(_connectionInfo,tableEntity.ConnectionInfo); + Assert.Equal(DatabaseName, tableEntity.DatabaseName); + Assert.Equal(ConnectionInfo, tableEntity.ConnectionInfo); } } \ No newline at end of file