last commit for 101

MasstransitDemo.Api/Controllers/NotificationController.cs

@@ -3,28 +3,28 @@
 using MasstransitDemo.Shared;
 using Microsoft.AspNetCore.Mvc;
 
-namespace MasstransitDemo.Api.Controllers
+namespace MasstransitDemo.Api.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class NotificationController : ControllerBase
 {
-    [Route("api/[controller]")]
-    [ApiController]
-    public class NotificationController : ControllerBase
+    public readonly IPublishEndpoint publishEndpoint;
+
+    public NotificationController(IPublishEndpoint publishEndpoint)
     {
-        public readonly IPublishEndpoint publishEndpoint;
+        this.publishEndpoint = publishEndpoint;
+    }
 
-        public NotificationController(IPublishEndpoint publishEndpoint)
-        {
-            this.publishEndpoint = publishEndpoint;
-        }
+    [HttpPost]
+    public async Task<IActionResult> Notify(NotificationDto notificationDto)
+    {
+        await publishEndpoint.Publish<INotificationCreated>(new {
+            NotificationDate = notificationDto.NotificationDate,
+            NotificationMessage = notificationDto.NotificationMessage,
+            NotificationType = notificationDto.NotificationType
+        });
 
-        [HttpPost]
-        public async Task Notify(NotificationModel model)
-        {
-            await publishEndpoint.Publish<INotificationSubmitted>(new NotificationSubmitted
-            {
-                NotificationDate = model.NotificationDate,
-                NotificationMessage = model.NotificationMessage,
-                NotificationType = model.NotificationType
-            });
-        }
+        return Ok();
     }
 }

MasstransitDemo.Api/Models/NotificationModel.cs → MasstransitDemo.Api/Models/NotificationDto.cs

@@ -2,7 +2,7 @@
 
 namespace MasstransitDemo.Api.Models
 {
-    public class NotificationModel
+    public class NotificationDto
     {
         public DateTime NotificationDate { get; set; }
         public string NotificationMessage { get; set; }

MasstransitDemo.Api/Program.cs

@@ -1,32 +1,22 @@
 using MassTransit;
-using MasstransitDemo.Api.Observers;
-using MasstransitDemo.Shared;
-using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllers();
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
-var services = builder.Services;
-
-services.AddSingleton<IPublishObserver, PublishObserver>();
-services.AddMassTransit(busConfigurator =>
+builder.Services.AddMassTransit(busConfigurator =>
 {
     busConfigurator.SetKebabCaseEndpointNameFormatter();
     busConfigurator.UsingRabbitMq((context, busFactoryConfigurator) =>
     {
         busFactoryConfigurator.Host("rabbitmq", hostConfigurator => { });
-
-        busFactoryConfigurator.ConnectPublishObserver(context.GetRequiredService<IPublishObserver>());
     });
-    //EndpointConvention.Map<INotificationSubmitted>(new Uri($"queue:{RabbitMQOptions.TransactionQueue}"));
 });
 
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment()) {
     app.UseSwagger();
     app.UseSwaggerUI();

MasstransitDemo.Api/Properties/launchSettings.json

@@ -11,7 +11,7 @@
   "profiles": {
     "MasstransitDemo.Api": {
       "commandName": "Project",
-      "launchBrowser": false,
+      "launchBrowser": true,
       "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -21,15 +21,15 @@
     },
     "IIS Express": {
       "commandName": "IISExpress",
-      "launchBrowser": false,
+      "launchBrowser": true,
       "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "Docker": {
       "commandName": "Docker",
-      "launchBrowser": false,
+      "launchBrowser": true,
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
       "publishAllPorts": false,
       "environmentVariables": {

MasstransitDemo.Consumer/NotificationCreatedConsumer.cs

@@ -0,0 +1,15 @@
+using MassTransit;
+using MasstransitDemo.Shared;
+using System.Text.Json;
+
+namespace MasstransitDemo.Consumer;
+
+public class NotificationCreatedConsumer : IConsumer<INotificationCreated>
+{
+    public async Task Consume(ConsumeContext<INotificationCreated> context)
+    {
+        var serializedMessage = JsonSerializer.Serialize(context.Message, new JsonSerializerOptions { });
+
+        Console.WriteLine($"NotificationCreated event consumed. Message: {serializedMessage}");
+    }
+}

MasstransitDemo.Consumer/Program.cs

@@ -1,31 +1,25 @@
 using MassTransit;
-using MasstransitDemo.Consumer;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System.Reflection;
 
 var builder = Host.CreateDefaultBuilder(args);
 
 builder.ConfigureServices((hostContext, services) =>
 {
-    services.AddSingleton<INotificationProcessor, NotificationProcessor>();
-    services.AddSingleton<IConsumeObserver, ConsumeObserver>();
     services.AddMassTransit(busConfigurator =>
     {
         var entryAssembly = Assembly.GetExecutingAssembly();
 
         busConfigurator.AddConsumers(entryAssembly);
         busConfigurator.UsingRabbitMq((context, busFactoryConfigurator) =>
         {
-            busConfigurator.SetKebabCaseEndpointNameFormatter();
-            busFactoryConfigurator.Host("rabbitmq", h => { });
+            busFactoryConfigurator.Host("rabbitmq", "/", h => { });
 
             busFactoryConfigurator.ConfigureEndpoints(context);
-            busFactoryConfigurator.ConnectConsumeObserver(context.GetRequiredService<IConsumeObserver>());
         });
     });
 });
 
 var app = builder.Build();
 
-app.Run();
+app.Run();

MasstransitDemo.Shared/INotificationCreated.cs

@@ -0,0 +1,8 @@
+namespace MasstransitDemo.Shared;
+
+public interface INotificationCreated
+{
+    DateTime NotificationDate { get; }
+    string NotificationMessage { get; }
+    NotificationType NotificationType { get; }
+}

MasstransitDemo.Shared/NotificationType.cs

@@ -1,9 +1,8 @@
-namespace MasstransitDemo.Shared
+namespace MasstransitDemo.Shared;
+
+public enum NotificationType
 {
-    public enum NotificationType
-    {
-        Email,
-        Push,
-        Sms
-    }
+    Email,
+    Push,
+    Sms
 }

docker-compose.yml

@@ -9,9 +9,11 @@ services:
     ports:
         - '7047:443'
         - '7048:80'     
+    depends_on:
+      - "rabbitmq"
 
   rabbitmq:
-    container_name: "rabbitmq"
+    container_name: "rabbitmqcontainer"
     image: rabbitmq:management
     hostname: "rabbitmq"
     ports:
@@ -24,5 +26,4 @@ services:
       context: .
       dockerfile: MasstransitDemo.Consumer/Dockerfile
     depends_on:
-      - "rabbitmq"
-
+      - "rabbitmq"