clean up code smells

J-Tech-Japan · Jan 24, 2025 · 5c8a7f1 · 5c8a7f1
1 parent 370c91b
commit 5c8a7f1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 33 deletions.
diff --git a/src/Sekiban.Infrastructure.IndexedDb/Databases/DbEventQuery.cs b/src/Sekiban.Infrastructure.IndexedDb/Databases/DbEventQuery.cs
@@ -5,53 +5,54 @@ namespace Sekiban.Infrastructure.IndexedDb.Databases;
 
 public record DbEventQuery
 {
-    public string? RootPartitionKey { get; init; }
-    public string? PartitionKey { get; init; }
-    public string[]? AggregateTypes { get; init; }
-    public string? SortableIdStart { get; init; }
-    public string? SortableIdEnd { get; init; }
+    public string? RootPartitionKey { get; private set; }
+    public string? PartitionKey { get; private set; }
+    public string[]? AggregateTypes { get; private set; }
+    public string? SortableIdStart { get; private set; }
+    public string? SortableIdEnd { get; private set; }
 
-    public int? MaxCount { get; init; }
+    public int? MaxCount { get; private set; }
 
     public static DbEventQuery FromEventRetrievalInfo(EventRetrievalInfo eventRetrievalInfo)
     {
-        var query = eventRetrievalInfo.GetIsPartition() ?
-            new DbEventQuery
+        var query = new DbEventQuery();
+
+        if (eventRetrievalInfo.GetIsPartition())
+        {
+            query.PartitionKey = eventRetrievalInfo.GetPartitionKey().UnwrapBox();
+        }
+        else
+        {
+            if (eventRetrievalInfo.HasRootPartitionKey())
             {
-                PartitionKey = eventRetrievalInfo.GetPartitionKey().UnwrapBox(),
-            } :
-            new DbEventQuery
+                query.RootPartitionKey = eventRetrievalInfo.RootPartitionKey.GetValue();
+            }
+
+            if (eventRetrievalInfo.HasAggregateStream())
             {
-                RootPartitionKey = eventRetrievalInfo.HasRootPartitionKey() ? eventRetrievalInfo.RootPartitionKey.GetValue() : null,
-                AggregateTypes = eventRetrievalInfo.HasAggregateStream() ? eventRetrievalInfo.AggregateStream.GetValue().GetStreamNames().ToArray() : null,
-            };
+                query.AggregateTypes = eventRetrievalInfo.AggregateStream.GetValue().GetStreamNames().ToArray();
+            }
+        }
 
-        query = query with
+        if (eventRetrievalInfo.MaxCount.HasValue)
         {
-            MaxCount = eventRetrievalInfo.MaxCount.HasValue ? eventRetrievalInfo.MaxCount.GetValue() : null,
-        };
+            query.MaxCount = eventRetrievalInfo.MaxCount.GetValue();
+        }
 
         switch (eventRetrievalInfo.SortableIdCondition)
         {
             case SortableIdConditionNone:
                 break;
 
             case SinceSortableIdCondition since:
-                query = query with
-                {
-                    SortableIdStart = since.SortableUniqueId,
-                };
+                query.SortableIdStart = since.SortableUniqueId;
                 break;
 
             case BetweenSortableIdCondition between:
-                query = query with
-                {
-                    SortableIdStart = between.Start,
-                    SortableIdEnd = between.End,
-                };
+                query.SortableIdStart = between.Start;
+                query.SortableIdEnd = between.End;
                 break;
 
-
             default:
                 throw new NotImplementedException("unknown ISortableIdCondition");
         }

diff --git a/src/Sekiban.Infrastructure.IndexedDb/SekibanIndexedDbOption.cs b/src/Sekiban.Infrastructure.IndexedDb/SekibanIndexedDbOption.cs
@@ -7,12 +7,6 @@ public class SekibanIndexedDbOption
 {
     public const string DatabaseNameDefaultValue = "sekiban";
 
-    // public const string EventsStoreName = "events";
-    // public const string EventsStoreDissolvableName = "dissolvable-events";
-    // public const string CommandStoreName = "commands";
-    // public const string SingleProjectionSnapshotStoreName = "single-projection-snapshots";
-    // public const string MultiProjectionSnapshotStoreName = "multi-projection-snapshots";
-
     public string Context { get; init; } = SekibanContext.Default;
     public string DatabaseName { get; init; } = DatabaseNameDefaultValue;