Merge pull request #903 from bcgov/fix/DSS-1146

DSS-1146

Author: KFloodBCGov

database/ddl/STR_DSS_Incremental_DB_DDL_Sprint_21.sql

@@ -7,15 +7,17 @@ COMMENT ON COLUMN dss_physical_address.reg_rental_unit_no IS 'The rental propert
 COMMENT ON COLUMN dss_physical_address.reg_rental_street_no IS 'The rental property street number used to validate the bc registry number ';
 COMMENT ON COLUMN dss_physical_address.reg_rental_postal_code IS 'The rental property postal code number used to validate the bc registry number ';
 
+
+
 -- Create new columns for holding upload status information for delivery files
 ALTER TABLE dss_upload_delivery ADD upload_status varchar(20);
-ALTER TABLE dss_upload_delivery ADD upload_lines_total smallint;
-ALTER TABLE dss_upload_delivery ADD upload_lines_success smallint;
-ALTER TABLE dss_upload_delivery ADD upload_lines_error smallint;
-ALTER TABLE dss_upload_delivery ADD upload_lines_processed smallint;
+ALTER TABLE dss_upload_delivery ADD upload_lines_total int;
+ALTER TABLE dss_upload_delivery ADD upload_lines_success int;
+ALTER TABLE dss_upload_delivery ADD upload_lines_error int;
+ALTER TABLE dss_upload_delivery ADD upload_lines_processed int;
 ALTER TABLE dss_upload_delivery ADD registration_status varchar(20);
-ALTER TABLE dss_upload_delivery ADD registration_lines_failure smallint;
-ALTER TABLE dss_upload_delivery ADD registration_lines_success smallint;
+ALTER TABLE dss_upload_delivery ADD registration_lines_failure int;
+ALTER TABLE dss_upload_delivery ADD registration_lines_success int;
 ALTER TABLE dss_upload_delivery ADD upload_user_guid uuid;
 ALTER TABLE dss_upload_delivery ADD upload_date timestamptz;
 

database/ddl/STR_DSS_Physical_DB_DDL_Sprint_21.sql

@@ -186,13 +186,13 @@ CREATE  TABLE dss_upload_delivery (
 	source_header_txt    varchar(32000)    ,
 	providing_organization_id bigint  NOT NULL  ,
     upload_status varchar(20) NOT NULL,
-    upload_lines_total smallint NOT NULL,
-    upload_lines_success smallint,
-    upload_lines_error smallint,
-    upload_lines_processed smallint,
+    upload_lines_total int NOT NULL,
+    upload_lines_success int,
+    upload_lines_error int,
+    upload_lines_processed int,
 	registration_status varchar(20),
-	registration_lines_failure smallint,
-	registration_lines_success smallint,
+	registration_lines_failure int,
+	registration_lines_success int,
 	upload_user_guid uuid,	
 	upd_dtm              timestamptz  NOT NULL  ,
 	upd_user_guid        uuid    ,

server/StrDss.Common/Constants.cs

@@ -646,8 +646,8 @@ public static class RegistrationValidationText
     {
         public const string Success = "Success";
         public const string DataInvalid = "To validate the registration, please provide the registration number or the rental address associated with this listing.";
-        public const string STRAAExempt = "FN reserve land. This address is exempt from the STRAA.";
-        public const string NotSTRAAExempt = "Please verify if this STR offer is not required to be registered.";
+        public const string STRAAExempt = "Registration not required.";
+        public const string NotSTRAAExempt = "Registration required for this address unless they qualify for exemption.";
         public const string AddressNotFound = "Address not found.";
         public const string JurisdictionNotFound = "Jurisdiction not found.";
         public const string ExemptionStatusNotFound = "Exemption status not found.";

server/StrDss.Service/UploadDeliveryService.cs

@@ -589,7 +589,7 @@ public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId,
             var contents = new StringBuilder();
 
             csv.Read();
-            var header = "code,validation_result," + csv.Parser.RawRecord.TrimEndNewLine();
+            var header = "validation_result,code,details" + csv.Parser.RawRecord.TrimEndNewLine();
 
             contents.AppendLine(header);
 
@@ -600,19 +600,32 @@ public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId,
 
                 string? code = null;
                 string? message = null;
+                string result = "Fail";
 
                 if (text.Contains(":"))
                 {
                     var parts = text.Split(':', 2);
                     code = parts[0].Trim();
                     message = parts.Length > 1 ? parts[1].Trim() : null;
+
+                    // Check for API Failure?
+                    if (string.Compare(code, "500") == 0)
+                    {
+                        result = "API Failure";
+                        message = "";
+                    }
+                    
+                    // We are only a pass if the message is "Active"
+                    if (string.Compare(message, "Active", StringComparison.OrdinalIgnoreCase) == 0) result = "Pass";
                 }
                 else
                 {
+                    // This is the case where there was no API call, but we checked to see if they were STRAA exempt
                     message = text;
+                    result = string.Compare(message, RegistrationValidationText.STRAAExempt, StringComparison.OrdinalIgnoreCase) == 0 ? "Pass" : "Fail";
                 }
 
-                contents.AppendLine($"\"{code}\",\"{message}\"," + line.LineText.TrimEndNewLine());
+                contents.AppendLine($"\"{result}\",\"{code}\",\"{message}\"," + line.LineText.TrimEndNewLine());
             }
 
             return Encoding.UTF8.GetBytes(contents.ToString());