Merge pull request #889 from bcgov/feature/registration-validation

Fixes

Author: saikrishnametpalli-nttdata

database/ddl/STR_DSS_Incremental_DB_DDL_Sprint_21.sql

@@ -29,7 +29,7 @@ COMMENT ON COLUMN dss_upload_delivery.registration_lines_success IS 'The number
 COMMENT ON COLUMN dss_upload_delivery.upload_user_guid IS 'The globally unique identifier (assigned by the identity provider) for the user who uploaded the file';
 
 -- Create new columns in the upload line for holding registration validation status and text
-ALTER TABLE dss_upload_line ADD is_registration_failure boolean;
+ALTER TABLE dss_upload_line ADD is_registration_failure boolean DEFAULT false;
 ALTER TABLE dss_upload_line ADD registration_text varchar(32000);
 
 COMMENT ON COLUMN dss_upload_line.is_registration_failure IS 'Indicates that there has been a problem validating the reg no, or determining if the property is straa exempt';
@@ -198,6 +198,10 @@ SET registration_status = dud.upload_status,
     registration_lines_failure = dud.upload_lines_error,
     registration_lines_success = dud.upload_lines_success;
 
+update dss_upload_line dul
+ set is_registration_failure = false
+ where is_registration_failure is NULL;
+
 -- Now that we've populated the columns, we can set the not null constraint on status and total lines
 ALTER TABLE dss_upload_delivery ALTER COLUMN upload_status SET NOT NULL;
 ALTER TABLE dss_upload_delivery ALTER COLUMN upload_lines_total SET NOT NULL;

server/StrDss.Data/Entities/DssDbContext.cs

@@ -1332,7 +1332,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasColumnName("registration_lines_success");
             entity.Property(e => e.RegistrationLinesError)
                 .HasComment("The number of lines in the uploaded file that failed to validate the registration number")
-                .HasColumnName("registration_lines_error");
+                .HasColumnName("registration_lines_failure");
 
             entity.Property(e => e.UploadUserGuid)
                 .HasComment("The globally unique identifier (assigned by the identity provider) for the user who uploaded the file")

server/StrDss.Service/BizLicenceService.cs

@@ -162,6 +162,7 @@ private void SaveUploadLine(DssUploadLine uploadLine, Dictionary<string, List<st
         {
             uploadLine.IsValidationFailure = isValidationFailure;
             uploadLine.ErrorTxt = errors.ParseErrorWithUnderScoredKeyName();
+            uploadLine.IsRegistrationFailure = false;
 
             uploadLine.IsSystemFailure = systemError.IsNotEmpty();
             if (uploadLine.IsSystemFailure)

server/StrDss.Service/EmailTemplates/RegistrationValidationComplete.cs

@@ -10,23 +10,21 @@ public RegistrationValidationComplete(IEmailMessageService emailService) : base(
             From = Environment.GetEnvironmentVariable("ADMIN_EMAIL") ?? From;
         }
         public string UserName { get; set; } = "";
-        public long NumErrors { get; set; }
         public string Link { get; set; } = "";
         public override string GetContent()
         {
-            Subject = "B.C. STR Data Portal: Registration Validation";
+            Subject = "B.C. STR Data Portal: Validation report ready ";
 
             return
 $@"Dear {UserName},<br/><br/>
-Thank you for uploading a monthly registration validation report to British Columbia’s Short-term Rental Data Portal. Your upload has been processed and {NumErrors} error(s) have been found in your uploaded file.<br/><br/>
-Here’s how to fix errors: <br/><br/>
-<ol>
-<li>Download the file containing the error rows <a href='{Link}'>here</a>.</li>
-<li>Fix the highlighted errors in the columns.</li>
-<li>Upload the corrected file to the STR Data Portal like you would normally upload your monthly report.</li>
-</ol>
+Thank you for submitting your listings to British Columbia’s Short-term Rental Data Portal to validate that all listings include a valid host registration, as required under s. 17(1)(b)(ii) of the <i>Short-term Rental Accommodations Act</i>.<br/> 
 <br/>
-Please contact DSSadmin@gov.bc.ca if you encounter any problems.<br/>
+Your upload has been processed, and the validation report is now available for download. The validation results are listed in the first column of the report. For any listings that failed validation, corresponding error messages are provided.<br/> 
+<br/>
+<b>Next Steps</b><br/>
+Platforms are required to take specific actions when a registration is determined to be invalid. See the <a href={Link}>Guide to STR Registration validation for Minor Platforms</a> for more details.<br/>
+<br/>
+Please contact <a href=emailto:{From}>DSSadmin@gov.bc.ca</a> for technical support if needed.<br/>
 ";
         }
     }

server/StrDss.Service/RegistrationService.cs

@@ -134,8 +134,7 @@ public async Task ProcessRegistrationDataUploadAsync(DssUploadDelivery upload)
             var template = new RegistrationValidationComplete(_emailService)
             {
                 UserName = $"{user!.GivenNm}",
-                NumErrors = errorCount,
-                Link = GetHostUrl() + "/registration-validation-history",
+                Link = "https://www2.gov.bc.ca/assets/gov/housing-and-tenancy/tools-for-government/short-term-rentals/quickstartguide_validation_for_minor_platforms_final.pdf",
                 To = new string[] { user!.EmailAddressDsc! },
                 Info = $"{EmailMessageTypes.ListingUploadError} for {user.FamilyNm}, {user.GivenNm}",
                 From = adminEmail

server/StrDss.Service/RentalListingReportService.cs

@@ -303,12 +303,8 @@ public async Task ProcessRentalReportUploadAsync(DssUploadDelivery upload)
         private void SaveUploadLine(DssUploadLine uploadLine, Dictionary<string, List<string>> errors, bool isValidationFailure, string systemError,
             bool doValidateRegistration, bool isRegistrationFailure, string registrationTxt)
         {
-            if (doValidateRegistration)
-            {
-                uploadLine.IsRegistrationFailure = isRegistrationFailure;
-                uploadLine.RegistrationTxt = registrationTxt;
-            }
-
+            uploadLine.IsRegistrationFailure = isRegistrationFailure;
+            uploadLine.RegistrationTxt = registrationTxt;
             uploadLine.IsValidationFailure = isValidationFailure;
             uploadLine.ErrorTxt = errors.ParseErrorWithUnderScoredKeyName();
 

server/StrDss.Service/TakedownConfirmationService.cs

@@ -139,6 +139,7 @@ public async Task ProcessTakedownConfirmationUploadAsync(DssUploadDelivery uploa
             }
 
             line.IsProcessed = true;
+            line.IsRegistrationFailure = false;
 
             _unitOfWork.Commit();