[SPDBT-4212]Rename some fields and add document for new mdra

src/Spd.Manager.Licence/MDRARegistrationContract.cs

@@ -18,16 +18,14 @@ public record MDRARegistrationRequest
 {
     public ApplicationTypeCode ApplicationTypeCode { get; set; }
     public ApplicationOriginTypeCode ApplicationOriginTypeCode { get; set; } = ApplicationOriginTypeCode.WebForm;
-    public string BizOwnerLastName { get; set; }
-    public string BizOwnerFirstName { get; set; }
-    public string BizOwnerMiddleName { get; set; }
+    public string BizOwnerSurname { get; set; }
+    public string BizOwnerGivenNames { get; set; }
     public string? BizLegalName { get; set; }
     public string? BizTradeName { get; set; }
     public Address? BizMailingAddress { get; set; }
     public Address? BizAddress { get; set; }
-    public string BizManagerLastName { get; set; }
-    public string BizManagerFirstName { get; set; }
-    public string BizManagerMiddleName { get; set; }
+    public string BizManagerFullName { get; set; }
+    public string? BizManagerEmailAddress { get; set; }
     public string? BizPhoneNumber { get; set; }
     public string? BizEmailAddress { get; set; }
     public IEnumerable<BranchInfo>? Branches { get; set; }

src/Spd.Manager.Licence/MDRARegistrationManager.cs

@@ -55,7 +55,7 @@ private static void ValidateFilesForNewApp(MDRARegistrationNewCommand cmd)
 
         if (request.ApplicationTypeCode == ApplicationTypeCode.New) //both new and renew need biz licence Registry Document
         {
-            if (!fileInfos.Any(f => f.LicenceDocumentTypeCode == LicenceDocumentTypeCode.CorporateRegistryDocument))
+            if (!fileInfos.Any(f => f.LicenceDocumentTypeCode == LicenceDocumentTypeCode.BusinessLicenceDocuments))
             {
                 throw new ApiException(HttpStatusCode.BadRequest, "Must provide copies of business licence registration documents.");
             }

src/Spd.Manager.Licence/MDRARegistrationValidation.cs

@@ -6,10 +6,13 @@ public class MDRARegistrationValidator : AbstractValidator<MDRARegistrationReque
 {
     public MDRARegistrationValidator()
     {
-        RuleFor(x => x.BizOwnerLastName).NotEmpty().MaximumLength(40);
-        RuleFor(r => r.BizLegalName).MaximumLength(200);
+        RuleFor(x => x.BizOwnerSurname).NotEmpty().MaximumLength(40);
+        RuleFor(x => x.BizOwnerGivenNames).MaximumLength(100);
+        RuleFor(r => r.BizLegalName).MaximumLength(160);
+        RuleFor(r => r.BizTradeName).MaximumLength(160);
         RuleFor(r => r.BizEmailAddress).EmailAddress();
-        RuleFor(x => x.BizManagerLastName).NotEmpty().MaximumLength(40);
+        RuleFor(r => r.BizManagerEmailAddress).EmailAddress();
+        RuleFor(x => x.BizManagerFullName).NotEmpty().MaximumLength(150);
         RuleFor(r => r.BizAddress).SetValidator(new AddressValidator());
         RuleFor(r => r.BizMailingAddress).SetValidator(new AddressValidator());
         RuleFor(r => r.Branches)

src/Spd.Manager.Licence/Mappings.cs

@@ -795,7 +795,8 @@ private static List<BranchAddr> GetBranchAddr(IEnumerable<BranchInfo> branchInfo
         {LicenceDocumentTypeCode.VeterinarianConfirmationForSpayedNeuteredDog, DocumentTypeEnum.VeterinarianConfirmationForSpayedNeuteredDog },
         {LicenceDocumentTypeCode.DogTrainingCurriculumCertificateSupportingDocument, DocumentTypeEnum.DogTrainingCurriculumCertificateSupportingDocument },
         {LicenceDocumentTypeCode.GDSDPracticeHoursLog, DocumentTypeEnum.GDSDPracticeHoursLog},
-        {LicenceDocumentTypeCode.GDSDCertificate, DocumentTypeEnum.GDSDCertificate }
+        {LicenceDocumentTypeCode.GDSDCertificate, DocumentTypeEnum.GDSDCertificate },
+        {LicenceDocumentTypeCode.BusinessLicenceDocuments, DocumentTypeEnum.BusinessLicenceDocuments }
     }.ToImmutableDictionary();
 
     private static readonly ImmutableDictionary<LicenceDocumentTypeCode, DocumentTypeEnum> LicenceDocumentType2Dictionary = new Dictionary<LicenceDocumentTypeCode, DocumentTypeEnum>()

src/Spd.Manager.Licence/SharedContract.cs

@@ -74,7 +74,8 @@ public enum LicenceDocumentTypeCode
     VeterinarianConfirmationForSpayedNeuteredDog,
     DogTrainingCurriculumCertificateSupportingDocument,
     GDSDPracticeHoursLog,
-    GDSDCertificate
+    GDSDCertificate,
+    BusinessLicenceDocuments
 }
 
 public enum PoliceOfficerRoleCode

src/Spd.Resource.Repository/Document/Contract.cs

@@ -165,6 +165,7 @@ public enum DocumentTypeEnum
         VeterinarianConfirmationForSpayedNeuteredDog,
         DogTrainingCurriculumCertificateSupportingDocument,
         GDSDPracticeHoursLog,
-        GDSDCertificate
+        GDSDCertificate,
+        BusinessLicenceDocuments
     }
 }

src/Spd.Resource.Repository/MDRARegistration/Contract.cs

@@ -13,16 +13,14 @@ public record CreateMDRARegistrationCmd
 {
     public ApplicationTypeEnum ApplicationTypeCode { get; set; }
     public ApplicationOriginTypeEnum ApplicationOriginTypeCode { get; set; } = ApplicationOriginTypeEnum.WebForm;
-    public string BizOwnerLastName { get; set; }
-    public string? BizOwnerFirstName { get; set; }
-    public string? BizOwnerMiddleName { get; set; }
+    public string BizOwnerSurname { get; set; }
+    public string? BizOwnerGivenNames { get; set; }
     public string? BizLegalName { get; set; }
     public string? BizTradeName { get; set; }
     public Addr? BizMailingAddress { get; set; }
     public Addr? BizAddress { get; set; }
-    public string BizManagerLastName { get; set; }
-    public string? BizManagerFirstName { get; set; }
-    public string? BizManagerMiddleName { get; set; }
+    public string BizManagerFullName { get; set; }
+    public string BizManagerEmailAddress { get; set; }
     public string? BizPhoneNumber { get; set; }
     public string? BizEmailAddress { get; set; }
     public IEnumerable<BranchAddr>? Branches { get; set; }

src/Spd.Resource.Repository/MDRARegistration/Mappings.cs

@@ -10,8 +10,8 @@ public Mappings()
         _ = CreateMap<CreateMDRARegistrationCmd, spd_orgregistration>()
         .ForMember(d => d.spd_orgregistrationid, opt => opt.MapFrom(s => Guid.NewGuid()))
         .ForMember(d => d.spd_applicationtype, opt => opt.MapFrom(s => SharedMappingFuncs.GetLicenceApplicationTypeOptionSet(s.ApplicationTypeCode)))
-        .ForMember(d => d.spd_authorizedcontactgivenname, opt => opt.MapFrom(s => $"{s.BizOwnerFirstName.Trim()} {s.BizOwnerMiddleName.Trim()}"))
-        .ForMember(d => d.spd_authorizedcontactsurname, opt => opt.MapFrom(s => s.BizOwnerLastName))
+        .ForMember(d => d.spd_authorizedcontactgivenname, opt => opt.MapFrom(s => s.BizOwnerGivenNames == null ? null : s.BizOwnerGivenNames.Trim()))
+        .ForMember(d => d.spd_authorizedcontactsurname, opt => opt.MapFrom(s => s.BizOwnerSurname))
         .ForMember(d => d.spd_organizationlegalname, opt => opt.MapFrom(s => s.BizLegalName))
         .ForMember(d => d.spd_organizationname, opt => opt.MapFrom(s => s.BizTradeName))
         .ForMember(d => d.spd_email, opt => opt.MapFrom(s => s.BizEmailAddress))
@@ -25,8 +25,7 @@ public Mappings()
         .ForMember(d => d.spd_country, opt => opt.MapFrom(s => s.BizMailingAddress == null ? null : s.BizMailingAddress.Country))
         .ReverseMap()
         .ForMember(d => d.ApplicationTypeCode, opt => opt.MapFrom(s => SharedMappingFuncs.GetLicenceApplicationTypeEnum(s.spd_applicationtype)))
-        .ForMember(d => d.BizOwnerFirstName, opt => opt.MapFrom(s => s.spd_authorizedcontactgivenname)) //tbd
-        .ForMember(d => d.BizOwnerMiddleName, opt => opt.MapFrom(s => s.spd_authorizedcontactgivenname)) //tbd
+        .ForMember(d => d.BizOwnerGivenNames, opt => opt.MapFrom(s => s.spd_authorizedcontactgivenname))
         ;
 
         CreateMap<CreateMDRARegistrationCmd, List<spd_address>>()
@@ -41,9 +40,9 @@ public Mappings()
                 {
                     spd_addressid = Guid.NewGuid(),
                     spd_type = (int)AddressTypeOptionSet.MainOffice,
-                    spd_branchmanagername = $"{src.BizManagerFirstName} {src.BizManagerMiddleName} {src.BizManagerLastName}".Trim(),
+                    spd_branchmanagername = src.BizManagerFullName,
                     spd_branchphone = src.BizPhoneNumber,
-                    spd_branchemail = src.BizEmailAddress,
+                    spd_branchemail = src.BizManagerEmailAddress,
                     spd_address1 = src.BizAddress.AddressLine1,
                     spd_address2 = src.BizAddress.AddressLine2,
                     spd_city = src.BizAddress.City,

src/Spd.Utilities.Dynamics/DynamicsContextLookupHelpers.cs

@@ -103,6 +103,7 @@ public static string LookupRoleKeyById(this DynamicsContext context, Guid value)
             {"BodyArmourPurpose", Guid.Parse("e1bc7549-0cea-ed11-b840-005056830319")},
             {"BodyArmourRationale", Guid.Parse("e3bc7549-0cea-ed11-b840-005056830319")},
             {"BusinessInsurance", Guid.Parse("fdbc7549-0cea-ed11-b840-005056830319")},
+            {"BusinessLicenceDocuments", Guid.Parse("dc6e1e8c-98ff-ef11-b857-00505683fbf4")},
             {"BasicSecurityTrainingCertificate", Guid.Parse("218de034-d47d-ee11-b846-00505683fbf4")},
             {"BasicSecurityTrainingCourseEquivalent", Guid.Parse("aaf10b62-d47d-ee11-b846-00505683fbf4")},
             {"CanadianCitizenship", Guid.Parse("c5bc7549-0cea-ed11-b840-005056830319")},