Merge pull request #546 from bcgov/yj

chore: biz info

Author: ychung-mot

server/StrDss.Data/Mappings/EntityToModelProfile.cs

@@ -47,6 +47,7 @@ public EntityToModelProfile()
             CreateMap<DssBusinessLicenceStatusType, LicenseStatus>();
 
             CreateMap<DssBusinessLicence, BizLicenseDto>()
+                .ForMember(o => o.LicenseStatus, opt => opt.MapFrom(i => i.LicenceStatusTypeNavigation))
                 .ForMember(o => o.UpdDtm, opt => opt.MapFrom(i => DateUtils.ConvertUtcToPacificTime(i.UpdDtm)));
         }
     }

server/StrDss.Data/Repositories/RentalListingRepository.cs

@@ -218,7 +218,10 @@ var extraSort
 
             listing.AddressChangeHistory = await GetAddressChangeHistoryAsync(rentalListingId);
 
-            listing.BizLicenseDto = _mapper.Map<BizLicenseDto>(await _dbContext.DssBusinessLicences.AsNoTracking().FirstOrDefaultAsync(x => x.BusinessLicenceId == listing.BusinessLicenceId));
+            listing.BizLicenseInfo = _mapper.Map<BizLicenseDto>(
+                await _dbContext.DssBusinessLicences.AsNoTracking().Include(x => x.LicenceStatusTypeNavigation)
+                    .FirstOrDefaultAsync(x => x.BusinessLicenceId == listing.BusinessLicenceId)
+            );
 
             return listing;
         }

server/StrDss.Model/RentalReportDtos/RentalListingViewDto.cs

@@ -83,7 +83,7 @@ public class RentalListingViewDto
         public DateTime? LastActionDtm { get; set; }
         public bool HasAtLeastOneValidHostEmail { get; set; }
         public List<HostInfo> HostsInfo { get; set; } = new List<HostInfo>();
-        public BizLicenseDto? BizLicenseDto { get; set; }
+        public BizLicenseDto? BizLicenseInfo { get; set; }
         public virtual ICollection<RentalListingContactDto> Hosts { get; set; } = new List<RentalListingContactDto>();
         public virtual ICollection<ListingHistoryDto> ListingHistory { get; set; } = new List<ListingHistoryDto>();
         public virtual ICollection<ActionHistoryDto> ActionHistory { get; set; } = new List<ActionHistoryDto>();