(#123) Do not add Context Type if Pipebased

This is because the recived context will probably not be the same type as the pipe based type.
pardahlman · Feb 19, 2017 · 25db14d · 25db14d
1 parent 6601fbf
commit 25db14d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/RawRabbit.Enrichers.MessageContext.Subscribe/PipeContextExtensions.cs b/src/RawRabbit.Enrichers.MessageContext.Subscribe/PipeContextExtensions.cs
@@ -6,7 +6,7 @@ namespace RawRabbit.Enrichers.MessageContext.Subscribe
 {
 	public static class PipeContextExtensions
 	{
-		private const string PipebasedContextFunc = "PipebasedContextFunc";
+		public const string PipebasedContextFunc = "Subscribe:MessageContext:PipebasedContext";
 		private const string MessageContextType = "Subscribe:MessageContext:Type";
 
 		public static IPipeContext UseMessageContext(this IPipeContext context, Func<IPipeContext, object> contextFunc)

diff --git a/src/RawRabbit.Enrichers.MessageContext.Subscribe/SubscribeMessageContextExtension.cs b/src/RawRabbit.Enrichers.MessageContext.Subscribe/SubscribeMessageContextExtension.cs
@@ -63,10 +63,13 @@ public static Task<IPipeContext> SubscribeAsync<TMessage, TMessageContext>(
 					{
 						Func<object[], Task> genericHandler = args => subscribeMethod((TMessage)args[0], (TMessageContext)args[1]);
 
+						context?.Invoke(ctx);
 						ctx.Properties.Add(PipeKey.MessageType, typeof(TMessage));
-						ctx.AddMessageContextType<TMessageContext>();
+						if (!ctx.Properties.ContainsKey(PipeContextExtensions.PipebasedContextFunc))
+						{
+							ctx.AddMessageContextType<TMessageContext>();
+						}
 						ctx.Properties.Add(PipeKey.MessageHandler, genericHandler);
-						context?.Invoke(ctx);
 					}, token);
 		}
 	}