Suppression des constructeurs des entités

pull/40/head
Clement CHIEU 1 year ago
parent d0efe824ec
commit f4a44ea80f

@ -11,27 +11,8 @@ public class InquiryTableEntity
[DatabaseGenerated(DatabaseGeneratedOption.Identity)] [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Required] [Required]
public int OwnerId { get; set; } public int OwnerId { get; set; }
public InquiryEntity Owner { get; set; } public InquiryEntity Owner { get; set; }
public string DatabaseName { get; set; } public string DatabaseName { get; set; }
public string ConnectionInfo { 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;
}
} }

@ -6,7 +6,7 @@ namespace Shared.Mapper;
public static class InquiryTableMapper 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); 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); 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); 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); return new InquiryTableDTO(inqTEntity.OwnerId, inqTEntity.DatabaseName, inqTEntity.ConnectionInfo);
} }
public static InquiryTableEntity FromModelToEntity(this InquiryTable inqT) 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
};
} }
} }

@ -49,12 +49,27 @@ public class StubbedContext : UserDbContext
numBytesRequested: 256 / 8)), "Victor.GABORIT@etu.uca.fr", true)); numBytesRequested: 256 / 8)), "Victor.GABORIT@etu.uca.fr", true));
modelBuilder.Entity<InquiryTableEntity>().HasData( modelBuilder.Entity<InquiryTableEntity>().HasData(
new InquiryTableEntity(1, "Inquiry1", new InquiryTableEntity
"Server=localhost;Database=Inquiry1;Trusted_Connection=True;MultipleActiveResultSets=true"), {
new InquiryTableEntity(2, "Inquiry2", OwnerId = 1,
"Server=localhost;Database=Inquiry2;Trusted_Connection=True;MultipleActiveResultSets=true"), DatabaseName = "Inquiry1",
new InquiryTableEntity(3, "Inquiry3", ConnectionInfo =
"Server=localhost;Database=Inquiry3;Trusted_Connection=True;MultipleActiveResultSets=true")); "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<SolutionEntity>().HasData( modelBuilder.Entity<SolutionEntity>().HasData(
new SolutionEntity(1, "Maxime", "Sapountzis", "La cuisine", "Le couteau", "Parce que c'est Maxime"), new SolutionEntity(1, "Maxime", "Sapountzis", "La cuisine", "Le couteau", "Parce que c'est Maxime"),

@ -1,52 +1,65 @@
using Entities; using Entities;
namespace TestEF; namespace TestEF.EntitiesTests;
public class TestInquiryTableEntity public class TestInquiryTableEntity
{ {
private const int _inquiryId = 42; private const int InquiryId = 42;
private static InquiryEntity _inquiry = new InquiryEntity(); private static readonly InquiryEntity Inquiry = new InquiryEntity();
private const string _databaseName = "Database"; private const string DatabaseName = "Database";
private const string _connectionInfo = "Connection"; private const string ConnectionInfo = "Connection";
[Fact] [Fact]
public void TestDefaultConstructor() public void TestDefaultConstructor()
{ {
InquiryTableEntity tableEntity = new InquiryTableEntity(); InquiryTableEntity tableEntity = new InquiryTableEntity();
Assert.Equal(0,tableEntity.OwnerId); Assert.Equal(0, tableEntity.OwnerId);
Assert.Null(tableEntity.Owner); Assert.Null(tableEntity.Owner);
Assert.Null(tableEntity.DatabaseName); Assert.Null(tableEntity.DatabaseName);
Assert.Null(tableEntity.ConnectionInfo); Assert.Null(tableEntity.ConnectionInfo);
} }
[Fact] [Fact]
public void TestConstructorWithOnlyId() public void TestConstructorWithOnlyId()
{ {
InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiryId); InquiryTableEntity tableEntity = new InquiryTableEntity
Assert.Equal(_inquiryId,tableEntity.OwnerId); {
OwnerId = InquiryId
};
Assert.Equal(InquiryId, tableEntity.OwnerId);
Assert.Null(tableEntity.Owner); Assert.Null(tableEntity.Owner);
Assert.Null(tableEntity.DatabaseName); Assert.Null(tableEntity.DatabaseName);
Assert.Null(tableEntity.ConnectionInfo); Assert.Null(tableEntity.ConnectionInfo);
} }
[Fact] [Fact]
public void TestConstructorWithoutId() public void TestConstructorWithoutId()
{ {
InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiry,_databaseName,_connectionInfo); InquiryTableEntity tableEntity = new InquiryTableEntity
Assert.Equal(0,tableEntity.OwnerId); {
Assert.Equal(_inquiry,tableEntity.Owner); Owner = Inquiry,
Assert.Equal(_databaseName,tableEntity.DatabaseName); DatabaseName = DatabaseName,
Assert.Equal(_connectionInfo,tableEntity.ConnectionInfo); ConnectionInfo = ConnectionInfo
};
Assert.Equal(0, tableEntity.OwnerId);
Assert.Equal(Inquiry, tableEntity.Owner);
Assert.Equal(DatabaseName, tableEntity.DatabaseName);
Assert.Equal(ConnectionInfo, tableEntity.ConnectionInfo);
} }
[Fact] [Fact]
public void TestConstructorWithoutNavigationProperty() public void TestConstructorWithoutNavigationProperty()
{ {
InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiryId,_databaseName,_connectionInfo); InquiryTableEntity tableEntity = new InquiryTableEntity
Assert.Equal(_inquiryId,tableEntity.OwnerId); {
OwnerId = InquiryId,
DatabaseName = DatabaseName,
ConnectionInfo = ConnectionInfo
};
Assert.Equal(InquiryId, tableEntity.OwnerId);
Assert.Null(tableEntity.Owner); Assert.Null(tableEntity.Owner);
Assert.Equal(_databaseName,tableEntity.DatabaseName); Assert.Equal(DatabaseName, tableEntity.DatabaseName);
Assert.Equal(_connectionInfo,tableEntity.ConnectionInfo); Assert.Equal(ConnectionInfo, tableEntity.ConnectionInfo);
} }
} }
Loading…
Cancel
Save