Refactor Log Controller / Services

- Removed AllowAnonymous attribute in Update under Employee feature
- Added model validation in LogEditViewModel

Author: jioo

src/Api/Features/Employees/EmployeeController.cs

@@ -34,7 +34,6 @@ public async Task<EmployeeViewModel> Details(Guid id)
 
         // PUT api/employee
         [HttpPut]
-        [AllowAnonymous]
         public async Task<IActionResult> Update(EmployeeViewModel model)
         {
             // Check if Card No already exists

src/Api/Features/Logs/LogController.cs

@@ -33,6 +33,7 @@ await _mediator.Send(new List.Query(parameters))
         }
 
         // GET: api/log/{id}
+        [Authorize(Roles = "Admin")]
         [HttpGet("{id:guid}")]
         public async Task<LogViewModel> Details(Guid id)
         {
@@ -46,8 +47,8 @@ public async Task<IActionResult> Log(LogInOutViewModel viewModel)
         {
             // Validate card no. & password
             var user = await _mediator.Send(new ValidateTimeInOut.Query(viewModel));
-            if (user.Id == Guid.Empty) 
-                return BadRequest("Invalid username or password!");
+            if (user == null) 
+                return BadRequest("Invalid card no. or password!");
 
             // Broadcast to web client
             await _hubContext.Clients.All.SendAsync("employee-logged"); 
@@ -61,9 +62,14 @@ await _mediator.Send(new RecordLog.Command(user))
         // PUT api/log
         [Authorize(Roles = "Admin")]
         [HttpPut]
-        public async Task<LogViewModel> Update(LogEditViewModel model)
+        public async Task<ActionResult<LogViewModel>> Update(LogEditViewModel model)
         {
-            return await _mediator.Send(new Update.Command(model));
+            var result = await _mediator.Send(new Update.Command(model));
+
+            if (result == null)
+                return BadRequest();
+
+            return result;
         }
     }
 }

src/Api/Features/Logs/LogEditViewModel.cs

@@ -1,13 +1,14 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 using WebApi.Entities;
 
 namespace WebApi.Features.Logs
 {
-    public class LogEditViewModel : BaseEntity
+    public class LogEditViewModel
     {
-        public Guid EmployeeId { get; set; }
+        public Guid Id { get; set; }
+        [Required]
         public DateTime TimeIn { get; set; }
         public DateTime? TimeOut { get; set; }
-        public string FullName { get; set; }
     }
 }

src/Api/Features/Logs/Update.cs

@@ -42,15 +42,21 @@ public async Task<LogViewModel> Handle(Command request, CancellationToken cancel
             {
                 try
                 {
-                    var model = await _context.Logs.FindAsync(request.ViewModel.Id);
+                    var model = await _context.Logs.FirstOrDefaultAsync(m => m.Id == request.ViewModel.Id);
+
+                    // Validate model
+                    if (model == null)
+                        return null;
 
                     // Convert datetime to UTC before updating
                     request.ViewModel.TimeIn = LogExtensions.ToUtc(request.ViewModel.TimeIn.ToString());
                     request.ViewModel.TimeOut =  (request.ViewModel.TimeOut != null) 
                         ? LogExtensions.ToUtc(request.ViewModel.TimeOut.ToString())
                         : request.ViewModel.TimeOut;
 
-                    _mapper.Map(request.ViewModel, model);
+                    // Update specifc fields only
+                    model.TimeIn = request.ViewModel.TimeIn;
+                    model.TimeOut = request.ViewModel.TimeOut;
                     model.Updated = DateTime.UtcNow;
 
                     _context.Entry(model).State = EntityState.Modified;

src/Api/Features/Logs/ValidateTimeInOut.cs

@@ -58,14 +58,14 @@ public async Task<EmployeeViewModel> Handle(Query request, CancellationToken can
                         .Where(m => m.Deleted == null)
                         .SingleOrDefaultAsync(cancellationToken);
 
-                    // Check if employee exist
+                    // Check if employee exists
                     if (emp == null) 
-                        return new EmployeeViewModel{ Id = Guid.Empty };
+                        return null;
 
                     // Check if password is correct
                     var user = await _manager.FindByIdAsync(emp.IdentityId);
                     if (!await _manager.CheckPasswordAsync(user, request.ViewModel.Password))
-                        return new EmployeeViewModel{ Id = Guid.Empty };
+                        return null;
 
                     return _mapper.Map<EmployeeViewModel>(emp);
                 }