Merge branch 'dev' into nvm/LNK-4374_CensusManagerQueries

Author: nvmLantana

DotNet/DataAcquisition.Domain/Application/Managers/QueryPlanManager.cs

@@ -36,10 +36,12 @@ public async Task<QueryPlanModel> AddAsync(CreateQueryPlanModel model, Cancellat
             throw new ArgumentNullException(nameof(model), "CreateQueryPlanModel cannot be null.");
         }
 
-        // Validate query order
+        //// Validate query order
         ValidateQueryOrder(model.InitialQueries, "InitialQueries");
         ValidateQueryOrder(model.SupplementalQueries, "SupplementalQueries");
 
+        var date = DateTime.UtcNow;
+
         var entity = new QueryPlan
         {
             PlanName = model.PlanName,
@@ -49,8 +51,8 @@ public async Task<QueryPlanModel> AddAsync(CreateQueryPlanModel model, Cancellat
             InitialQueries = model.InitialQueries,
             SupplementalQueries = model.SupplementalQueries,
             Type = model.Type,
-            CreateDate = DateTime.UtcNow,
-            ModifyDate = DateTime.UtcNow
+            CreateDate = date,
+            ModifyDate = date
         };
 
         entity = await _database.QueryPlanRepository.AddAsync(entity);

…cation/Models/Http/QueryPlanBaseModel.cs …ication/Models/Http/QueryPlanApiModel.csDotNet/DataAcquisition.Domain/Application/Models/Http/QueryPlanBaseModel.cs renamed to DotNet/DataAcquisition.Domain/Application/Models/Http/QueryPlanApiModel.cs DotNet/DataAcquisition.Domain/Application/Models/Http/QueryPlanBaseModel.cs renamed to DotNet/DataAcquisition.Domain/Application/Models/Http/QueryPlanApiModel.cs

@@ -6,7 +6,7 @@
 using System.Text.Json.Serialization;
 
 namespace LantanaGroup.Link.DataAcquisition.Domain.Application.Models.Http;
-public class QueryPlanBaseModel
+public class QueryPlanApiModel
 {
     [DataMember]
     public string? PlanName { get; set; }
@@ -18,12 +18,31 @@ public class QueryPlanBaseModel
     public string? EHRDescription { get; set; }
     [DataMember]
     public string? LookBack { get; set; }
+
     [DataMember, Required, MinDictionaryCount(1)]
     public Dictionary<string, IQueryConfig> InitialQueries { get; set; }
+
     [DataMember, Required, MinDictionaryCount(1)]
     public Dictionary<string, IQueryConfig> SupplementalQueries { get; set; }
+
     [IgnoreDataMember, JsonIgnore]
     public DateTime? CreateDate { get; set; }
     [IgnoreDataMember, JsonIgnore]
     public DateTime? ModifyDate { get; set; }
+
+    public bool Validate()
+    {
+        if (string.IsNullOrWhiteSpace(this.PlanName))
+            throw new ArgumentNullException(nameof(this.PlanName), "PlanName cannot be null or empty.");
+        if (this.Type is null)
+            throw new ArgumentNullException(nameof(this.Type), "Type is required.");
+        if (string.IsNullOrWhiteSpace(this.FacilityId))
+            throw new ArgumentNullException(nameof(this.FacilityId), "FacilityId is required.");
+        if (this.InitialQueries is null || !this.InitialQueries.Any())
+            throw new ArgumentNullException(nameof(this.InitialQueries), "InitialQueries is required.");
+        if (this.SupplementalQueries is null || !this.SupplementalQueries.Any())
+            throw new ArgumentNullException(nameof(this.SupplementalQueries), "SupplementalQueries is required.");
+
+        return true;
+    }
 }

DotNet/DataAcquisition.Domain/Application/Models/Http/QueryPlanPostModel.cs

@@ -302,8 +302,7 @@ public async Task<PagedConfigModel<DataAcquisitionLogModel>> SearchAsync(SearchD
         if (!string.IsNullOrEmpty(model.ResourceType))
         {
             query = (from l in query
-                     join q in _dbContext.FhirQueries on l.Id equals q.DataAcquisitionLogId into qGroup
-                     from q in qGroup.DefaultIfEmpty()
+                     join q in _dbContext.FhirQueries on l.Id equals q.DataAcquisitionLogId
                      where q.ResourceReferenceTypes.Any(r => r.ResourceType == model.ResourceType)
                      select l);
         }

DotNet/DataAcquisition.Domain/Application/Models/Http/QueryPlanPutModel.cs

@@ -56,7 +56,7 @@ public async Task<PagedConfigModel<QueryPlanModel>> SearchAsync(SearchQueryPlanM
     {
         ArgumentNullException.ThrowIfNull(model);
 
-        var query = _dbContext.QueryPlan.AsNoTracking().AsQueryable();
+        var query = _dbContext.QueryPlans.AsNoTracking().AsQueryable();
 
         if (!string.IsNullOrEmpty(model.FacilityId))
         {

DotNet/DataAcquisition.Domain/Application/Queries/DataAcquisitionLogQueries.cs

@@ -0,0 +1,35 @@
+using LantanaGroup.Link.DataAcquisition.Domain.Infrastructure.Interfaces;
+using LantanaGroup.Link.DataAcquisition.Domain.Infrastructure.Models.QueryConfig.Parameter;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace LantanaGroup.Link.DataAcquisition.Domain.Application.Serializers;
+
+public class ParameterConverter : JsonConverter<IParameter>
+{
+    public override IParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        using (JsonDocument doc = JsonDocument.ParseValue(ref reader))
+        {
+            if (!doc.RootElement.TryGetProperty("ParameterType", out JsonElement typeElement))
+            {
+                if (!doc.RootElement.TryGetProperty("parameterType", out typeElement))
+                {
+                    throw new JsonException("Missing ParameterType property.");
+                }
+            }
+            var configType = typeElement.GetString();
+            return configType switch
+            {
+                "Literal" => JsonSerializer.Deserialize<LiteralParameter>(doc.RootElement.GetRawText(), options),
+                "ResourceIds" => JsonSerializer.Deserialize<ResourceIdsParameter>(doc.RootElement.GetRawText(), options),
+                "Variable" => JsonSerializer.Deserialize<VariableParameter>(doc.RootElement.GetRawText(), options),
+                _ => throw new JsonException($"Unknown ParameterType: {configType}")
+            };
+        }
+    }
+    public override void Write(Utf8JsonWriter writer, IParameter value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(writer, value, value.GetType(), options);
+    }
+}

DotNet/DataAcquisition.Domain/Application/Queries/QueryPlanQueries.cs

@@ -0,0 +1,34 @@
+using LantanaGroup.Link.DataAcquisition.Domain.Infrastructure.Interfaces;
+using LantanaGroup.Link.DataAcquisition.Domain.Infrastructure.Models.QueryConfig;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace LantanaGroup.Link.DataAcquisition.Domain.Application.Serializers;
+
+public class QueryConfigConverter : JsonConverter<IQueryConfig>
+{
+    public override IQueryConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        using (JsonDocument doc = JsonDocument.ParseValue(ref reader))
+        {
+            if (!doc.RootElement.TryGetProperty("QueryConfigType", out JsonElement typeElement))
+            {
+                if (!doc.RootElement.TryGetProperty("queryConfigType", out typeElement))
+                {
+                    throw new JsonException("Missing QueryConfigType property.");
+                }
+            }
+            var configType = typeElement.GetString();
+            return configType switch
+            {
+                "Parameter" => JsonSerializer.Deserialize<ParameterQueryConfig>(doc.RootElement.GetRawText(), options),
+                "Reference" => JsonSerializer.Deserialize<ReferenceQueryConfig>(doc.RootElement.GetRawText(), options),
+                _ => throw new JsonException($"Unknown QueryConfigType: {configType}")
+            };
+        }
+    }
+    public override void Write(Utf8JsonWriter writer, IQueryConfig value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(writer, value, value.GetType(), options);
+    }
+}