finished the prototype (webapi, signalr and blazor) #15

thangchung · thangchung · commit 0786bc1e3cea · 2018-09-20T16:56:54.000+07:00
diff --git a/samples/Contracts/Project.cs b/samples/Contracts/Project.cs
diff --git a/samples/Contracts/protos/project.proto b/samples/Contracts/protos/project.proto
@@ -5,6 +5,16 @@ package project.proto;
 import "google/protobuf/timestamp.proto";
 
 message ProjectCreatedMsg {
-  string Name = 1;
-  google.protobuf.Timestamp OccurredOn = 2;
+  string Key = 1;
+  string Id = 2;
+  string Name = 3;
+  google.protobuf.Timestamp OccurredOn = 4;
+}
+
+message TaskCreatedMsg {
+  string Key = 1;
+  string Id = 2;
+  string Title = 3;
+  string ProjectId = 4;
+  google.protobuf.Timestamp OccurredOn = 5;
 }
diff --git a/samples/SignalRNotifier/NetCoreKit.Samples.SignalRNotifier.csproj b/samples/SignalRNotifier/NetCoreKit.Samples.SignalRNotifier.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="MediatR" Version="5.1.0" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="5.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/SignalRNotifier/Services/Hubs/ProjectHub.cs b/samples/SignalRNotifier/Services/Hubs/ProjectHub.cs
@@ -37,7 +37,8 @@ public async Task Handle(Notifications.TaskCreated notification, CancellationTok
 
     protected override Task ExecuteAsync(CancellationToken cancellationToken)
     {
-      _eventBus.Subscribe<ProjectCreatedMsg>("project").Wait(cancellationToken);
+      Task.Run(() => _eventBus.Subscribe<ProjectCreatedMsg>("project-created"), cancellationToken);
+      Task.Run(() => _eventBus.Subscribe<TaskCreatedMsg>("task-created"), cancellationToken);
       return Task.CompletedTask;
     }
   }
diff --git a/samples/SignalRNotifier/Services/Notifications/ProjectCreated.cs b/samples/SignalRNotifier/Services/Notifications/ProjectCreated.cs
@@ -5,6 +5,7 @@ namespace NetCoreKit.Samples.SignalRNotifier.Services.Notifications
 {
   public class ProjectCreated : INotification
   {
+    public Guid Id { get; set; }
     public string Name { get; set; }
     public DateTime OccurredOn { get; set; }
   }
diff --git a/samples/SignalRNotifier/Services/Notifications/TaskCreated.cs b/samples/SignalRNotifier/Services/Notifications/TaskCreated.cs
@@ -5,7 +5,9 @@ namespace NetCoreKit.Samples.SignalRNotifier.Services.Notifications
 {
   public class TaskCreated : INotification
   {
+    public Guid Id { get; set; }
     public string Title { get; set; }
+    public Guid ProjectId { get; set; }
     public DateTime OccurredOn { get; set; }
   }
 }
diff --git a/samples/SignalRNotifier/Services/Profiles/ProjectProfile.cs b/samples/SignalRNotifier/Services/Profiles/ProjectProfile.cs
@@ -1,5 +1,6 @@
+using System;
 using AutoMapper;
-using NetCoreKit.Infrastructure.Mappers;
+using MediatR;
 using Project.Proto;
 
 namespace NetCoreKit.Samples.SignalRNotifier.Services.Profiles
@@ -8,8 +9,18 @@ public class ProjectProfile : Profile
   {
     public ProjectProfile()
     {
-      this.MapToNotification<ProjectCreatedMsg, Notifications.ProjectCreated>();
-      //this.MapToNotification<TaskCreated, Notifications.TaskCreated>();
+      // this.MapToNotification<ProjectCreatedMsg, Notifications.ProjectCreated>();
+      CreateMap<TaskCreatedMsg, Notifications.TaskCreated>()
+        .ForMember(x => x.Id, conf => conf.MapFrom(cg => new Guid(cg.Id)))
+        .ForMember(x => x.ProjectId, conf => conf.MapFrom(cg => new Guid(cg.ProjectId)))
+        .ForMember(x => x.OccurredOn, conf => conf.MapFrom(cg => cg.OccurredOn.ToDateTime()));
+
+      CreateMap<ProjectCreatedMsg, Notifications.ProjectCreated>()
+        .ForMember(x => x.Id, conf => conf.MapFrom(cg => new Guid(cg.Id)))
+        .ForMember(x => x.OccurredOn, conf => conf.MapFrom(cg => cg.OccurredOn.ToDateTime()));
+
+//      CreateMap<ProjectCreatedMsg, INotification>()
+//        .As<Notifications.ProjectCreated>();
     }
   }
 }
diff --git a/samples/TodoApi/Domain/Project.cs b/samples/TodoApi/Domain/Project.cs
@@ -15,7 +15,7 @@ private Project()
     private Project(string name)
     {
       Name = name;
-      AddEvent(new ProjectCreated(name));
+      AddEvent(new ProjectCreated(Id, name));
     }
 
     public string Name { get; private set; }
@@ -35,7 +35,7 @@ public Project ChangeName(string name)
     public Project AddTask(Task task)
     {
       Tasks.Add(task.SetProject(this));
-      AddEvent(new TaskCreated(task.Title));
+      AddEvent(new TaskCreated(task.Id, task.Title, Id));
       return this;
     }
 
diff --git a/samples/TodoApi/Domain/ProjectCreated.cs b/samples/TodoApi/Domain/ProjectCreated.cs
@@ -1,15 +1,18 @@
+using System;
 using MediatR;
 using NetCoreKit.Domain;
 
 namespace NetCoreKit.Samples.TodoAPI.Domain
 {
   public class ProjectCreated : EventBase, INotification
   {
-    public ProjectCreated(string name)
+    public ProjectCreated(Guid id, string name)
     {
+      Id = id;
       Name = name;
     }
 
+    public Guid Id { get; }
     public string Name { get; }
   }
 }
diff --git a/samples/TodoApi/Domain/TaskCreated.cs b/samples/TodoApi/Domain/TaskCreated.cs
@@ -1,13 +1,19 @@
+using System;
 using NetCoreKit.Domain;
 
 namespace NetCoreKit.Samples.TodoAPI.Domain
 {
   public class TaskCreated : EventBase
   {
-    public TaskCreated(string title)
+    public TaskCreated(Guid id, string title, Guid projectId)
     {
+      Id = id;
       Title = title;
+      ProjectId = projectId;
     }
+
+    public Guid Id { get; }
     public string Title { get; }
+    public Guid ProjectId { get; }
   }
 }
diff --git a/samples/TodoApi/Startup.cs b/samples/TodoApi/Startup.cs
@@ -17,9 +17,9 @@ public void ConfigureServices(IServiceCollection services)
       services.AddMiniService<TodoListDbContext>(
         svc =>
         {
-          // svc.AddEfSqlLiteDb();
-          svc.AddEfCoreMySqlDb();
-          svc.AddExternalSystemHealthChecks();
+          svc.AddEfSqlLiteDb();
+          //svc.AddEfCoreMySqlDb();
+          //svc.AddExternalSystemHealthChecks();
           svc.AddKafkaEventBus();
         },
         (svc, _) => { svc.AddScoped<IUserGateway, UserGateway>(); }
diff --git a/samples/TodoApi/v1/Services/EventSubscriber.cs b/samples/TodoApi/v1/Services/EventSubscriber.cs
@@ -0,0 +1,17 @@
+﻿using System.Threading;
+using MediatR;
+using NetCoreKit.Samples.TodoAPI.Domain;
+
+namespace NetCoreKit.Samples.TodoAPI.v1.Services
+{
+  public class EventSubscriber : INotificationHandler<ProjectCreated>
+  {
+    public async System.Threading.Tasks.Task Handle(ProjectCreated @event, CancellationToken cancellationToken)
+    {
+      // do something with @event
+      //...
+
+      await System.Threading.Tasks.Task.FromResult(@event);
+    }
+  }
+}
diff --git a/samples/TodoApi/v1/Services/KafkaEnvelopeEventHandler.cs b/samples/TodoApi/v1/Services/KafkaEnvelopeEventHandler.cs
@@ -0,0 +1,37 @@
+using System.Threading;
+using MediatR;
+using NetCoreKit.Infrastructure.Bus;
+using NetCoreKit.Infrastructure.Bus.Kafka;
+using NetCoreKit.Infrastructure.Mappers;
+using NetCoreKit.Samples.TodoAPI.Domain;
+using Project.Proto;
+using Task = System.Threading.Tasks.Task;
+
+namespace NetCoreKit.Samples.TodoAPI.v1.UseCases.CreateProject
+{
+  public class KafkaEnvelopeEventHandler : INotificationHandler<NotificationEnvelope>
+  {
+    private readonly IDispatchedEventBus _eventBus;
+
+    public KafkaEnvelopeEventHandler(IDispatchedEventBus eventBus)
+    {
+      _eventBus = eventBus;
+    }
+
+    public async Task Handle(NotificationEnvelope notify, CancellationToken cancellationToken)
+    {
+      if (notify.Event is ProjectCreated created)
+      {
+        await _eventBus.Publish(
+          created.MapTo<ProjectCreated, ProjectCreatedMsg>(),
+          "project-created");
+      }
+      else if(notify.Event is TaskCreated taskCreated)
+      {
+        await _eventBus.Publish(
+          taskCreated.MapTo<TaskCreated, TaskCreatedMsg>(),
+          "task-created");
+      }
+    }
+  }
+}
diff --git a/samples/TodoApi/v1/Services/ProjectProfile.cs b/samples/TodoApi/v1/Services/ProjectProfile.cs
@@ -0,0 +1,38 @@
+using AutoMapper;
+using Google.Protobuf.WellKnownTypes;
+using NetCoreKit.Samples.TodoAPI.Domain;
+using Project.Proto;
+
+namespace NetCoreKit.Samples.TodoAPI.v1.Services
+{
+  public class ProjectProfile : Profile
+  {
+    public ProjectProfile()
+    {
+      CreateMap<ProjectCreated, ProjectCreatedMsg>()
+        .ForMember(
+          x => x.Key,
+          conf => conf.MapFrom(cg => cg.GetType().Name))
+        .ForMember(
+          x => x.Id,
+          conf => conf.MapFrom(cg => cg.Id.ToString()))
+        .ForMember(
+          x => x.OccurredOn,
+          conf => conf.MapFrom(cg => Timestamp.FromDateTime(cg.OccurredOn)));
+
+      CreateMap<TaskCreated, TaskCreatedMsg>()
+        .ForMember(
+          x => x.Key,
+          conf => conf.MapFrom(cg => cg.GetType().Name))
+        .ForMember(
+          x => x.Id,
+          conf => conf.MapFrom(cg => cg.Id.ToString()))
+        .ForMember(
+          x => x.ProjectId,
+          conf => conf.MapFrom(cg => cg.ProjectId.ToString()))
+        .ForMember(
+          x => x.OccurredOn,
+          conf => conf.MapFrom(cg => Timestamp.FromDateTime(cg.OccurredOn)));
+    }
+  }
+}
diff --git a/samples/TodoApi/v1/UseCases/CreateProject/RequestHandler.cs b/samples/TodoApi/v1/UseCases/CreateProject/RequestHandler.cs
@@ -2,13 +2,7 @@
 using System.Threading.Tasks;
 using MediatR;
 using NetCoreKit.Domain;
-using NetCoreKit.Infrastructure.Bus;
-using NetCoreKit.Infrastructure.Bus.Kafka;
-using NetCoreKit.Infrastructure.Mappers;
-using NetCoreKit.Samples.TodoAPI.Domain;
 using NetCoreKit.Samples.TodoAPI.Extensions;
-using Project.Proto;
-using Task = System.Threading.Tasks.Task;
 
 namespace NetCoreKit.Samples.TodoAPI.v1.UseCases.CreateProject
 {
@@ -31,33 +25,4 @@ public async Task<CreateProjectResponse> Handle(CreateProjectRequest request,
       return new CreateProjectResponse {Result = result.ToDto()};
     }
   }
-
-  public class KafkaEnvelopeEventHandler : INotificationHandler<NotificationEnvelope>
-  {
-    private readonly IDispatchedEventBus _eventBus;
-
-    public KafkaEnvelopeEventHandler(IDispatchedEventBus eventBus)
-    {
-      _eventBus = eventBus;
-    }
-
-    public async Task Handle(NotificationEnvelope notify, CancellationToken cancellationToken)
-    {
-      if (!(notify.Event is ProjectCreated)) return;
-
-      var msg = notify.Event.MapTo<IEvent, ProjectCreatedMsg>();
-      await _eventBus.Publish(msg, "project");
-    }
-  }
-
-  public class EventSubscriber : INotificationHandler<ProjectCreated>
-  {
-    public async System.Threading.Tasks.Task Handle(ProjectCreated @event, CancellationToken cancellationToken)
-    {
-      // do something with @event
-      //...
-
-      await System.Threading.Tasks.Task.FromResult(@event);
-    }
-  }
 }
diff --git a/samples/WebNotifier/Env/config.prod.json b/samples/WebNotifier/Env/config.prod.json
@@ -1,3 +1,3 @@
 {
-  "SignalR_Base_Url": "http://localhost:35002"
+  "SignalRBaseUrl": "http://localhost:35002"
 }
diff --git a/samples/WebNotifier/NetCoreKit.Samples.WebNotifier.csproj b/samples/WebNotifier/NetCoreKit.Samples.WebNotifier.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -14,12 +14,11 @@
     <PackageReference Include="Blazor.Extensions.SignalR" Version="0.1.5" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.5.1" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.5.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
     <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.5.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Env\config.dev.json" Condition="'$(Configuration)' == 'Debug'">
+    <EmbeddedResource Include=".\Env\config.dev.json" Condition="'$(Configuration)' == 'Debug'">
       <LogicalName>config.json</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include=".\Env\config.prod.json" Condition="'$(Configuration)' == 'Release'">
diff --git a/samples/WebNotifier/Pages/Notification.cshtml b/samples/WebNotifier/Pages/Notification.cshtml
@@ -1,12 +1,30 @@
 @using Blazor.Extensions
 @page "/notification"
 @inherits WebNotifier.Pages.NotificationComponent
-
-<h1>Notification.</h1>
-
-<ul id="message-list">
-  @foreach (var msg in Messages)
+<h3>Notification:</h3>
+@if (Messages.Count <= 0)
+{
+  <p>N/A</p>
+}
+<ul>
+  @foreach (var m in Messages)
   {
-    <li>@msg</li>
+    <li>@m</li>
   }
 </ul>
+
+<h3>Projects:</h3>
+@if (Projects.Count <= 0)
+{
+  <p>N/A</p>
+}
+@foreach (var p in Projects)
+{
+  <h5>@p.Name #@p.Id</h5>
+  <ul>
+    @foreach (var t in p.Tasks)
+    {
+      <li>@t.Title #@t.Id</li>
+    }
+  </ul>
+}
diff --git a/samples/WebNotifier/Pages/NotificationComponent.cs b/samples/WebNotifier/Pages/NotificationComponent.cs
diff --git a/samples/WebNotifier/Startup.cs b/samples/WebNotifier/Startup.cs
diff --git a/src/NetCoreKit.Infrastructure.Bus.Kafka/DispatchedEventBus.cs b/src/NetCoreKit.Infrastructure.Bus.Kafka/DispatchedEventBus.cs

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ public async Task Handle(Notifications.TaskCreated notification, CancellationTok`
`37`	`37`
`38`	`38`	`protected override Task ExecuteAsync(CancellationToken cancellationToken)`
`39`	`39`	`{`
`40`		`- _eventBus.Subscribe<ProjectCreatedMsg>("project").Wait(cancellationToken);`
	`40`	`+ Task.Run(() => _eventBus.Subscribe<ProjectCreatedMsg>("project-created"), cancellationToken);`
	`41`	`+ Task.Run(() => _eventBus.Subscribe<TaskCreatedMsg>("task-created"), cancellationToken);`
`41`	`42`	`return Task.CompletedTask;`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ namespace NetCoreKit.Samples.SignalRNotifier.Services.Notifications`
`5`	`5`	`{`
`6`	`6`	`public class ProjectCreated : INotification`
`7`	`7`	`{`
	`8`	`+ public Guid Id { get; set; }`
`8`	`9`	`public string Name { get; set; }`
`9`	`10`	`public DateTime OccurredOn { get; set; }`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@ namespace NetCoreKit.Samples.SignalRNotifier.Services.Notifications`
`5`	`5`	`{`
`6`	`6`	`public class TaskCreated : INotification`
`7`	`7`	`{`
	`8`	`+ public Guid Id { get; set; }`
`8`	`9`	`public string Title { get; set; }`
	`10`	`+ public Guid ProjectId { get; set; }`
`9`	`11`	`public DateTime OccurredOn { get; set; }`
`10`	`12`	`}`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
	`1`	`+using System;`
`1`	`2`	`using AutoMapper;`
`2`		`-using NetCoreKit.Infrastructure.Mappers;`
	`3`	`+using MediatR;`
`3`	`4`	`using Project.Proto;`
`4`	`5`
`5`	`6`	`namespace NetCoreKit.Samples.SignalRNotifier.Services.Profiles`
`@@ -8,8 +9,18 @@ public class ProjectProfile : Profile`
`8`	`9`	`{`
`9`	`10`	`public ProjectProfile()`
`10`	`11`	`{`
`11`		`- this.MapToNotification<ProjectCreatedMsg, Notifications.ProjectCreated>();`
`12`		`- //this.MapToNotification<TaskCreated, Notifications.TaskCreated>();`
	`12`	`+ // this.MapToNotification<ProjectCreatedMsg, Notifications.ProjectCreated>();`
	`13`	`+ CreateMap<TaskCreatedMsg, Notifications.TaskCreated>()`
	`14`	`+ .ForMember(x => x.Id, conf => conf.MapFrom(cg => new Guid(cg.Id)))`
	`15`	`+ .ForMember(x => x.ProjectId, conf => conf.MapFrom(cg => new Guid(cg.ProjectId)))`
	`16`	`+ .ForMember(x => x.OccurredOn, conf => conf.MapFrom(cg => cg.OccurredOn.ToDateTime()));`
	`17`	`+`
	`18`	`+ CreateMap<ProjectCreatedMsg, Notifications.ProjectCreated>()`
	`19`	`+ .ForMember(x => x.Id, conf => conf.MapFrom(cg => new Guid(cg.Id)))`
	`20`	`+ .ForMember(x => x.OccurredOn, conf => conf.MapFrom(cg => cg.OccurredOn.ToDateTime()));`
	`21`	`+`
	`22`	`+// CreateMap<ProjectCreatedMsg, INotification>()`
	`23`	`+// .As<Notifications.ProjectCreated>();`
`13`	`24`	`}`
`14`	`25`	`}`
`15`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ private Project()`
`15`	`15`	`private Project(string name)`
`16`	`16`	`{`
`17`	`17`	`Name = name;`
`18`		`- AddEvent(new ProjectCreated(name));`
	`18`	`+ AddEvent(new ProjectCreated(Id, name));`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public string Name { get; private set; }`
`@@ -35,7 +35,7 @@ public Project ChangeName(string name)`
`35`	`35`	`public Project AddTask(Task task)`
`36`	`36`	`{`
`37`	`37`	`Tasks.Add(task.SetProject(this));`
`38`		`- AddEvent(new TaskCreated(task.Title));`
	`38`	`+ AddEvent(new TaskCreated(task.Id, task.Title, Id));`
`39`	`39`	`return this;`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,18 @@`
	`1`	`+using System;`
`1`	`2`	`using MediatR;`
`2`	`3`	`using NetCoreKit.Domain;`
`3`	`4`
`4`	`5`	`namespace NetCoreKit.Samples.TodoAPI.Domain`
`5`	`6`	`{`
`6`	`7`	`public class ProjectCreated : EventBase, INotification`
`7`	`8`	`{`
`8`		`- public ProjectCreated(string name)`
	`9`	`+ public ProjectCreated(Guid id, string name)`
`9`	`10`	`{`
	`11`	`+ Id = id;`
`10`	`12`	`Name = name;`
`11`	`13`	`}`
`12`	`14`
	`15`	`+ public Guid Id { get; }`
`13`	`16`	`public string Name { get; }`
`14`	`17`	`}`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,19 @@`
	`1`	`+using System;`
`1`	`2`	`using NetCoreKit.Domain;`
`2`	`3`
`3`	`4`	`namespace NetCoreKit.Samples.TodoAPI.Domain`
`4`	`5`	`{`
`5`	`6`	`public class TaskCreated : EventBase`
`6`	`7`	`{`
`7`		`- public TaskCreated(string title)`
	`8`	`+ public TaskCreated(Guid id, string title, Guid projectId)`
`8`	`9`	`{`
	`10`	`+ Id = id;`
`9`	`11`	`Title = title;`
	`12`	`+ ProjectId = projectId;`
`10`	`13`	`}`
	`14`	`+`
	`15`	`+ public Guid Id { get; }`
`11`	`16`	`public string Title { get; }`
	`17`	`+ public Guid ProjectId { get; }`
`12`	`18`	`}`
`13`	`19`	`}`