Dev

src/Backend/Inspections.API/Features/Reports/Handlers/DeletePhotoRecordCommandHandler.cs

@@ -19,7 +19,7 @@ public DeletePhotoRecordCommandHandler(IReportsRepository reportsRepository)
         }
         public async Task<bool> Handle(DeletePhotoRecordCommand request, CancellationToken cancellationToken)
         {
-            var report = await _reportsRepository.GetByIdAsync(request.Id).ConfigureAwait(false);
+            var report = await _reportsRepository.GetByIdAsync(request.ReportId).ConfigureAwait(false);
 
             var photo = report.PhotoRecords.Where(n => n.Id == request.Id).FirstOrDefault();
             report.RemovePhoto(photo);

src/Backend/Inspections.API/Features/Reports/ReportsController.cs

@@ -1,12 +1,14 @@
 using System;
-using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Inspections.API.ApplicationServices;
 using Inspections.API.Features.Inspections.Commands;
 using Inspections.API.Features.Reports.Commands;
 using Inspections.API.Models.Configuration;
+using Inspections.Core.Domain.ReportsAggregate;
 using Inspections.Core.Interfaces;
+using Inspections.Infrastructure.Data;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -17,18 +19,22 @@
 
 namespace Inspections.API.Features.Inspections
 {
-    [Authorize]
+  [Authorize]
     [Route("[controller]")]
     [ApiController]
     public class ReportsController : ControllerBase
     {
         private readonly IMediator _mediator;
         private readonly IReportsRepository _reportsRepository;
+        private readonly InspectionsContext _context;
+        private readonly IOptions<ClientSettings> storageOptions;
 
-        public ReportsController(IMediator mediator, IReportsRepository reportsRepository)
+        public ReportsController(IMediator mediator, IReportsRepository reportsRepository, InspectionsContext context, IOptions<ClientSettings> storageOptions)
         {
-            this._mediator = mediator ?? throw new ArgumentNullException(nameof(mediator));
-            this._reportsRepository = reportsRepository ?? throw new ArgumentNullException(nameof(reportsRepository));
+            _mediator = mediator ?? throw new ArgumentNullException(nameof(mediator));
+            _reportsRepository = reportsRepository ?? throw new ArgumentNullException(nameof(reportsRepository));
+            _context = context ?? throw new ArgumentNullException(nameof(context));
+            this.storageOptions = storageOptions ?? throw new ArgumentNullException(nameof(storageOptions));
         }
 
         [HttpPost]
@@ -81,6 +87,23 @@ public async Task<IActionResult> DeleteReport(int id)
             return NoContent();
         }
 
+        [HttpGet("{id:int}/photorecord")]
+        public IActionResult GetPhotoRecords(int id)
+        {
+            var photos = _context.Set<PhotoRecord>().Where(p => p.ReportId == id)
+                            .Select(p => new { p.Label, p.FileName, Base64String = ToBase64String($"{Directory.GetCurrentDirectory()}{p.FileName.Replace("ReportsImages",storageOptions.Value.ReportsImagesFolder)}") });
+            if (photos!=null)
+                return Ok(photos);
+
+            return BadRequest();
+        }
+
+        private static string ToBase64String(string fileName)
+        {
+            byte[] fileBytes = System.IO.File.ReadAllBytes(fileName);
+            return "data:image/png;base64," + Convert.ToBase64String(fileBytes);
+        }
+
         [HttpPost("{id:int}/photorecord")]
         public async Task<IActionResult> AddPhotoRecord(int id, [FromForm] string label)
         {
@@ -104,7 +127,7 @@ public async Task<IActionResult> AddNote(int id, [FromBody] AddNoteCommand note)
         {
 
             var result = await _mediator.Send(note).ConfigureAwait(false);
-            if (result>0)
+            if (result > 0)
                 return Ok(result);
 
             return BadRequest();
@@ -129,7 +152,7 @@ public async Task<IActionResult> EditPhotoRecord(int id, int idPhoto, [FromBody]
             if (photo.Id != idPhoto || photo.ReportId != id)
                 return BadRequest();
 
-            var result = await _mediator.Send(new EditPhotoRecordCommand(photo.ReportId,photo.Label,photo.Id)).ConfigureAwait(false);
+            var result = await _mediator.Send(new EditPhotoRecordCommand(photo.ReportId, photo.Label, photo.Id)).ConfigureAwait(false);
             if (result)
                 return Ok();
 
@@ -139,7 +162,7 @@ public async Task<IActionResult> EditPhotoRecord(int id, int idPhoto, [FromBody]
         [HttpDelete("{id:int}/photorecord/{idPhoto:int}")]
         public async Task<IActionResult> DeletePhotoRecord(int id, int idPhoto)
         {
-            var result = await _mediator.Send(new DeletePhotoRecordCommand(idPhoto,id)).ConfigureAwait(false);
+            var result = await _mediator.Send(new DeletePhotoRecordCommand(idPhoto, id)).ConfigureAwait(false);
             if (result)
                 return Ok();
 
@@ -149,7 +172,7 @@ public async Task<IActionResult> DeletePhotoRecord(int id, int idPhoto)
         [HttpDelete("{id:int}/note/{idNote:int}")]
         public async Task<IActionResult> DeleteNote(int id, int idNote)
         {
-            var result = await _mediator.Send(new DeleteNoteCommand(idNote,id)).ConfigureAwait(false);
+            var result = await _mediator.Send(new DeleteNoteCommand(idNote, id)).ConfigureAwait(false);
             if (result)
                 return Ok();
 

src/Backend/Inspections.API/Features/ReportsConfiguration/Commands/AddReportConfigurationCommand.cs

@@ -7,7 +7,7 @@
 
 namespace Inspections.API.Features.ReportsConfiguration.Commands
 {
-    public class AddReportConfigurationCommand : IRequest<bool>
+    public class AddReportConfigurationCommand : IRequest<int>
     {
         public AddReportConfigurationCommand(ReportType type,
                                              string title,

src/Backend/Inspections.API/Features/ReportsConfiguration/Handlers/AddReportConfigurationCommandHandler.cs

@@ -15,7 +15,7 @@
 
 namespace Inspections.API.Features.ReportsConfiguration.Handlers
 {
-    public class AddReportConfigurationCommandHandler : IRequestHandler<AddReportConfigurationCommand, bool>
+    public class AddReportConfigurationCommandHandler : IRequestHandler<AddReportConfigurationCommand, int>
     {
         private readonly IReportConfigurationsRepository _reportConfigurationsRepository;
         private readonly InspectionsContext _context;
@@ -26,7 +26,7 @@ public AddReportConfigurationCommandHandler(IReportConfigurationsRepository repo
             _context = context ?? throw new ArgumentNullException(nameof(context));
         }
 
-        public async Task<bool> Handle(AddReportConfigurationCommand request, CancellationToken cancellationToken)
+        public async Task<int> Handle(AddReportConfigurationCommand request, CancellationToken cancellationToken)
         {
             Guard.Against.Null(request, nameof(request));
 
@@ -54,7 +54,27 @@ public async Task<bool> Handle(AddReportConfigurationCommand request, Cancellati
 
             var result = await _reportConfigurationsRepository.AddAsync(repoConfig).ConfigureAwait(false);
 
-            return result.Id > 0;
+            return result.Id;
+        }
+
+        private List<CheckList> PrepareForConfiguration(List<CheckList> checks)
+        {
+            var result = new List<CheckList>();
+            foreach (CheckList check in checks)
+            {
+                result.Add(check.CloneForReportConfiguration());
+            }
+            return result;
+        }
+
+        private List<Signature> PrepareForConfiguration(List<Signature> signatures)
+        {
+            var result = new List<Signature>();
+            foreach (Signature signature in signatures)
+            {
+                result.Add(signature.PreparteForNewReportConfiguration());
+            }
+            return result;
         }
 
         private List<CheckList> PrepareForConfiguration(List<CheckList> checks)

src/Backend/Inspections.API/Features/ReportsConfiguration/ReportConfigurationController.cs

@@ -35,10 +35,10 @@ public ReportConfigurationController(IMediator mediator
         public async Task<IActionResult> CreateReportConfig([FromBody] AddReportConfigurationCommand report)
         {
             var result = await _mediator.Send(report).ConfigureAwait(false);
-            if (!result)
+            if (result <= 0)
                 return Conflict();
 
-            return Ok();
+            return Ok(result);
         }
 
         [HttpPut("{id:int}")]

src/Backend/Inspections.API/Startup.cs

@@ -167,7 +167,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseStaticFiles(new StaticFileOptions
             {
                 FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), Configuration.GetValue<string>("ClientSettings:ReportsImagesFolder"))),
-                RequestPath = "/ReportsImages"
+                RequestPath = "/ReportsImages",
+                OnPrepareResponse = ctx =>
+                {
+                    ctx.Context.Response.Headers["Access-Control-Allow-Origin"] = "*";
+                }
             });
 
             // Enable middleware to serve generated Swagger as a JSON endpoint.

src/Backend/Inspections.Core/Domain/CheckListAggregate/CheckList.cs

@@ -20,6 +20,7 @@ public class CheckList : Entity<int>, IAggregateRoot
         public List<CheckListParam> TextParams { get; private set; } = new List<CheckListParam>();
         public string Annotation { get; private set; }
         public bool IsConfiguration { get; set; }
+        public bool Completed => !_checks.Any(c => c.Required && (c.Checked == CheckValue.False));
         private readonly List<CheckListItem> _checks = new List<CheckListItem>();
 
         public CheckList(string text, List<CheckListParam> textParams, string annotation, bool isConfiguration)
@@ -34,7 +35,6 @@ public CheckList(string text, List<CheckListParam> textParams, string annotation
         private CheckList() { } //Required by EF
 
         public IReadOnlyList<CheckListItem> Checks => _checks.AsReadOnly();
-        public bool Completed => !Checks.Any(c => c.Required && (c.Checked != CheckValue.False || c.Checked != CheckValue.NA));
 
         public void Edit(string text, string annotation, bool isConfiguration)
         {

src/Backend/Inspections.Core/Domain/ReportsAggregate/Report.cs

@@ -66,7 +66,7 @@ public void Edit(string name, string address, EMALicense license, DateTimeOffset
         }
 
         public IReadOnlyCollection<PhotoRecord> PhotoRecords => photoRecords;
-        public bool Completed => !checkList.Any(c => c.Completed);
+        public bool Completed => !checkList.Any(c => !c.Completed);
 
         public void AddNote(Note note)
         {

src/Backend/Inspections.Infrastructure/Repositories/ReportsRepository.cs

@@ -32,9 +32,9 @@ public async Task<Report> AddAsync(Report entity)
 
         public async Task<IEnumerable<Report>> GetAll(string filter)
         {
-            // TODO: Change
             return await _context.Reports
                 .Include(p => p.CheckList)
+                    .ThenInclude(p=>p.Checks)
                 .Include(p=>p.Signatures)
                 .Include(p=>p.Notes)
                 .Include(p => p.PhotoRecords)