Merge pull request #304 from louisaxel-ambroise/fix-subscriptions

Fix subscriptions
louisaxel-ambroise · Feb 10, 2023 · b15679f · b15679f
2 parents 0be250a + e1fb221
commit b15679f
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 21 deletions.
diff --git a/src/FasTnT.Application/Database/EpcisModelConfiguration.cs b/src/FasTnT.Application/Database/EpcisModelConfiguration.cs
@@ -1,6 +1,5 @@
 using FasTnT.Application.Database;
 using FasTnT.Domain.Model;
-using FasTnT.Domain.Model.CustomQueries;
 using FasTnT.Domain.Model.Events;
 using FasTnT.Domain.Model.Masterdata;
 using FasTnT.Domain.Model.Queries;
@@ -279,7 +278,7 @@ public static void Apply(ModelBuilder modelBuilder)
         subscription.OwnsMany(x => x.Parameters, c =>
         {
             c.ToTable("SubscriptionParameter", Subscriptions);
-            c.Property<int>("SubscriptionId").IsRequired(true);
+            c.WithOwner().HasForeignKey("SubscriptionId");
             c.HasKey("SubscriptionId", nameof(QueryParameter.Name));
             c.Property(x => x.Values).IsRequired(false).HasJsonArrayConversion();
             c.Property(x => x.Name).HasMaxLength(256).IsRequired(true);
@@ -310,8 +309,8 @@ public static void Apply(ModelBuilder modelBuilder)
         storedQuery.OwnsMany(x => x.Parameters, c =>
         {
             c.ToTable("StoredQueryParameter", Queries);
-            c.Property<int>("QueryId");
-            c.HasKey("QueryId", nameof(StoredQueryParameter.Name));
+            c.WithOwner().HasForeignKey("QueryId");
+            c.HasKey("QueryId", nameof(QueryParameter.Name));
             c.Property(x => x.Values).IsRequired(false).HasJsonArrayConversion();
             c.Property(x => x.Name).HasMaxLength(256).IsRequired(true);
         });

diff --git a/src/FasTnT.Application/Handlers/QueriesHandler.cs b/src/FasTnT.Application/Handlers/QueriesHandler.cs
@@ -1,7 +1,6 @@
 using FasTnT.Application.Database;
 using FasTnT.Application.Services.Users;
 using FasTnT.Domain.Exceptions;
-using FasTnT.Domain.Model.CustomQueries;
 using FasTnT.Domain.Model.Queries;
 using FasTnT.Domain.Model.Subscriptions;
 using Microsoft.EntityFrameworkCore;

diff --git a/src/FasTnT.Application/Handlers/SubscriptionsHandler.cs b/src/FasTnT.Application/Handlers/SubscriptionsHandler.cs
@@ -52,7 +52,6 @@ public async Task<Subscription> GetSubscriptionDetailsAsync(string name, Cancell
         var subscription = await _context.Set<Subscription>()
             .AsNoTracking()
             .Where(x => x.Name == name)
-            .Include(x => x.Parameters)
             .FirstOrDefaultAsync(x => x.Name == name, cancellationToken);
 
         if (subscription is null)

diff --git a/src/FasTnT.Domain/FasTnT.Domain.csproj b/src/FasTnT.Domain/FasTnT.Domain.csproj
@@ -4,4 +4,7 @@
     <LangVersion>10</LangVersion>
 	  <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="Model\CustomQueries\" />
+  </ItemGroup>
 </Project>
diff --git a/src/FasTnT.Domain/Model/CustomQueries/StoredQueryParameter.cs b/src/FasTnT.Domain/Model/CustomQueries/StoredQueryParameter.cs
diff --git a/...in/Model/CustomQueries/QueryDefinition.cs → ...asTnT.Domain/Model/Queries/StoredQuery.cs b/...in/Model/CustomQueries/QueryDefinition.cs → ...asTnT.Domain/Model/Queries/StoredQuery.cs
@@ -1,9 +1,9 @@
-namespace FasTnT.Domain.Model.CustomQueries;
+namespace FasTnT.Domain.Model.Queries;
 
 public class StoredQuery
 {
     public int Id { get; set; }
     public string Name { get; set; }
     public string UserId { get; set; }
-    public List<StoredQueryParameter> Parameters { get; set; } = new();
+    public List<QueryParameter> Parameters { get; set; } = new();
 }
diff --git a/src/FasTnT.Host/Features/v2_0/Communication/Json/Parsers/JsonRequestParser.cs b/src/FasTnT.Host/Features/v2_0/Communication/Json/Parsers/JsonRequestParser.cs
@@ -1,4 +1,4 @@
-using FasTnT.Domain.Model.CustomQueries;
+using FasTnT.Domain.Model.Queries;
 using FasTnT.Domain.Model.Subscriptions;
 using FasTnT.Host.Features.v2_0.Subscriptions;
 using System.Text.Json;
@@ -51,9 +51,9 @@ private static SubscriptionSchedule ParseSubscriptionSchedule(JsonElement jsonEl
                 };
         }
 
-        private static List<StoredQueryParameter> ParseQueryParameters(JsonElement jsonElement)
+        private static List<QueryParameter> ParseQueryParameters(JsonElement jsonElement)
         {
-            var parameters = new List<StoredQueryParameter>();
+            var parameters = new List<QueryParameter>();
 
             if (jsonElement.ValueKind == JsonValueKind.Object)
             {

diff --git a/src/FasTnT.Host/Features/v2_0/Endpoints/Interfaces/CreateCustomQueryRequest.cs b/src/FasTnT.Host/Features/v2_0/Endpoints/Interfaces/CreateCustomQueryRequest.cs
@@ -1,4 +1,4 @@
-using FasTnT.Domain.Model.CustomQueries;
+using FasTnT.Domain.Model.Queries;
 using FasTnT.Host.Features.v2_0.Communication.Json.Parsers;
 
 namespace FasTnT.Host.Features.v2_0.Endpoints.Interfaces;

diff --git a/tests/FasTnT.Application.Tests/Queries/WhenHandlingGetQueryNamesQuery.cs b/tests/FasTnT.Application.Tests/Queries/WhenHandlingGetQueryNamesQuery.cs
@@ -2,7 +2,6 @@
 using FasTnT.Application.Handlers;
 using FasTnT.Application.Services.Users;
 using FasTnT.Application.Tests.Context;
-using FasTnT.Domain.Model.CustomQueries;
 using FasTnT.Domain.Model.Queries;
 
 namespace FasTnT.Application.Tests.Queries;