Merge pull request #61 from GarageGroup/feature/task8431-update-timesheet

update timesheet

Author: pmosk

src/endpoint/Timesheet.Create/Flow/Flow.Run.cs

@@ -54,7 +54,7 @@ internal static async ValueTask<Unit> RunAsync(
         }
 
         var timesheet = GetWebAppUpdateResponseJson(context);
-        if (timesheet is not null && timesheet.Command?.Equals("updatetimesheet") is true)
+        if (string.Equals(timesheet?.Command, "updatetimesheet", StringComparison.InvariantCultureIgnoreCase))
         {
             await context.TurnContext.DeleteActivityAsync(context.TurnContext.Activity.Id, cancellationToken).ConfigureAwait(false);
             return starter;

src/endpoint/Timesheet.Create/Flow/TimesheetCreateChatFlow.cs

@@ -16,7 +16,7 @@ internal static ChatFlow<TimesheetCreateFlowState> RunFlow(
             () => new()
             {
                 TimesheetId = data?.Id,
-                Description = data is null ? null : new(data.Description),
+                Description = data is null ? null : data.Description is null ? null : new(data.Description),
                 ValueHours = data?.Duration,
                 Project = data?.Project,
                 Date = data?.Date,

src/endpoint/Timesheet.Create/FlowStep/Step.ConfirmTimesheet.cs

@@ -105,6 +105,7 @@ private static string BuildWebAppUrl(this TimesheetCreateFlowState state)
     {
         var timesheet = new WebAppDataTimesheetCreateJson
         {
+            Id = state.TimesheetId,
             Description = state.Description?.Value.OrEmpty(),
             Duration = state.ValueHours.GetValueOrDefault(),
             Project = state.Project

src/endpoint/Timesheet.Create/Internal.Json/WebAppDataTimesheetCreateJson.cs

@@ -1,9 +1,13 @@
 using Newtonsoft.Json;
+using System;
 
 namespace GarageGroup.Internal.Timesheet;
 
 internal readonly record struct WebAppDataTimesheetCreateJson
 {
+    [JsonProperty("id")]
+    public Guid? Id { get; init; }
+
     [JsonProperty("duration")]
     public decimal Duration { get; init; }
 

src/endpoint/Timesheet.Create/Internal.Json/WebAppDataTimesheetUpdateJson.cs

@@ -7,10 +7,10 @@ namespace GarageGroup.Internal.Timesheet;
 internal sealed record class WebAppDataTimesheetUpdateJson
 {
     [JsonProperty("id")]
-    public Guid Id { get; init; }
+    public Guid? Id { get; init; }
 
     [JsonProperty("duration")]
-    public decimal Duration { get; init; }
+    public decimal? Duration { get; init; }
 
     [JsonProperty("project")]
     public TimesheetProjectState? Project { get; init; }

src/endpoint/Timesheet.Get/FlowState/TimesheetJson.cs

@@ -16,4 +16,10 @@ internal sealed record class TimesheetJson
 
     [JsonProperty("description")]
     public string? Description { get; init; }
+
+    [JsonProperty("incidentStateCode")]
+    public StateCode? IncidentStateCode { get; init; }
+
+    [JsonProperty("timesheetStateCode")]
+    public StateCode TimesheetStateCode { get; init; }
 }

src/service/CrmProject/Api/Api/Api.GetLast.cs

@@ -22,7 +22,8 @@ public ValueTask<Result<LastProjectSetGetOut, Failure<ProjectSetGetFailureCode>>
                     [
                         DbTimesheetProject.BuildOwnerFilter(@in.UserId),
                         DbTimesheetProject.BuildMinDateFilter(@in.MinDate),
-                        AllowedProjectTypeSetFilter
+                        AllowedProjectTypeSetFilter,
+                        IncidentStateCodeFilter
                     ]
                 },
                 Orders = DbTimesheetProject.DefaultOrders

src/service/CrmProject/Api/Api/Api.Search.cs

@@ -17,7 +17,8 @@ public ValueTask<Result<ProjectSetSearchOut, Failure<ProjectSetGetFailureCode>>>
             static @in => new($"*{@in.SearchText}*")
             {
                 Top = @in.Top,
-                Entities = DataverseProjectSearch.EntityNames
+                Entities = DataverseProjectSearch.EntityNames,
+                Filter = DataverseProjectSearch.Filter
             })
         .PipeValue(
             dataverseApi.Impersonate(input.UserId).SearchAsync)

src/service/CrmProject/Api/Api/CrmProjectApi.cs

@@ -7,9 +7,13 @@ namespace GarageGroup.Internal.Timesheet;
 
 internal sealed partial class CrmProjectApi(TDataverseApi dataverseApi, TSqlApi sqlApi) : ICrmProjectApi
 {
-    private static readonly IDbFilter AllowedProjectTypeSetFilter;
+    private static readonly DbParameterArrayFilter AllowedProjectTypeSetFilter;
+
+    private static readonly DbRawFilter IncidentStateCodeFilter;
 
     static CrmProjectApi()
-        =>
+    {
         AllowedProjectTypeSetFilter = DbTimesheetProject.BuildAllowedProjectTypeSetFilter();
+        IncidentStateCodeFilter = DbTimesheetProject.BuildIncidentStateCodeFilter();
+    }
 }

src/service/CrmProject/Api/Internal.DataverseProjectSearch/DataverseProjectSearch.cs

@@ -2,6 +2,10 @@
 
 internal static partial class DataverseProjectSearch
 {
+    internal static readonly string Filter
+        = 
+        $"objecttypecode ne {TimesheetProjectType.Incident:D} or statecode eq 0";
+
     private const string ProjectEntityName = "gg_project";
 
     private const string LeadEntityName = "lead";