From c24610c71b44ac2999f03bd16bae58fb9d0224e6 Mon Sep 17 00:00:00 2001 From: "Daniel Mackay [SSW]" <2636640+danielmackay@users.noreply.github.com> Date: Sat, 14 Dec 2024 20:18:00 +1000 Subject: [PATCH] Remove timesheet feature and other unneeded code --- .../Features/DailyScrum/Domain/DailyScrum.cs | 16 ----- .../Infrastructure/GraphService.cs | 23 ------- .../Infrastructure/MicrosoftGraphOptions.cs | 11 ---- .../Infrastructure/MockGraphService.cs | 24 +++---- .../Queries/GetTimeSheetNotesQuery.cs | 62 ------------------- .../Timesheet/Queries/TimesheetViewModel.cs | 8 --- .../Features/Timesheet/TimesheetFeature.cs | 13 ---- 7 files changed, 12 insertions(+), 145 deletions(-) delete mode 100644 src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/MicrosoftGraphOptions.cs delete mode 100644 src/WebUI/Features/Timesheet/Queries/GetTimeSheetNotesQuery.cs delete mode 100644 src/WebUI/Features/Timesheet/Queries/TimesheetViewModel.cs delete mode 100644 src/WebUI/Features/Timesheet/TimesheetFeature.cs diff --git a/src/WebUI/Features/DailyScrum/Domain/DailyScrum.cs b/src/WebUI/Features/DailyScrum/Domain/DailyScrum.cs index a6f8c0f..33d29e4 100644 --- a/src/WebUI/Features/DailyScrum/Domain/DailyScrum.cs +++ b/src/WebUI/Features/DailyScrum/Domain/DailyScrum.cs @@ -16,19 +16,3 @@ public DailyScrum(UserSummary userSummary, ProjectList yesterdaysProjects, Proje Email = email; } } - -// public class DailyScrum2 -// { -// public UserSummary UserSummary { get; } -// public ProjectList YesterdaysProjects { get; } -// public ProjectList TodaysProjects { get; } -// public EmailSummary Email { get; } -// -// public DailyScrum2(UserSummary userSummary, ProjectList yesterdaysProjects, ProjectList todaysProjects, EmailSummary email) -// { -// UserSummary = userSummary; -// YesterdaysProjects = yesterdaysProjects; -// TodaysProjects = todaysProjects; -// Email = email; -// } -// } diff --git a/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/GraphService.cs b/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/GraphService.cs index 79ff639..5e84a2a 100644 --- a/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/GraphService.cs +++ b/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/GraphService.cs @@ -24,29 +24,6 @@ public GraphService( _graphServiceClient = factory.CreateDefault(); } - // public async Task?> GetTodoLists() - // { - // var graphClient = GetGraphServiceClient(); - // - // // get the user's todo items - // var todoItems = await graphClient.Me.Todo.Lists.GetAsync(); - // - // return todoItems?.Value; - // } - // - // public async Task?> GetTodoItems() - // { - // var graphClient = GetGraphServiceClient(); - // - // // get the user's todo items - // var todoItems = await graphClient.Me.Todo - // .Lists[ - // "AAMkADc2YTU0YjZhLWQ5YjMtNGEyMS04MjBhLTZiMmE5NTYyMGIzYQAuAAAAAACP6decNu2DQYGmhrqvh_OSAQCUGIMeUnEkQY4T_KIyV7H1AADdl5LEAAA="] - // .Tasks - // .GetAsync(); - // return todoItems?.Value; - // } - public async Task> GetTasks(DateTime utcStart, DateTime utcEnd) { _logger.LogInformation("Getting tasks from {UtcStart} to {UtcEnd}", utcStart, utcEnd); diff --git a/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/MicrosoftGraphOptions.cs b/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/MicrosoftGraphOptions.cs deleted file mode 100644 index 85851d6..0000000 --- a/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/MicrosoftGraphOptions.cs +++ /dev/null @@ -1,11 +0,0 @@ -// using System.ComponentModel.DataAnnotations; -// -// namespace WebUI.Features.DailyScrum.Infrastructure; -// -// public class MicrosoftGraphOptions -// { -// public const string Section = "MicrosoftGraph"; -// -// [Required] -// public required string AccessToken { get; set; } -// } diff --git a/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/MockGraphService.cs b/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/MockGraphService.cs index 85145d5..459c3db 100644 --- a/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/MockGraphService.cs +++ b/src/WebUI/Features/DailyScrum/UseCases/CreateDailyScrumCommand/Infrastructure/MockGraphService.cs @@ -15,18 +15,18 @@ public Task> GetTasks(DateTime utcStart, DateTime utcEnd) new TaskItem(TaskStatus.InProgress, "Task B"), new TaskItem(TaskStatus.Todo, "Task C"), }), - // new Project("Project 2", false, new List - // { - // new TaskItem(TaskStatus.Done, "Task A"), - // new TaskItem(TaskStatus.InProgress, "Task B"), - // new TaskItem(TaskStatus.Todo, "Task C"), - // }), - // new Project("Project 3", false, new List - // { - // new TaskItem(TaskStatus.Done, "Task A"), - // new TaskItem(TaskStatus.InProgress, "Task B"), - // new TaskItem(TaskStatus.Todo, "Task C"), - // }), + new Project("Project 2", false, new List + { + new TaskItem(TaskStatus.Done, "Task A"), + new TaskItem(TaskStatus.InProgress, "Task B"), + new TaskItem(TaskStatus.Todo, "Task C"), + }), + new Project("Project 3", false, new List + { + new TaskItem(TaskStatus.Done, "Task A"), + new TaskItem(TaskStatus.InProgress, "Task B"), + new TaskItem(TaskStatus.Todo, "Task C"), + }), }; return Task.FromResult(projects); diff --git a/src/WebUI/Features/Timesheet/Queries/GetTimeSheetNotesQuery.cs b/src/WebUI/Features/Timesheet/Queries/GetTimeSheetNotesQuery.cs deleted file mode 100644 index f6adae7..0000000 --- a/src/WebUI/Features/Timesheet/Queries/GetTimeSheetNotesQuery.cs +++ /dev/null @@ -1,62 +0,0 @@ -// using MediatR; -// using WebUI.Common.Services; -// using WebUI.Common.ViewModels; -// using WebUI.Features.DailyScrum.UseCases.CreateDailyScrumCommand; -// -// namespace WebUI.Features.Timesheet.Queries; -// -// // How should the time calculation work? -// // - user enters a date -// // - we assume that that date is in Sydney time -// // -// public record GetTimeSheetNotesQuery(DateOnly Date) : IRequest; -// -// public class GetTimeSheetNotesQueryHandler : IRequestHandler -// { -// private readonly IGraphService _graphService; -// private readonly TimeProvider _timeProvider; -// private readonly ILogger _logger; -// -// public GetTimeSheetNotesQueryHandler(IGraphService graphService, TimeProvider timeProvider, ILogger logger) -// { -// _graphService = graphService; -// _timeProvider = timeProvider; -// _logger = logger; -// } -// -// public async Task Handle(GetTimeSheetNotesQuery request, CancellationToken cancellationToken) -// { -// _logger.LogInformation("Getting timesheet notes for {Date}", request.Date); -// -// var projects = await GetProjects(request.Date); -// -// return new TimesheetViewModel -// { -// Projects = projects -// }; -// } -// -// // TODO: Consider refactoring into a common service -// private async Task> GetProjects(DateOnly date) -// { -// var startOfDayUtc = _timeProvider.GetStartOfDayUtc(date); -// var endOfDayUtc = _timeProvider.GetEndOfDayUtc(date); -// -// _logger.LogInformation("Getting projects for {Date} ({StartOfDayUtc} to {EndOfDayUtc})", date, startOfDayUtc, endOfDayUtc); -// -// var graphTasks = await _graphService.GetTasks(startOfDayUtc, endOfDayUtc); -// -// var projects = graphTasks -// .Select(p => new ProjectViewModel -// { -// Name = p.Name, -// IsSystemProject = p.IsSystemProject, -// Tasks = p.Tasks -// .Select(t => new TaskViewModel { Name = t.Name }) -// .ToList() -// }) -// .ToList(); -// -// return projects; -// } -// } diff --git a/src/WebUI/Features/Timesheet/Queries/TimesheetViewModel.cs b/src/WebUI/Features/Timesheet/Queries/TimesheetViewModel.cs deleted file mode 100644 index 363a845..0000000 --- a/src/WebUI/Features/Timesheet/Queries/TimesheetViewModel.cs +++ /dev/null @@ -1,8 +0,0 @@ -// using WebUI.Common.ViewModels; -// -// namespace WebUI.Features.Timesheet.Queries; -// -// public class TimesheetViewModel -// { -// public List Projects { get; init; } = []; -// } diff --git a/src/WebUI/Features/Timesheet/TimesheetFeature.cs b/src/WebUI/Features/Timesheet/TimesheetFeature.cs deleted file mode 100644 index c845d20..0000000 --- a/src/WebUI/Features/Timesheet/TimesheetFeature.cs +++ /dev/null @@ -1,13 +0,0 @@ -using WebUI.Common.Features; - -namespace WebUI.Features.Timesheet; - -public sealed class TimesheetFeature : IFeature -{ - public static void ConfigureServices(IServiceCollection services, IConfiguration config) - { - //services.AddOptionsWithValidation(MicrosoftGraphOptions.Section); - //services.AddScoped(); - //services.AddScoped(); - } -}