From f2ed9a8dbd8cc6b712f5acd32b09170845b49f23 Mon Sep 17 00:00:00 2001 From: Nestisse Date: Sat, 16 Mar 2024 11:27:23 +0100 Subject: [PATCH] Suppression des constructeurs de successEntity --- API_SQLuedo/EntityFramework/SuccessEntity.cs | 14 ----- API_SQLuedo/Shared/Mapper/SuccessMapper.cs | 28 ++++++---- .../TestEF/EntitiesTests/TestSuccessEntity.cs | 53 ++++++++++++------- 3 files changed, 53 insertions(+), 42 deletions(-) diff --git a/API_SQLuedo/EntityFramework/SuccessEntity.cs b/API_SQLuedo/EntityFramework/SuccessEntity.cs index 10f21a9..d053a92 100644 --- a/API_SQLuedo/EntityFramework/SuccessEntity.cs +++ b/API_SQLuedo/EntityFramework/SuccessEntity.cs @@ -24,18 +24,4 @@ public class SuccessEntity Inquiry = inquiry; IsFinished = isFinished; } - - public SuccessEntity(int userId, int inquiryId, bool isFinished) - { - UserId = userId; - InquiryId = inquiryId; - IsFinished = isFinished; - } - - public SuccessEntity(UserEntity user, InquiryEntity inquiry, bool isFinished) - { - User = user; - Inquiry = inquiry; - IsFinished = isFinished; - } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/SuccessMapper.cs b/API_SQLuedo/Shared/Mapper/SuccessMapper.cs index a51ac67..e96291a 100644 --- a/API_SQLuedo/Shared/Mapper/SuccessMapper.cs +++ b/API_SQLuedo/Shared/Mapper/SuccessMapper.cs @@ -28,29 +28,37 @@ public static class SuccessMapper public static SuccessEntity FromDtoToEntity(this SuccessDTO dto) { - return new SuccessEntity(dto.UserId, new UserEntity + return new SuccessEntity + { + UserId = dto.UserId, + User = new UserEntity { Id = dto.UserId - }, - dto.InquiryId, - new InquiryEntity + }, + InquiryId = dto.InquiryId, + Inquiry = new InquiryEntity { Id = dto.InquiryId }, - dto.IsFinished); + IsFinished = dto.IsFinished + }; } public static SuccessEntity FromModelToEntity(this Success suc) { - return new SuccessEntity(suc.UserId, new UserEntity + return new SuccessEntity + { + UserId = suc.UserId, + User = new UserEntity { Id = suc.UserId - }, - suc.InquiryId, - new InquiryEntity + }, + InquiryId = suc.InquiryId, + Inquiry = new InquiryEntity { Id = suc.InquiryId }, - suc.IsFinished); + IsFinished = suc.IsFinished + }; } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs index 251a00a..38fd018 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs @@ -1,57 +1,74 @@ using Entities; -namespace TestEF; +namespace TestEF.EntitiesTests; public class TestSuccessEntity { - private const int _userId = 42; - private const int _inquiryId = 7; - private const bool _isFinished = true; + private const int UserId = 42; + private const int InquiryId = 7; + private const bool IsFinished = true; [Fact] public void TestDefaultConstructor() { SuccessEntity success = new SuccessEntity(); - Assert.Equal(0,success.UserId); + Assert.Equal(0, success.UserId); Assert.Null(success.User); - Assert.Equal(0,success.InquiryId); + Assert.Equal(0, success.InquiryId); Assert.Null(success.Inquiry); Assert.False(success.IsFinished); } - + [Fact] public void TestConstructorWithIds() { - SuccessEntity success = new SuccessEntity(_userId, _inquiryId, _isFinished); - Assert.Equal(_userId,success.UserId); + SuccessEntity success = new SuccessEntity + { + UserId = UserId, + InquiryId = InquiryId, + IsFinished = IsFinished + }; + Assert.Equal(UserId, success.UserId); Assert.Null(success.User); - Assert.Equal(_inquiryId,success.InquiryId); + Assert.Equal(InquiryId, success.InquiryId); Assert.Null(success.Inquiry); Assert.True(success.IsFinished); } - + [Fact] public void TestConstructorWithNavigationProperties() { UserEntity user = new UserEntity(); InquiryEntity inquiry = new InquiryEntity(); - SuccessEntity success = new SuccessEntity(user, inquiry, _isFinished); - Assert.Equal(0,success.UserId); + SuccessEntity success = new SuccessEntity + { + User = user, + Inquiry = inquiry, + IsFinished = IsFinished + }; + Assert.Equal(0, success.UserId); Assert.NotNull(success.User); - Assert.Equal(0,success.InquiryId); + Assert.Equal(0, success.InquiryId); Assert.NotNull(success.Inquiry); Assert.True(success.IsFinished); } - + [Fact] public void TestConstructorWithAllAttributes() { UserEntity user = new UserEntity(); InquiryEntity inquiry = new InquiryEntity(); - SuccessEntity success = new SuccessEntity(_userId, user, _inquiryId, inquiry, _isFinished); - Assert.Equal(_userId,success.UserId); + SuccessEntity success = new SuccessEntity + { + UserId = UserId, + User = user, + InquiryId = InquiryId, + Inquiry = inquiry, + IsFinished = IsFinished + }; + Assert.Equal(UserId, success.UserId); Assert.NotNull(success.User); - Assert.Equal(_inquiryId,success.InquiryId); + Assert.Equal(InquiryId, success.InquiryId); Assert.NotNull(success.Inquiry); Assert.True(success.IsFinished); }