feat: #27: add unwell type

Api/DependencyInjection.cs

@@ -1,6 +1,8 @@
 using Api.ExternalDeps.AssignmentsApi;
+using Api.Features.Tracking.CreateUnwellEntry;
 using Api.Features.Tracking.CreateWorkEntry;
 using Api.Features.Tracking.GetWorkEntriesByPeriod;
+using Api.Features.Tracking.UpdateUnwellEntry;
 using Api.Features.Tracking.UpdateWorkEntry;
 using Application;
 using Application.Commands;
@@ -32,10 +34,14 @@ public static void AddApplication(this IServiceCollection services, IConfigurati
         services.AddTransient<IAssignmentsApi, AssignmentsApi>();
         services.AddTransient<CreateWorkEntryHandler>();
         services.AddTransient<CreateWorkEntryCommand>();
+        services.AddTransient<CreateUnwellEntryHandler>();
+        services.AddTransient<CreateUnwellEntryCommand>();
         services.AddTransient<GetWorkEntriesByPeriodHandler>();
         services.AddTransient<GetWorkEntriesByPeriodQuery>();
         services.AddTransient<UpdateWorkEntryHandler>();
         services.AddTransient<UpdateWorkEntryCommand>();
+        services.AddTransient<UpdateUnwellEntryHandler>();
+        services.AddTransient<UpdateUnwellEntryCommand>();
         services.AddTransient<HardDeleteEntityCommand>();
     }
 }

Api/Features/Tracking/CreateUnwellEntry/CreateUnwellEntryHandler.cs

@@ -0,0 +1,34 @@
+using Application.Commands;
+
+namespace Api.Features.Tracking.CreateUnwellEntry;
+
+public class CreateUnwellEntryHandler
+{
+    private readonly CreateUnwellEntryCommand _createUnwellEntryCommand;
+
+
+    public CreateUnwellEntryHandler(
+        CreateUnwellEntryCommand createUnwellEntryCommand
+    )
+    {
+        _createUnwellEntryCommand = createUnwellEntryCommand;
+    }
+
+    public async Task<CreateUnwellResponse> HandleAsync(
+        CreateUnwellEntryRequest createUnwellEntryRequest
+    )
+    {
+        var createUnwellEntryCommandParams = new CreateUnwellEntryCommandParams
+        {
+            StartTime = createUnwellEntryRequest.StartTime,
+            EndTime = createUnwellEntryRequest.EndTime,
+        };
+
+        var newUnwellEntryId = await _createUnwellEntryCommand.ExecuteAsync(createUnwellEntryCommandParams);
+
+        return new CreateUnwellResponse
+        {
+            NewUnwellEntryId = newUnwellEntryId
+        };
+    }
+}

Api/Features/Tracking/CreateUnwellEntry/CreateUnwellEntryRequest.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Api.Features.Tracking.CreateUnwellEntry;
+
+public class CreateUnwellEntryRequest
+{
+    [Required]
+    public required DateTime StartTime { get; set; }
+
+    [Required]
+    public required DateTime EndTime { get; set; }
+}

Api/Features/Tracking/CreateUnwellEntry/CreateUnwellEntryResponse.cs

@@ -0,0 +1,7 @@
+namespace Api.Features.Tracking.CreateUnwellEntry;
+
+public class CreateUnwellResponse
+{
+    public required long NewUnwellEntryId { get; set; }
+}
+

Api/Features/Tracking/CreateWorkEntry/CreateWorkEntryHandler.cs

@@ -1,6 +1,5 @@
 using Application.Commands;
 using Application.ExternalDeps.AssignmentsApi;
-using Core.Entities;
 
 namespace Api.Features.Tracking.CreateWorkEntry;
 
@@ -33,7 +32,6 @@ CreateWorkEntryRequest createWorkEntryRequest
             ProjectId = project.Id,
             TaskId = createWorkEntryRequest.TaskId,
             Description = createWorkEntryRequest.Description,
-            Type = EventType.Task, // TODO: after add other event types remove hardcode
         };
 
         var newWorkEntryId = await _createWorkEntryCommand.ExecuteAsync(createWorkEntryCommandParams);

Api/Features/Tracking/GetWorkEntriesByPeriod/GetWorkEntriesByPeriodHandler.cs

@@ -1,4 +1,5 @@
 using Application.Queries;
+using Core.Entities;
 
 namespace Api.Features.Tracking.GetWorkEntriesByPeriod;
 
@@ -18,27 +19,43 @@ public async Task<GetWorkEntriesByPeriodResponse> HandleAsync(
         DateOnly endDate
     )
     {
-        var workEntriesByPeriod = await _getWorkEntriesByPeriodQuery.GetByPeriodAsync(
+        var workEntriesByPeriod = await _getWorkEntriesByPeriodQuery.GetByPeriodAsync<TrackedEntryBase>(
             startDate,
             endDate
         );
 
+        var workEntries = workEntriesByPeriod
+            .OfType<TaskEntry>()
+            .Select(
+                x => new WorkEntryDto
+                {
+                    Id = x.Id,
+                    StartTime = x.StartTime,
+                    EndTime = x.EndTime,
+                    Type = x.Type,
+                    Title = x.Title,
+                    ProjectId = x.ProjectId,
+                    TaskId = x.TaskId,
+                    Description = x.Description
+                })
+                .ToList();
+
+        var unwellEntries = workEntriesByPeriod
+            .OfType<UnwellEntry>()
+            .Select(
+                x => new UnwellEntryDto
+                {
+                    Id = x.Id,
+                    StartTime = x.StartTime,
+                    EndTime = x.EndTime,
+                    Type = x.Type,
+                })
+                .ToList();
+
         return new GetWorkEntriesByPeriodResponse
         {
-            WorkEntries = workEntriesByPeriod
-                .Select(workEntry =>
-                    new WorkEntryDto
-                    {
-                        Id = workEntry.Id,
-                        Title = workEntry.Title,
-                        StartTime = workEntry.StartTime,
-                        EndTime = workEntry.EndTime,
-                        ProjectId = workEntry.ProjectId,
-                        TaskId = workEntry.TaskId,
-                        Description = workEntry.Description,
-                    }
-                )
-                .ToList()
+            WorkEntries = workEntries,
+            UnwellEntries = unwellEntries
         };
     }
 }

Api/Features/Tracking/GetWorkEntriesByPeriod/GetWorkEntriesByPeriodResponse.cs

@@ -1,8 +1,12 @@
+using Core.Entities;
+
 namespace Api.Features.Tracking.GetWorkEntriesByPeriod;
 
 public class GetWorkEntriesByPeriodResponse
 {
     public required List<WorkEntryDto> WorkEntries { get; set; }
+
+    public required List<UnwellEntryDto> UnwellEntries { get; set; }
 }
 
 public class WorkEntryDto
@@ -15,9 +19,22 @@ public class WorkEntryDto
 
     public required DateTime EndTime { get; set; }
 
+    public required EntryType Type { get; set; }
+
     public required long ProjectId { get; set; }
 
     public required string TaskId { get; set; }
 
     public required string Description { get; set; }
 }
+
+public class UnwellEntryDto
+{
+    public required long Id { get; set; }
+
+    public required DateTime StartTime { get; set; }
+
+    public required DateTime EndTime { get; set; }
+
+    public required EntryType Type { get; set; }
+}

Api/Features/Tracking/TrackingController.cs

@@ -1,6 +1,8 @@
 using System.ComponentModel.DataAnnotations;
+using Api.Features.Tracking.CreateUnwellEntry;
 using Api.Features.Tracking.CreateWorkEntry;
 using Api.Features.Tracking.GetWorkEntriesByPeriod;
+using Api.Features.Tracking.UpdateUnwellEntry;
 using Api.Features.Tracking.UpdateWorkEntry;
 using Application.Commands;
 using Application.ExternalDeps.AssignmentsApi;
@@ -13,12 +15,12 @@ namespace Api.Features.Tracking;
 
 [Authorize]
 [ApiController]
-[Route("api/time/tracking/work-entries")]
+[Route("api/time/tracking")]
 public class TrackingController : ControllerBase
 {
     [EndpointSummary("Get work entries by period")]
     [RequiresPermission(UserClaimsProvider.CanManagePersonalTimeTracker)]
-    [HttpGet]
+    [HttpGet("work-entries")]
     public Task<GetWorkEntriesByPeriodResponse> GetWorkEntriesByPeriodAsync(
         [Required][FromQuery] DateOnly startDate,
         [Required][FromQuery] DateOnly endDate,
@@ -30,7 +32,7 @@ [FromServices] GetWorkEntriesByPeriodHandler getWorkEntriesByPeriodHandler
 
     [EndpointSummary("Create a work entry")]
     [RequiresPermission(UserClaimsProvider.CanManagePersonalTimeTracker)]
-    [HttpPost]
+    [HttpPost("work-entries")]
     public Task<CreateWorkEntryResponse> CreateWorkEntryAsync(
         [Required][FromBody] CreateWorkEntryRequest createWorkEntryRequest,
         [FromServices] CreateWorkEntryHandler createWorkEntryHandler
@@ -39,9 +41,20 @@ [FromServices] CreateWorkEntryHandler createWorkEntryHandler
         return createWorkEntryHandler.HandleAsync(createWorkEntryRequest);
     }
 
+    [EndpointSummary("Create an unwell entry")]
+    [RequiresPermission(UserClaimsProvider.CanManagePersonalTimeTracker)]
+    [HttpPost("unwell-entries")]
+    public Task<CreateUnwellResponse> CreateUnwellEntryAsync(
+        [Required][FromBody] CreateUnwellEntryRequest createUnwellRequest,
+        [FromServices] CreateUnwellEntryHandler createUnwellEntryHandler
+    )
+    {
+        return createUnwellEntryHandler.HandleAsync(createUnwellRequest);
+    }
+
     [EndpointSummary("Update a work entry")]
     [RequiresPermission(UserClaimsProvider.CanManagePersonalTimeTracker)]
-    [HttpPost("{workEntryId}")]
+    [HttpPost("work-entries/{workEntryId}")]
     public Task UpdateWorkEntryAsync(
         [Required][FromRoute] long workEntryId,
         [Required][FromBody] UpdateWorkEntryRequest updateWorkEntryRequest,
@@ -51,9 +64,21 @@ [FromServices] UpdateWorkEntryHandler updateWorkEntryHandler
         return updateWorkEntryHandler.HandleAsync(workEntryId, updateWorkEntryRequest);
     }
 
+    [EndpointSummary("Update an unwell entry")]
+    [RequiresPermission(UserClaimsProvider.CanManagePersonalTimeTracker)]
+    [HttpPost("unwell-entries/{unwellEntryId}")]
+    public Task UpdateUnwellEntryAsync(
+    [Required][FromRoute] long unwellEntryId,
+    [Required][FromBody] UpdateUnwellEntryRequest updateUnwellEntryRequest,
+    [FromServices] UpdateUnwellEntryHandler updateUnwellEntryHandler
+    )
+    {
+        return updateUnwellEntryHandler.HandleAsync(unwellEntryId, updateUnwellEntryRequest);
+    }
+
     [EndpointSummary("Get employee projects by period")]
     [RequiresPermission(UserClaimsProvider.CanManagePersonalTimeTracker)]
-    [HttpGet("projects")]
+    [HttpGet("work-entries/projects")]
     public async Task<ProjectsResponse> GetEmployeeProjectsByPeriodAsync(
         [Required][FromQuery] DateOnly startDate,
         [Required][FromQuery] DateOnly endDate,
@@ -68,15 +93,15 @@ [FromServices] IAssignmentsApi assignmentsApi
 
     [EndpointSummary("Deletes specific work entry")]
     [RequiresPermission(UserClaimsProvider.AUTO_TESTS_ONLY_IsWorkEntriesHardDeleteAllowed)]
-    [HttpDelete("{workEntryId}/hard-delete")]
+    [HttpDelete("work-entries/{workEntryId}/hard-delete")]
     public async Task<object> HardDeleteWorkEntryAsync(
         [Required][FromRoute] long workEntryId,
         [FromServices] HardDeleteEntityCommand hardDeleteEntityCommand
     )
     {
         return new
         {
-            isDeleted = await hardDeleteEntityCommand.ExecuteAsync<WorkEntry>(workEntryId)
+            isDeleted = await hardDeleteEntityCommand.ExecuteAsync<TrackedEntryBase>(workEntryId)
         };
     }
 }

Api/Features/Tracking/UpdateUnwellEntry/UpdateUnwellEntryHandler.cs

@@ -0,0 +1,30 @@
+using Application.Commands;
+
+namespace Api.Features.Tracking.UpdateUnwellEntry;
+
+public class UpdateUnwellEntryHandler
+{
+    private readonly UpdateUnwellEntryCommand _updateUnwellEntryCommand;
+
+    public UpdateUnwellEntryHandler(
+        UpdateUnwellEntryCommand updateUnwellEntryCommand
+    )
+    {
+        _updateUnwellEntryCommand = updateUnwellEntryCommand;
+    }
+
+    public async Task HandleAsync(
+        long unwellEntryId,
+        UpdateUnwellEntryRequest updateUnwellEntryRequest
+    )
+    {
+        var updateUnwellEntryCommandParams = new UpdateUnwellEntryCommandParams
+        {
+            Id = unwellEntryId,
+            StartTime = updateUnwellEntryRequest.StartTime,
+            EndTime = updateUnwellEntryRequest.EndTime,
+        };
+
+        await _updateUnwellEntryCommand.ExecuteAsync(updateUnwellEntryCommandParams);
+    }
+}

Api/Features/Tracking/UpdateUnwellEntry/UpdateUnwellEntryRequest.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Api.Features.Tracking.UpdateUnwellEntry;
+
+public class UpdateUnwellEntryRequest
+{
+    [Required]
+    public required DateTime StartTime { get; set; }
+
+    [Required]
+    public required DateTime EndTime { get; set; }
+}

Api/Features/Tracking/UpdateWorkEntry/UpdateWorkEntryHandler.cs

@@ -1,6 +1,5 @@
 using Application.Commands;
 using Application.ExternalDeps.AssignmentsApi;
-using Core.Entities;
 
 namespace Api.Features.Tracking.UpdateWorkEntry;
 
@@ -20,21 +19,20 @@ IAssignmentsApi assignmentsApi
 
     public async Task HandleAsync(
         long workEntryId,
-        UpdateWorkEntryRequest updateEntryRequest
+        UpdateWorkEntryRequest updateWorkEntryRequest
     )
     {
-        var project = await _assignmentsApi.GetEmployeeProjectAsync(updateEntryRequest.ProjectId);
+        var project = await _assignmentsApi.GetEmployeeProjectAsync(updateWorkEntryRequest.ProjectId);
 
         var updateWorkEntryCommandParams = new UpdateWorkEntryCommandParams
         {
             Id = workEntryId,
-            Title = updateEntryRequest.Title,
-            StartTime = updateEntryRequest.StartTime,
-            EndTime = updateEntryRequest.EndTime,
+            Title = updateWorkEntryRequest.Title,
+            StartTime = updateWorkEntryRequest.StartTime,
+            EndTime = updateWorkEntryRequest.EndTime,
             ProjectId = project.Id,
-            TaskId = updateEntryRequest.TaskId,
-            Description = updateEntryRequest.Description,
-            Type = EventType.Task, // TODO: after add other event types remove hardcode
+            TaskId = updateWorkEntryRequest.TaskId,
+            Description = updateWorkEntryRequest.Description,
         };
 
         await _updateWorkEntryCommand.ExecuteAsync(updateWorkEntryCommandParams);