From d3682416b8de55ec736d0d332fd844f87661d549 Mon Sep 17 00:00:00 2001 From: mborzyszkowski Date: Tue, 4 Aug 2020 19:58:25 +0200 Subject: [PATCH] resolve nip and phoneNumber problem --- src/InternshipSystem.Core/Entity/Company.cs | 4 ++-- .../ValueObject/Mentor.cs | 2 +- src/InternshipSystem.Core/ValueObject/Nip.cs | 22 ------------------- .../ValueObject/PhoneNumber.cs | 22 ------------------- .../InternshipDbContext.cs | 6 +---- 5 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 src/InternshipSystem.Core/ValueObject/Nip.cs delete mode 100644 src/InternshipSystem.Core/ValueObject/PhoneNumber.cs diff --git a/src/InternshipSystem.Core/Entity/Company.cs b/src/InternshipSystem.Core/Entity/Company.cs index 74dab1b..6b98e0f 100644 --- a/src/InternshipSystem.Core/Entity/Company.cs +++ b/src/InternshipSystem.Core/Entity/Company.cs @@ -6,13 +6,13 @@ namespace InternshipSystem.Core public class Company { public long Id { get; set; } - public Nip Nip { get; set; } + public string Nip { get; set; } public string Name { get; set; } public RangeOfActivity Range { get; set; } public List Branches { get; set; } public Uri SiteAddress { get; set; } - public Company CreateCompany(Nip nip, RangeOfActivity range, string name) + public Company CreateCompany(string nip, RangeOfActivity range, string name) { return new Company { diff --git a/src/InternshipSystem.Core/ValueObject/Mentor.cs b/src/InternshipSystem.Core/ValueObject/Mentor.cs index 4af5c24..d7be213 100644 --- a/src/InternshipSystem.Core/ValueObject/Mentor.cs +++ b/src/InternshipSystem.Core/ValueObject/Mentor.cs @@ -5,6 +5,6 @@ public string FirstName { get; set; } public string LastName { get; set; } public string Email { get; set; } - public PhoneNumber PhoneNumber { get; set; } + public string PhoneNumber { get; set; } } } \ No newline at end of file diff --git a/src/InternshipSystem.Core/ValueObject/Nip.cs b/src/InternshipSystem.Core/ValueObject/Nip.cs deleted file mode 100644 index 8d853a1..0000000 --- a/src/InternshipSystem.Core/ValueObject/Nip.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace InternshipSystem.Core -{ - public class Nip - { - private readonly string nip; - - public Nip() - { - } - - private Nip(string maybeNip) - { - nip = maybeNip; - } - - public static implicit operator string(Nip nip) => - nip.nip; - - public static implicit operator Nip(string maybeNip) => - new Nip(maybeNip); - } -} \ No newline at end of file diff --git a/src/InternshipSystem.Core/ValueObject/PhoneNumber.cs b/src/InternshipSystem.Core/ValueObject/PhoneNumber.cs deleted file mode 100644 index 4385cbf..0000000 --- a/src/InternshipSystem.Core/ValueObject/PhoneNumber.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace InternshipSystem.Core -{ - public class PhoneNumber - { - private readonly string phoneNumber; - - public PhoneNumber() - { - } - - private PhoneNumber(string maybePhoneNumber) - { - phoneNumber = maybePhoneNumber; - } - - public static implicit operator string(PhoneNumber phoneNumber) => - phoneNumber.phoneNumber; - - public static implicit operator PhoneNumber(string maybephoneNumber) => - new PhoneNumber(maybephoneNumber); - } -} \ No newline at end of file diff --git a/src/InternshipSystem.Repository/InternshipDbContext.cs b/src/InternshipSystem.Repository/InternshipDbContext.cs index ed398ba..83ed627 100644 --- a/src/InternshipSystem.Repository/InternshipDbContext.cs +++ b/src/InternshipSystem.Repository/InternshipDbContext.cs @@ -25,11 +25,7 @@ namespace InternshipSystem.Repository .OwnsOne(bo => bo.Address); modelBuilder.Entity() - .OwnsOne(ip => ip.Mentor) - .OwnsOne(m => m.PhoneNumber); - - modelBuilder.Entity() - .OwnsOne(c => c.Nip); + .OwnsOne(ip => ip.Mentor); modelBuilder.Entity(builder => {