OHID-420 Upload additional document to HA

Author: bergomi02

prime-angular-frontend/src/app/core/resources/health-authority-resource.service.ts

@@ -205,6 +205,30 @@ export class HealthAuthorityResource {
       );
   }
 
+  public addOrganizationAdditionalDocument(healthAuthorityId: number, documentGuid: string): Observable<BaseDocument> {
+    const params = this.apiResourceUtilsService.makeHttpParams({ documentGuid });
+    return this.apiResource.put<BaseDocument>(`health-authorities/${healthAuthorityId}/additional-agreement`, null, params)
+      .pipe(
+        map((response: ApiHttpResponse<BaseDocument>) => response.result),
+        catchError((error: any) => {
+          this.logger.error('[Core] HealthAuthorityResource::addOrganizationAdditionalDocument error has occurred: ', error);
+          throw error;
+        })
+      );
+  }
+
+  public deleteOrganizationAdditionalDocument(healthAuthorityId: number, documentGuid: string): Observable<BaseDocument> {
+    const params = this.apiResourceUtilsService.makeHttpParams({ documentGuid });
+    return this.apiResource.delete<NoContent>(`health-authorities/${healthAuthorityId}/additional-agreement`, null, params)
+      .pipe(
+        NoContentResponse,
+        catchError((error: any) => {
+          this.logger.error('[Core] HealthAuthorityResource::deleteOrganizationAdditionalDocument error has occurred: ', error);
+          throw error;
+        })
+      );
+  }
+
   public getOrganizationAgreementDocumentToken(healthAuthorityId: number): Observable<string> {
     return this.apiResource.get<string>(`health-authorities/${healthAuthorityId}/organization-agreement/token`)
       .pipe(

prime-angular-frontend/src/app/modules/adjudication/pages/health-authorities/health-auth-org-info-page/health-auth-org-info-page.component.html

@@ -208,6 +208,52 @@
           </div>
 
         </ng-container>
+
+        <button *ngIf="!hasClickedAddDocument"
+                mat-button
+                type="button"
+                color="primary"
+                (click)="addOrgAgreement()">
+          <mat-icon>add</mat-icon>
+          Add organization document
+        </button>
+
+        <ng-container *ngIf="hasClickedAddDocument">
+          <div class="row">
+            <div class="col">
+              <app-document-upload #documentUpload
+                                   componentName="organization-agreement"
+                                   labelMessage="Drag and drop your organization agreement or browse"
+                                   [multiple]="false"
+                                   (completed)="onUpload($event)"
+                                   (remove)="onRemoveDocument($event)"></app-document-upload>
+            </div>
+          </div>
+
+          <div class="row justify-content-between">
+            <div class="col">
+              <button mat-flat-button
+                      class="align-self-start"
+                      type="button"
+                      color="secondary"
+                      (click)="cancelUpload()">
+                Cancel
+              </button>
+            </div>
+            <div class="col text-right">
+              <button mat-flat-button
+                      class="align-self-end"
+                      type="button"
+                      color="primary"
+                      [disabled]="!organizationAgreementDocument"
+                      (click)="updateOrganizationAgreement()">
+                Upload Document
+              </button>
+            </div>
+          </div>
+
+        </ng-container>
+
       </app-page-section>
     </div>
   </div>

prime-angular-frontend/src/app/modules/adjudication/pages/health-authorities/health-auth-org-info-page/health-auth-org-info-page.component.ts

@@ -27,6 +27,7 @@ export class HealthAuthOrgInfoPageComponent implements OnInit {
    */
   public isInitial: boolean;
   public hasClickedAddAgreement: boolean;
+  public hasClickedAddDocument: boolean;
 
   public organizationAgreementDocument: BaseDocument;
 
@@ -40,6 +41,7 @@ export class HealthAuthOrgInfoPageComponent implements OnInit {
   ) {
     this.routeUtils = new RouteUtils(route, router, AdjudicationRoutes.routePath(AdjudicationRoutes.SITE_REGISTRATIONS));
     this.hasClickedAddAgreement = false;
+    this.hasClickedAddDocument = false;
   }
 
   public onRoute(routePath: string | (string | number)[]): void {

prime-angular-frontend/src/app/shared/components/document-upload/document-upload/document-upload.component.ts

@@ -26,6 +26,10 @@ export class BaseDocument {
   }
 }
 
+export class HAAdditionalDocument extends BaseDocument {
+  note: string;
+}
+
 @Component({
   selector: 'app-document-upload',
   templateUrl: './document-upload.component.html',

prime-dotnet-webapi/ApiDbContext.cs

@@ -111,6 +111,7 @@ IHttpContextAccessor context
         // Health Authorities
         public DbSet<HealthAuthoritySite> HealthAuthoritySites { get; set; }
         public DbSet<HealthAuthorityOrganization> HealthAuthorities { get; set; }
+        public DbSet<HealthAuthorityOrganizationAdditionalDocument> HealthAuthorityOrganizationAdditionalDocuments { get; set; }
         public DbSet<HealthAuthorityCareType> HealthAuthorityCareTypes { get; set; }
         public DbSet<HealthAuthorityContact> HealthAuthorityContacts { get; set; }
         public DbSet<HealthAuthorityVendor> HealthAuthorityVendors { get; set; }

prime-dotnet-webapi/Controllers/HealthAuthoritiesController.cs

@@ -15,6 +15,7 @@
 using System;
 using Prime.Models;
 using Prime.Models.Api;
+using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace Prime.Controllers
 {
@@ -375,6 +376,58 @@ public async Task<ActionResult> CreateOrUpdateOgranizationAgreement(int healthAu
             return Ok(document); ;
         }
 
+        // PUT: api/health-authorities/1/additional-document
+        /// <summary>
+        ///    Create or Update health auth organization agreement
+        /// </summary>
+        /// <param name="healthAuthorityId"></param>
+        /// <param name="documentGuid"></param>
+        [HttpPut("{healthAuthorityId}/additional-document", Name = nameof(CreateAdditionalDocument))]
+        [Authorize(Roles = Roles.PrimeMaintenance)]
+        [ProducesResponseType(typeof(ApiMessageResponse), StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status403Forbidden)]
+        [ProducesResponseType(typeof(ApiMessageResponse), StatusCodes.Status404NotFound)]
+        [ProducesResponseType(typeof(ApiResultResponse<HealthAuthorityOrganizationAgreementDocument>), StatusCodes.Status200OK)]
+        public async Task<ActionResult> CreateAdditionalDocument(int healthAuthorityId, [FromQuery] Guid documentGuid)
+        {
+            if (!await _healthAuthorityService.HealthAuthorityExistsAsync(healthAuthorityId))
+            {
+                return NotFound($"Health Authority not found with id {healthAuthorityId}");
+            }
+
+            var document = await _healthAuthorityService.CreateAdditionalDocumentAsync(healthAuthorityId, documentGuid);
+            if (document == null)
+            {
+                return BadRequest("Additional Document could not be created; network error or upload is already submitted");
+            }
+
+            return Ok(document);
+        }
+
+        // DELETE: api/health-authorities/1/additional-document
+        /// <summary>
+        ///    Create or Update health auth organization agreement
+        /// </summary>
+        /// <param name="healthAuthorityId"></param>
+        /// <param name="documentGuid"></param>
+        [HttpDelete("{healthAuthorityId}/additional-document", Name = nameof(DeleteAdditionalDocument))]
+        [Authorize(Roles = Roles.PrimeMaintenance)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status403Forbidden)]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public async Task<ActionResult> DeleteAdditionalDocument(int healthAuthorityId, [FromQuery] Guid documentGuid)
+        {
+            if (!await _healthAuthorityService.HealthAuthorityExistsAsync(healthAuthorityId))
+            {
+                return NotFound($"Health Authority not found with id {healthAuthorityId}");
+            }
+
+            await _healthAuthorityService.DeleteAdditionalDocumentAsync(healthAuthorityId, documentGuid);
+
+            return NoContent();
+        }
+
         // GET: api/health-authorities/1/organization-agreement/token
         /// <summary>
         /// Gets a download token for the latest organization agreement for a health authority.