Merge pull request #22 from IliyanIlievPH/master

Make fields in PartnerContact optional
OpenMAVN · Jun 29, 2020 · 1280bd4 · 1280bd4
2 parents c106eda + de9f5fd
commit 1280bd4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/client/MAVN.Service.CustomerProfile.Client/Models/Requests/PartnerContactRequestModel.cs b/client/MAVN.Service.CustomerProfile.Client/Models/Requests/PartnerContactRequestModel.cs
@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using MAVN.Service.CustomerProfile.Client.Models.Constants;
 
@@ -19,29 +19,25 @@ public class PartnerContactRequestModel
         /// <summary>
         /// The Email of the Contact person
         /// </summary>
-        [Required, DataType(DataType.EmailAddress)]
-        [RegularExpression(ValidationConstants.EmailValidationPattern)]
+        [DataType(DataType.EmailAddress)]
         [MaxLength(100)]
         public string Email { get; set; }
 
         /// <summary>
         /// Contact First name
         /// </summary>
-        [Required]
         [MaxLength(100)]
         public string FirstName { get; set; }
 
         /// <summary>
         /// Contact Last name
         /// </summary>
-        [Required]
         [MaxLength(100)]
         public string LastName { get; set; }
 
         /// <summary>
         /// Contact Phone number
         /// </summary>
-        [Required]
         [MaxLength(50)]
         public string PhoneNumber { get; set; }
     }

diff --git a/...t/MAVN.Service.CustomerProfile.Client/Models/Requests/PartnerContactUpdateRequestModel.cs b/...t/MAVN.Service.CustomerProfile.Client/Models/Requests/PartnerContactUpdateRequestModel.cs
@@ -1,6 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
-using MAVN.Service.CustomerProfile.Client.Models.Constants;
 
 namespace MAVN.Service.CustomerProfile.Client.Models.Requests
 {
@@ -18,30 +17,25 @@ public class PartnerContactUpdateRequestModel
 
         /// <summary>
         /// The contact first name.
-        /// </summary>
-        [Required]
         [MaxLength(100)]
         public string FirstName { get; set; }
 
         /// <summary>
         /// The contact last name.
         /// </summary>
-        [Required]
         [MaxLength(100)]
         public string LastName { get; set; }
 
         /// <summary>
         /// The contact phone number.
         /// </summary>
-        [Required]
         [MaxLength(50)]
         public string PhoneNumber { get; set; }
 
         /// <summary>
         /// The contact phone number.
         /// </summary>
-        [Required, DataType(DataType.EmailAddress)]
-        [RegularExpression(ValidationConstants.EmailValidationPattern)]
+        [DataType(DataType.EmailAddress)]
         [MaxLength(100)]
         public string Email { get; set; }
     }

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/PartnerContactBaseEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/PartnerContactBaseEntity.cs
@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using MAVN.Common.Encryption;
 
@@ -12,7 +12,6 @@ public abstract class PartnerContactBaseEntity
         public string LocationId { get; set; }
 
         [Column("email")]
-        [Required]
         [EncryptedProperty]
         public string Email { get; set; }