Shift tenant to streamId part of stream name

EventStore · Oct 14, 2021 · fabcf77 · fabcf77
1 parent 285a717
commit fabcf77
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/CQRS_Flow/.NET/Core/Core/Events/StreamNameMapper.cs b/CQRS_Flow/.NET/Core/Core/Events/StreamNameMapper.cs
@@ -29,12 +29,15 @@ public static string ToStreamPrefix(Type streamType) => Instance.typeNameMap.Get
         public static string ToStreamId<TStream>(object aggregateId, object? tenantId = null) =>
             ToStreamId(typeof(TStream), aggregateId);
 
+        // Generates a stream id in the canonical `{category}-{aggregateId}` format
         public static string ToStreamId(Type streamType, object aggregateId, object? tenantId = null)
         {
-            var tenantPrefix = tenantId != null ? $"{tenantId}_"  : "";
+            var tenantPrefix = tenantId == null ? $"{tenantId}_"  : "";
+            var category = ToStreamPrefix(streamType);
 
-            return $"{tenantPrefix}{ToStreamPrefix(streamType)}-{aggregateId}";
+            // (Out-of-the box, the category projection treats the category as the left bit, based on the `-` separator)
+            // For this reason, we place the "{tenantId}_" bit on the right hand side of the '-' if present
+            return $"{category}-{tenantPrefix}{aggregateId}";
         }
-
     }
 }