Subscription Refinements (#1547)

src/Core/Subscriptions.InMemory/DependencyInjection/InMemorySubscriptionServiceCollectionExtensions.cs

@@ -16,9 +16,9 @@ public static IServiceCollection AddInMemorySubscriptions(
             }
 
             services.AddSingleton<InMemoryPubSub>();
-            services.AddSingleton<IEventDispatcher>(sp =>
+            services.AddSingleton<ITopicEventSender>(sp =>
                 sp.GetRequiredService<InMemoryPubSub>());
-            services.AddSingleton<IEventTopicObserver>(sp =>
+            services.AddSingleton<ITopicEventReceiver>(sp =>
                 sp.GetRequiredService<InMemoryPubSub>());
             return services;
         }

src/Core/Subscriptions.InMemory/InMemoryPubSub.cs

@@ -7,8 +7,8 @@
 namespace HotChocolate.Subscriptions.InMemory
 {
     public class InMemoryPubSub
-        : IEventTopicObserver
-        , IEventDispatcher
+        : ITopicEventReceiver
+        , ITopicEventSender
     {
         private readonly ConcurrentDictionary<object, IEventTopic> _topics =
             new ConcurrentDictionary<object, IEventTopic>();

src/Core/Subscriptions.Redis.Tests/RedisIntegrationTests.cs

@@ -15,7 +15,7 @@ public class RedisIntegrationTests
         : IClassFixture<RedisResource>
     {
         private readonly ConnectionMultiplexer _connection;
-        private readonly IEventDispatcher _sender;
+        private readonly ITopicEventSender _sender;
 
         public RedisIntegrationTests(RedisResource redisResource)
         {
@@ -47,7 +47,7 @@ public Task Subscribe()
                         .Field(name)
                         .Resolver("baz")
                         .Subscribe(async ctx =>
-                            await ctx.Service<IEventTopicObserver>()
+                            await ctx.Service<ITopicEventReceiver>()
                                 .SubscribeAsync<string, string>("foo", ctx.RequestAborted)))
                     .Create()
                     .MakeExecutable();

src/Core/Subscriptions.Redis/DependencyInjection/RedisSubscriptionServiceCollectionExtensions.cs

@@ -41,9 +41,9 @@ private static IServiceCollection AddServices(
         {
             services
                 .AddSingleton<RedisPubSub>()
-                .AddSingleton<IEventDispatcher>(sp =>
+                .AddSingleton<ITopicEventSender>(sp =>
                     sp.GetRequiredService<RedisPubSub>())
-                .AddSingleton<IEventTopicObserver>(sp =>
+                .AddSingleton<ITopicEventReceiver>(sp =>
                     sp.GetRequiredService<RedisPubSub>());
             return services;
         }

src/Core/Subscriptions.Redis/RedisPubSub.cs

@@ -6,8 +6,8 @@
 namespace HotChocolate.Subscriptions.Redis
 {
     public class RedisPubSub
-        : IEventTopicObserver
-        , IEventDispatcher
+        : ITopicEventReceiver
+        , ITopicEventSender
     {
         private readonly IConnectionMultiplexer _connection;
         public const string Completed = "{completed}";

src/Core/Subscriptions.Tests/InMemorySubscriptionTests.cs

@@ -150,7 +150,7 @@ public class MutationRoot
         {
             public async Task<string> FooAsync(
                 string a,
-                [Service]IEventDispatcher eventDispatcher,
+                [Service]ITopicEventSender eventDispatcher,
                 CancellationToken cancellationToken)
             {
                 await eventDispatcher.SendAsync("foo", a);
@@ -160,19 +160,19 @@ public async Task<string> FooAsync(
 
         public class SubscriptionRoot
         {
-            [Subscribe]
+            [SubscribeAndResolve]
             public async Task<IAsyncEnumerable<string>> OnFooAsync(
-                [Service]IEventTopicObserver eventTopicObserver,
+                [Service]ITopicEventReceiver eventTopicObserver,
                 CancellationToken cancellationToken)
             {
                 return await eventTopicObserver.SubscribeAsync<string, string>(
                     "foo", cancellationToken);
             }
 
-            [Subscribe]
+            [SubscribeAndResolve]
             public async Task<IAsyncEnumerable<string>> OnBarAsync(
                 string topic,
-                [Service]IEventTopicObserver eventTopicObserver,
+                [Service]ITopicEventReceiver eventTopicObserver,
                 CancellationToken cancellationToken)
             {
                 return await eventTopicObserver.SubscribeAsync<string, string>(

src/Core/Subscriptions/IEventTopicObserver.cs → src/Core/Subscriptions/ITopicEventReceiver.cs

@@ -6,11 +6,11 @@
 namespace HotChocolate.Subscriptions
 {
     /// <summary>
-    /// The <see cref="IEventTopicObserver" /> creates subscription to
-    /// a specific event topic and returns an <see cref="IEventStream{TMessage}" />
+    /// The <see cref="ITopicEventReceiver" /> creates subscriptions to
+    /// specific event topics and returns an <see cref="IEventStream{TMessage}" />
     /// which represents a stream of event message for the specified topic.
     /// </summary>
-    public interface IEventTopicObserver
+    public interface ITopicEventReceiver
     {
         /// <summary>
         /// Subscribes to the specified event <paramref name="topic" />.

src/Core/Subscriptions/IEventDispatcher.cs → src/Core/Subscriptions/ITopicEventSender.cs

@@ -6,11 +6,11 @@
 namespace HotChocolate.Subscriptions
 {
     /// <summary>
-    /// The event dispatcher sends event messages to the pub/sub-system.
+    /// The topic event sender sends event messages to the pub/sub-system.
     /// Typically a mutation would use the event dispatcher to raise events
     /// after some changes were committed to the backend system.
     /// </summary>
-    public interface IEventDispatcher
+    public interface ITopicEventSender
     {
         /// <summary>
         /// Sends an event message to the pub/sub-system.

src/Core/Types.Tests/Types/ObjectTypeTests.cs

@@ -1513,6 +1513,18 @@ public void Infer_Argument_Default_Values()
             schema.ToString().MatchSnapshot();
         }
 
+        [Fact]
+        public void Combine_Subscribe_And_Resolve_Into_One_Field()
+        {
+            ISchema schema = SchemaBuilder.New()
+                .AddQueryType(c => c.Name("Query"))
+                .AddSubscriptionType<SubscriptionWithSubscribe>()
+                .Use(next => context => Task.CompletedTask)
+                .Create();
+
+            schema.ToString().MatchSnapshot();
+        }
+
         public class GenericFoo<T>
         {
             public T Value { get; }
@@ -1666,5 +1678,19 @@ public string Field2(
                 [DefaultValue(null)]string a,
                 [DefaultValue("abc")]string b) => null;
         }
+
+        public class SubscriptionWithSubscribe
+        {
+            [Subscribe(nameof(OnFoo))]
+            public IAsyncEnumerable<string> SubscribeToFoo()
+            {
+                throw new NotImplementedException();
+            }
+
+            public string OnFoo()
+            {
+                throw new NotImplementedException();
+            }
+        }
     }
 }