added null check for member

Author: esdd1995

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

@@ -43,19 +43,32 @@ public Mappings()
             .ForMember(d => d.spd_middlename1, opt => opt.MapFrom(s => StringHelper.ToTitleCase(s.MiddleName1)))
             .ForMember(d => d.spd_middlename2, opt => opt.MapFrom(s => StringHelper.ToTitleCase(s.MiddleName2)))
             .ForMember(d => d.telephone1, opt => opt.MapFrom(s => s.PhoneNumber))
-            .ForMember(d => d.address1_line1, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.AddressLine1))
-            .ForMember(d => d.address1_line2, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.AddressLine2))
-            .ForMember(d => d.address1_city, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.City))
-            .ForMember(d => d.address1_country, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.Country))
-            .ForMember(d => d.address1_stateorprovince, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.Province))
-            .ForMember(d => d.address1_postalcode, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.PostalCode))
-            //.ForMember(d => d.address1_addresstypecode, opt => opt.MapFrom(s => AddressTypeOptionSet.Mailing))
-            .ForMember(d => d.address2_line1, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.AddressLine1))
-            .ForMember(d => d.address2_line2, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.AddressLine2))
-            .ForMember(d => d.address2_city, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.City))
-            .ForMember(d => d.address2_country, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.Country))
-            .ForMember(d => d.address2_stateorprovince, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.Province))
-            .ForMember(d => d.address2_postalcode, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.PostalCode))
+            .ForMember(d => d.address1_line1, opt => opt.MapFrom(s => s.MailingAddress != null ? s.MailingAddress.AddressLine1 ?? string.Empty : string.Empty))
+            .ForMember(d => d.address1_line2, opt => opt.MapFrom(s => s.MailingAddress != null ? s.MailingAddress.AddressLine2 ?? string.Empty : string.Empty))
+            .ForMember(d => d.address1_city, opt => opt.MapFrom(s => s.MailingAddress != null ? s.MailingAddress.City ?? string.Empty : string.Empty))
+            .ForMember(d => d.address1_country, opt => opt.MapFrom(s => s.MailingAddress != null ? s.MailingAddress.Country ?? string.Empty : string.Empty))
+            .ForMember(d => d.address1_stateorprovince, opt => opt.MapFrom(s => s.MailingAddress != null ? s.MailingAddress.Province ?? string.Empty : string.Empty))
+            .ForMember(d => d.address1_postalcode, opt => opt.MapFrom(s => s.MailingAddress != null ? s.MailingAddress.PostalCode ?? string.Empty : string.Empty))
+            .ForMember(d => d.address2_line1, opt => opt.MapFrom(s => s.ResidentialAddress != null ? s.ResidentialAddress.AddressLine1 ?? string.Empty : string.Empty))
+            .ForMember(d => d.address2_line2, opt => opt.MapFrom(s => s.ResidentialAddress != null ? s.ResidentialAddress.AddressLine2 ?? string.Empty : string.Empty))
+            .ForMember(d => d.address2_city, opt => opt.MapFrom(s => s.ResidentialAddress != null ? s.ResidentialAddress.City ?? string.Empty : string.Empty))
+            .ForMember(d => d.address2_country, opt => opt.MapFrom(s => s.ResidentialAddress != null ? s.ResidentialAddress.Country ?? string.Empty : string.Empty))
+            .ForMember(d => d.address2_stateorprovince, opt => opt.MapFrom(s => s.ResidentialAddress != null ? s.ResidentialAddress.Province ?? string.Empty : string.Empty))
+            .ForMember(d => d.address2_postalcode, opt => opt.MapFrom(s => s.ResidentialAddress != null ? s.ResidentialAddress.PostalCode ?? string.Empty : string.Empty))
+
+            //.ForMember(d => d.address1_line1, opt => opt.MapFrom(s => s.MailingAddress?.AddressLine1 ?? string.Empty))
+            //.ForMember(d => d.address1_line2, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.AddressLine2))
+            //.ForMember(d => d.address1_city, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.City))
+            //.ForMember(d => d.address1_country, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.Country))
+            //.ForMember(d => d.address1_stateorprovince, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.Province))
+            //.ForMember(d => d.address1_postalcode, opt => opt.MapFrom(s => s.MailingAddress == null ? string.Empty : s.MailingAddress.PostalCode))
+            ////.ForMember(d => d.address1_addresstypecode, opt => opt.MapFrom(s => AddressTypeOptionSet.Mailing))
+            //.ForMember(d => d.address2_line1, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.AddressLine1))
+            //.ForMember(d => d.address2_line2, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.AddressLine2))
+            //.ForMember(d => d.address2_city, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.City))
+            //.ForMember(d => d.address2_country, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.Country))
+            //.ForMember(d => d.address2_stateorprovince, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.Province))
+            //.ForMember(d => d.address2_postalcode, opt => opt.MapFrom(s => s.ResidentialAddress == null ? string.Empty : s.ResidentialAddress.PostalCode))
             .ForMember(d => d.spd_selfdisclosure, opt => opt.MapFrom(s => SharedMappingFuncs.GetYesNo(s.HasCriminalHistory)))
             .ForMember(d => d.spd_selfdisclosuredetails, opt => opt.MapFrom(s => s.CriminalChargeDescription))
             .ForMember(d => d.spd_peaceofficer, opt => opt.MapFrom(s => SharedMappingFuncs.GetYesNo(s.IsPoliceOrPeaceOfficer)))