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

DSS-1129 Registration Validation - Through Monthly Upload

Author: KFloodBCGov

database/ddl/STR_DSS_Incremental_DB_DDL_Sprint_21.sql

@@ -17,6 +17,7 @@ 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 upload_user_guid uuid;
+ALTER TABLE dss_upload_delivery ADD upload_date timestamptz;
 
 COMMENT ON COLUMN dss_upload_delivery.upload_status IS 'The current processing status of the uploaded file: Pending, Processed, or Failed';
 COMMENT ON COLUMN dss_upload_delivery.upload_lines_total IS 'The total number of lines in the uploaded file';
@@ -27,6 +28,7 @@ COMMENT ON COLUMN dss_upload_delivery.registration_status IS 'The current proces
 COMMENT ON COLUMN dss_upload_delivery.registration_lines_failure IS 'The number of lines in the uploaded file that failed to validate the registration number';
 COMMENT ON COLUMN dss_upload_delivery.registration_lines_success IS 'The number of lines in the uploaded file that successfully validated the registration 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';
+COMMENT ON COLUMN dss_upload_delivery.upload_date IS 'Date and time the file was uploaded';
 
 -- Create new columns in the upload line for holding registration validation status and text
 ALTER TABLE dss_upload_line ADD is_registration_failure boolean DEFAULT false;
@@ -41,8 +43,8 @@ ALTER TABLE dss_upload_delivery DISABLE TRIGGER ALL;
 
 -- Populate the upload_user_guid column with the current value of upd_user_guid
 UPDATE dss_upload_delivery
-SET upload_user_guid = upd_user_guid
-WHERE upload_user_guid IS NULL;
+SET upload_user_guid = upd_user_guid,
+    upload_date = upd_dtm;
 
 -- Re-enable the trigger
 ALTER TABLE dss_upload_delivery ENABLE TRIGGER ALL; 
@@ -194,7 +196,7 @@ FROM (
 WHERE dud.upload_delivery_id = subquery.upload_delivery_id;
 
 UPDATE dss_upload_delivery dud
-SET registration_status = dud.upload_status,
+SET registration_status = 'Not Applicable',
     registration_lines_failure = dud.upload_lines_error,
     registration_lines_success = dud.upload_lines_success;
 
@@ -218,6 +220,7 @@ CREATE OR REPLACE VIEW public.dss_rental_upload_history_view
 AS SELECT dud.upload_delivery_id,
     dud.upload_delivery_type,
     dud.report_period_ym,
+    dud.upload_date,
     dud.providing_organization_id,
     dud.upload_status AS status,
     dud.registration_status AS registration_status,

frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.html

@@ -114,7 +114,7 @@ <h2>Platform Upload History</h2>
                         <i class="pi pi-download" *ngIf="row.errors>0"></i></button>
                     <ng-template #zero>{{0}}</ng-template>
                 </td>
-                <td>{{ row.updDtm |date:'yyyy-MM-dd' }}</td>
+                <td>{{ row.uploadDate |date:'yyyy-MM-dd' }}</td>
                 <td>{{ row.uploadedBy }}</td>
             </tr>
         </ng-template>

frontend/src/app/common/models/listing-upload-history-record.ts

@@ -14,4 +14,5 @@ export interface ListingUploadHistoryRecord {
     updDtm: string;
     uploadDeliveryId: number;
     uploadDeliveryType?: string;
+    uploadDate: string;
 }

frontend/src/app/features/components/registration-validation-history/registration-validation-history.component.html

@@ -22,6 +22,16 @@ <h2>Registration Validation History</h2>
                         *ngIf="this.sort && this.sort.prop === 'organizationNm' && this.sort.dir === 'asc'"></i>
                 </th>
 
+                <th class="sortable-header" id="uploadDeliveryType_header"
+                    [class.sorted]="this.sort && this.sort.prop === 'uploadDeliveryType'"
+                    (click)="onSort('uploadDeliveryType')">Report
+                    Type
+                    <i class="pi pi-angle-down"
+                        *ngIf="this.sort && this.sort.prop === 'uploadDeliveryType' && this.sort.dir === 'desc'"></i>
+                    <i class="pi pi-angle-up"
+                        *ngIf="this.sort && this.sort.prop === 'uploadDeliveryType' && this.sort.dir === 'asc'"></i>
+                </th>
+
                 <th class="sortable-header" id="status_header" [class.sorted]="this.sort && this.sort.prop === 'status'"
                     (click)="onSort('status')">Status
                     <i class="pi pi-angle-down"
@@ -78,21 +88,22 @@ <h2>Registration Validation History</h2>
         <ng-template pTemplate="body" let-row>
             <tr>
                 <td>{{ row.organizationNm }}</td>
+                <td>{{ row.uploadDeliveryType }}</td>
                 <td>
-                    <span *ngIf="row.status==='Processed'; then processed; else pending"></span>
-                    <ng-template #processed> <span class="state-processed">{{row.status}}</span></ng-template>
-                    <ng-template #pending><span class="state-pending">{{row.status}}</span></ng-template>
+                    <span *ngIf="row.registrationStatus==='Processed'; then processed; else pending"></span>
+                    <ng-template #processed> <span class="state-processed">{{row.registrationStatus}}</span></ng-template>
+                    <ng-template #pending><span class="state-pending">{{row.registrationStatus}}</span></ng-template>
                 </td>
                 <td>
                     {{row.total}}
                 </td>
                 <td>
-                    {{row.success}}
+                    {{row.registrationSuccess}}
                 </td>
                 <td>
-                    {{row.errors}}
+                    {{row.registrationErrors}}
                 </td>
-                <td>{{ row.updDtm |date:'yyyy-MM-dd' }}</td>
+                <td>{{ row.uploadDate |date:'yyyy-MM-dd' }}</td>
                 <td>{{ row.givenNm }} {{ row.familyNm }}</td>
                 <td>
                     <button [id]="'downloadReport_'+row.uploadDeliveryId" pButton

frontend/src/app/features/components/registration-validation-history/registration-validation-history.component.ts

@@ -108,7 +108,9 @@ export class RegistrationValidationHistoryComponent {
       this.selectedPlatformId).subscribe({
       next: (records) => {
         this.currentPage = records.pageInfo;
-        this.registrationValidationHistory = records.sourceList;
+        this.registrationValidationHistory = records.sourceList.filter(
+          (item: any) => item.registrationStatus !== 'Not Applicable'
+        );
       },
       complete: () => {
         this.loaderService.loadingEnd();

frontend/src/app/features/components/upload-business-license/upload-business-license.component.html

@@ -125,7 +125,7 @@
                         </button>
                         <ng-template #zero>{{ 0 }}</ng-template>
                     </td>
-                    <td>{{ uploadHistory.updDtm | date : 'yyyy-MM-dd' }}</td>
+                    <td>{{ uploadHistory.uploadDate | date : 'yyyy-MM-dd' }}</td>
                     <td>{{ uploadHistory.givenNm }} {{ uploadHistory.familyNm }}</td>
                 </tr>
             </ng-template>

server/StrDss.Api/Controllers/RegistrationController.cs

@@ -65,7 +65,7 @@ public async Task<ActionResult> UploadValidateRegistration([FromForm] ValidateRe
         public async Task<ActionResult> GetRegistrationValidationHistory(long? platformId, int pageSize, int pageNumber, string orderBy = "UpdDtm", string direction = "desc")
         {
             var history = await _uploadService.GetUploadHistory(platformId, pageSize, pageNumber, orderBy, direction,
-                [UploadDeliveryTypes.RegistrationData]);
+                [UploadDeliveryTypes.RegistrationData, UploadDeliveryTypes.ListingData]);
 
             return Ok(history);
         }

server/StrDss.Data/Entities/DssDbContext.cs

@@ -1266,6 +1266,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.UploadDeliveryType)
                 .HasMaxLength(25)
                 .HasColumnName("upload_delivery_type");
+            entity.Property(e => e.UploadDate).HasColumnName("upload_date");
         });
 
         modelBuilder.Entity<DssUploadDelivery>(entity =>
@@ -1337,6 +1338,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.UploadUserGuid)
                 .HasComment("The globally unique identifier (assigned by the identity provider) for the user who uploaded the file")
                 .HasColumnName("upload_user_guid");
+            entity.Property(e => e.UploadDate)
+                .HasComment("Date and time the file was uploaded")
+                .HasColumnName("upload_date");
 
             entity.HasOne(d => d.ProvidingOrganization).WithMany(p => p.DssUploadDeliveries)
                 .HasForeignKey(d => d.ProvidingOrganizationId)

server/StrDss.Data/Entities/DssRentalUploadHistoryView.cs

@@ -36,4 +36,6 @@ public partial class DssRentalUploadHistoryView
     public string? Status { get; set; }
 
     public string? RegistrationStatus { get; set; }
+
+    public DateTime? UploadDate { get; set; }
 }

server/StrDss.Data/Entities/DssUploadDelivery.cs

@@ -99,6 +99,11 @@ public partial class DssUploadDelivery
     /// </summary>
     public string? SourceHeaderTxt { get; set; }
 
+    /// <summary>
+    /// Date and time the file was uploaded
+    /// </summary>
+    public DateTime UploadDate { get; set; }
+
     public virtual ICollection<DssUploadLine> DssUploadLines { get; set; } = new List<DssUploadLine>();
 
     public virtual DssOrganization ProvidingOrganization { get; set; } = null!;