mixcore · nhathoang989 · Mar 14, 2023 · Mar 14, 2023
diff --git a/src/applications/Mixcore/Domain/Extensions/ServiceExtension.cs b/src/applications/Mixcore/Domain/Extensions/ServiceExtension.cs
@@ -1,5 +1,4 @@
-using Mixcore.Domain.Subscribers;
-using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Converters;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
 
@@ -8,15 +7,6 @@ namespace Microsoft.Extensions.DependencyInjection
     public static class ServiceExtension
     {
         #region Ocelot
-
-        public static void AddMixMvcServices(this IServiceCollection services)
-        {
-            services.AddHostedService<ThemeSubscriber>();
-            services.AddHostedService<TemplateSubscriber>();
-            services.AddHostedService<PageContentSubscriber>();
-            services.AddHostedService<TenantSubscriber>();
-            services.AddHostedService<DomainSubscriber>();
-        }
 
         public static void AddMixOcelot(this IServiceCollection services, IConfiguration configuration)
         {

diff --git a/src/applications/Mixcore/Domain/Subscribers/DomainSubscriber.cs b/src/applications/Mixcore/Domain/Subscribers/DomainSubscriber.cs
diff --git a/src/applications/Mixcore/Domain/Subscribers/PageContentSubscriber.cs b/src/applications/Mixcore/Domain/Subscribers/PageContentSubscriber.cs
diff --git a/src/applications/Mixcore/Domain/Subscribers/TemplateSubscriber.cs b/src/applications/Mixcore/Domain/Subscribers/TemplateSubscriber.cs
diff --git a/src/applications/Mixcore/Domain/Subscribers/TenantSubscriber.cs b/src/applications/Mixcore/Domain/Subscribers/TenantSubscriber.cs
diff --git a/src/applications/Mixcore/Domain/Subscribers/ThemeSubscriber.cs b/src/applications/Mixcore/Domain/Subscribers/ThemeSubscriber.cs
diff --git a/src/applications/Mixcore/Startup.cs b/src/applications/Mixcore/Startup.cs
@@ -30,9 +30,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddMixCors();
             services.AddScoped<MixNavigationService>();
 
-            // Queue Subscribers
-            services.AddMixMvcServices();
-
             services.AddMixAuthorize<MixCmsAccountContext>();
             services.AddMixRoutes();
 

diff --git a/src/applications/Mixcore/mixcore.csproj b/src/applications/Mixcore/mixcore.csproj
@@ -88,21 +88,25 @@
 		</EmbeddedResource>
 	</ItemGroup>
 	<ItemGroup>
+		<Compile Remove="Domain\Helpers\**" />
 		<Compile Remove="logs\**" />
 		<Compile Remove="MixContent\cache\**" />
 		<Compile Remove="MixContent\Templates\**" />
 		<Compile Remove="Models\Cms\**" />
+		<Content Remove="Domain\Helpers\**" />
 		<Content Remove="logs\**" />
 		<Content Remove="MixContent\cache\**" />
 		<Content Remove="MixContent\Templates\**" />
 		<Content Remove="Models\Cms\**" />
 		<Content Remove="wwwroot\mix-content\**" />
 		<EmbeddedResource Remove="..\..\shared\MixContent\**" />
+		<EmbeddedResource Remove="Domain\Helpers\**" />
 		<EmbeddedResource Remove="logs\**" />
 		<EmbeddedResource Remove="MixContent\cache\**" />
 		<EmbeddedResource Remove="MixContent\Templates\**" />
 		<EmbeddedResource Remove="Models\Cms\**" />
 		<EmbeddedResource Remove="wwwroot\mix-content\**" />
+		<None Remove="Domain\Helpers\**" />
 		<None Remove="logs\**" />
 		<None Remove="MixContent\cache\**" />
 		<None Remove="MixContent\Templates\**" />
@@ -114,8 +118,4 @@
 			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="Domain\Dtos\" />
-	  <Folder Include="Domain\Helpers\" />
-	</ItemGroup>
 </Project>
diff --git a/src/platform/mix.constant/Constants/MixQueueTopics.cs b/src/platform/mix.constant/Constants/MixQueueTopics.cs
@@ -3,6 +3,7 @@
     public class MixQueueTopics
     {
         public const string MixBackgroundTasks = "MixBackgroundTasks";
+        public const string MixViewModelChanged = "MixViewModelChanged";
         public const string MixRepoDb = "MixRepoDb";
     }
 }
diff --git a/src/platform/mix.library/Publishers/MixViewModelChangedPublisher.cs b/src/platform/mix.library/Publishers/MixViewModelChangedPublisher.cs
@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Configuration;
+using Mix.Queue.Engines;
+using Mix.Queue.Engines.MixQueue;
+
+namespace Mix.Lib.Publishers
+{
+    public class MixViewModelChangedPublisher : PublisherBase
+    {
+        private const string TopicId = MixQueueTopics.MixViewModelChanged;
+
+        public MixViewModelChangedPublisher(
+            IQueueService<MessageQueueModel> queueService,
+            IConfiguration configuration,
+            MixMemoryMessageQueue<MessageQueueModel> queueMessage)
+            : base(TopicId, queueService, configuration, queueMessage)
+        {
+        }
+    }
+}
diff --git a/src/platform/mix.library/Services/RestApiService.cs b/src/platform/mix.library/Services/RestApiService.cs
@@ -57,7 +57,7 @@ public virtual async Task<TPrimaryKey> CreateHandlerAsync(TView data, Cancellati
             data.CreatedBy = MixIdentityService.GetClaim(HttpContextAccessor.HttpContext!.User, MixClaims.Username);
             data.ModifiedBy = data.CreatedBy;
             var id = await data.SaveAsync(cancellationToken);
-            QueueService.PushMessage(data, MixRestAction.Post.ToString(), true);
+            QueueService.PushQueue(MixQueueTopics.MixViewModelChanged, MixRestAction.Put.ToString(), data);
             return id;
         }
 
@@ -72,7 +72,7 @@ public virtual async Task UpdateHandler(TPrimaryKey id, TView data, Cancellation
             data.SetUowInfo(Uow);
             await data.SaveAsync(cancellationToken);
             await CacheService.RemoveCacheAsync(id, Repository.CacheFolder, cancellationToken);
-            QueueService.PushMessage(data, MixRestAction.Put.ToString(), true);
+            QueueService.PushQueue(MixQueueTopics.MixViewModelChanged, MixRestAction.Put.ToString(), data);
         }
 
         public virtual async Task DeleteHandler(TView data, CancellationToken cancellationToken = default)
@@ -81,7 +81,7 @@ public virtual async Task DeleteHandler(TView data, CancellationToken cancellati
             data.SetUowInfo(Uow);
             await data.DeleteAsync(cancellationToken);
             await CacheService.RemoveCacheAsync(data.Id.ToString(), Repository.CacheFolder, cancellationToken);
-            QueueService.PushMessage(data, MixRestAction.Delete.ToString(), true);
+            QueueService.PushQueue(MixQueueTopics.MixViewModelChanged, MixRestAction.Put.ToString(), data);
         }
 
 
@@ -91,7 +91,7 @@ public virtual async Task PatchHandler(TPrimaryKey id, TView data, IEnumerable<E
             data.SetUowInfo(Uow);
             await data.SaveFieldsAsync(properties, cancellationToken);
             await CacheService.RemoveCacheAsync(id.ToString(), Repository.CacheFolder, cancellationToken);
-            QueueService.PushMessage(data, MixRestAction.Patch.ToString(), true);
+            QueueService.PushQueue(MixQueueTopics.MixViewModelChanged, MixRestAction.Put.ToString(), data);
         }
 
         public virtual async Task SaveManyHandler(List<TView> data, CancellationToken cancellationToken = default)

diff --git a/src/platform/mix.library/Startup/MixCommonService.cs b/src/platform/mix.library/Startup/MixCommonService.cs
@@ -34,6 +34,9 @@ private static IServiceCollection AddMixCommonServices(this IServiceCollection s
             services.TryAddScoped<EmailService>();
             services.TryAddScoped<IMixEdmService, MixEdmService>();
 
+            services.AddHostedService<MixViewModelChangedPublisher>();
+            services.AddHostedService<MixViewModelChangedSubscriber>();
+
             services.AddHostedService<MixBackgroundTaskPublisher>();
             services.AddHostedService<MixBackgroundTaskSubscriber>();
             return services;

diff --git a/src/platform/mix.library/Startup/Queue.cs b/src/platform/mix.library/Startup/Queue.cs
@@ -12,7 +12,7 @@ private static IServiceCollection AddQueues(this IServiceCollection services, As
 
             // Message Queue
             services.AddSingleton<IQueueService<MessageQueueModel>, QueueService>();
-            // Need singleton instance to store all message from mix publishers (inherit from MixPublisher)
+            // Need singleton instance to store all message from mix publishers
             services.AddSingleton<MixMemoryMessageQueue<MessageQueueModel>>();
             return services;
         }

diff --git a/...mix.library/Subscribers/Handlers/MixViewModelChangedHandlers/MixDomainViewModelHandler.cs b/...mix.library/Subscribers/Handlers/MixViewModelChangedHandlers/MixDomainViewModelHandler.cs
@@ -0,0 +1,31 @@
+using Mix.Lib.Interfaces;
+using Mix.Lib.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mix.Lib.Subscribers.Handlers.MixViewModelChangedHandlers
+{
+    public class MixDomainViewModelHandler
+    {
+        public static Task MessageQueueHandler(MessageQueueModel data, IMixTenantService mixTenantService)
+        {
+            switch (data.Action)
+            {
+                case "Get":
+                    break;
+                case "Post":
+                case "Put":
+                case "Patch":
+                case "Delete":
+                    return mixTenantService.Reload();
+                    break;
+                default:
+                    break;
+            }
+            return Task.CompletedTask;
+        }
+    }
+}