From bb3e89b85f4cb4a58580d7a491a83afc74218b88 Mon Sep 17 00:00:00 2001
From: Aaron Chong <aaronjhchong@hotmail.com>
Date: Thu, 18 Feb 2021 02:10:52 +0800
Subject: [PATCH] Remove existing controllers if expose service self

---
 .../Mvc/Conventions/AbpServiceConvention.cs    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
index 4d1490ec40..f2367e08ae 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
@@ -73,7 +73,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
 
         protected virtual void RemoveDuplicateControllers(ApplicationModel application)
         {
-            var derivedControllerModels = new List<ControllerModel>();
+            var controllerModelsToRemove = new List<ControllerModel>();
 
             foreach (var controllerModel in application.Controllers)
             {
@@ -87,6 +87,18 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
                     continue;
                 }
 
+                var exposeServicesAttr = ReflectionHelper.GetSingleAttributeOrDefault<ExposeServicesAttribute>(controllerModel.ControllerType);
+                if (exposeServicesAttr.IncludeSelf)
+                {
+                    var existingControllerModels = application.Controllers
+                        .Where(cm => exposeServicesAttr.ServiceTypes.Contains(cm.ControllerType))
+                        .ToArray();
+
+                    controllerModelsToRemove.AddRange(existingControllerModels);
+                    Logger.LogInformation($"Removing the controller{(existingControllerModels.Length > 1 ? "s" : "")} {exposeServicesAttr.ServiceTypes.Select(c => c.AssemblyQualifiedName).JoinAsString(", ")} from the application model since {(existingControllerModels.Length > 1 ? "they are" : "it is")} replaced by the controller: {controllerModel.ControllerType.AssemblyQualifiedName}");
+                    continue;
+                }
+
                 var baseControllerTypes = controllerModel.ControllerType
                     .GetBaseClasses(typeof(Controller), includeObject: false)
                     .Where(t => !t.IsAbstract)
@@ -94,12 +106,12 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
 
                 if (baseControllerTypes.Length > 0)
                 {
-                    derivedControllerModels.Add(controllerModel);
+                    controllerModelsToRemove.Add(controllerModel);
                     Logger.LogInformation($"Removing the controller {controllerModel.ControllerType.AssemblyQualifiedName} from the application model since it replaces the controller(s): {baseControllerTypes.Select(c => c.AssemblyQualifiedName).JoinAsString(", ")}");
                 }
             }
 
-            application.Controllers.RemoveAll(derivedControllerModels);
+            application.Controllers.RemoveAll(controllerModelsToRemove);
         }
 
         protected virtual void ConfigureRemoteService(ControllerModel controller, [CanBeNull] ConventionalControllerSetting configuration)