From 42c867ae10cd501a1cf0ff030464e070bf66db63 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Mon, 22 Jan 2024 01:37:19 +0300
Subject: [PATCH] Move rule service interfaces into OC.Rule.Services namespace
 (#13431)

---
 .../OrchardCore.Layers/Controllers/AdminController.cs           | 1 +
 .../OrchardCore.Layers/Controllers/LayerRuleController.cs       | 1 +
 src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs        | 1 +
 src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs | 1 +
 .../OrchardCore.Layers/Services/LayerFilter.cs                  | 1 +
 .../Drivers/ContentTypeConditionEvaluatorDriver.cs              | 1 +
 .../{ => Services}/IConditionIdGenerator.cs                     | 2 +-
 .../{ => Services}/IConditionOperatorResolver.cs                | 2 +-
 .../{ => Services}/IConditionResolver.cs                        | 0
 .../{ => Services}/IRuleMigrator.cs                             | 2 +-
 .../{ => Services}/IRuleService.cs                              | 2 +-
 11 files changed, 10 insertions(+), 4 deletions(-)
 rename src/OrchardCore/OrchardCore.Rules.Abstractions/{ => Services}/IConditionIdGenerator.cs (75%)
 rename src/OrchardCore/OrchardCore.Rules.Abstractions/{ => Services}/IConditionOperatorResolver.cs (80%)
 rename src/OrchardCore/OrchardCore.Rules.Abstractions/{ => Services}/IConditionResolver.cs (100%)
 rename src/OrchardCore/OrchardCore.Rules.Abstractions/{ => Services}/IRuleMigrator.cs (89%)
 rename src/OrchardCore/OrchardCore.Rules.Abstractions/{ => Services}/IRuleService.cs (77%)

diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs
index ed403a4fe3a..e920f6a6b50 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs
@@ -20,6 +20,7 @@
 using OrchardCore.Layers.Services;
 using OrchardCore.Layers.ViewModels;
 using OrchardCore.Rules;
+using OrchardCore.Rules.Services;
 using OrchardCore.Settings;
 using YesSql;
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/LayerRuleController.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/LayerRuleController.cs
index 8e24082a7cf..ccf78ea0186 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/LayerRuleController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/LayerRuleController.cs
@@ -12,6 +12,7 @@
 using OrchardCore.Layers.Services;
 using OrchardCore.Layers.ViewModels;
 using OrchardCore.Rules;
+using OrchardCore.Rules.Services;
 
 namespace OrchardCore.Layers.Controllers
 {
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs
index 141bbb9856e..5a8339d0399 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs
@@ -3,6 +3,7 @@
 using OrchardCore.Layers.Indexes;
 using OrchardCore.Layers.Services;
 using OrchardCore.Rules;
+using OrchardCore.Rules.Services;
 using YesSql.Sql;
 
 namespace OrchardCore.Layers
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs
index fd9988378c4..6dbe09a87f3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs
@@ -9,6 +9,7 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 using OrchardCore.Rules;
+using OrchardCore.Rules.Services;
 
 namespace OrchardCore.Layers.Recipes
 {
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs
index 7fd51cd5cca..02163c21e97 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs
@@ -16,6 +16,7 @@
 using OrchardCore.Layers.ViewModels;
 using OrchardCore.Mvc.Utilities;
 using OrchardCore.Rules;
+using OrchardCore.Rules.Services;
 
 namespace OrchardCore.Layers.Services
 {
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs
index 5023104f9fe..90c75dcc626 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs
@@ -7,6 +7,7 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Rules.Models;
+using OrchardCore.Rules.Services;
 
 namespace OrchardCore.Rules.Drivers
 {
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionIdGenerator.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionIdGenerator.cs
similarity index 75%
rename from src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionIdGenerator.cs
rename to src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionIdGenerator.cs
index 6c50fce9c62..3093018557a 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionIdGenerator.cs
@@ -1,4 +1,4 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules.Services
 {
     public interface IConditionIdGenerator
     {
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionOperatorResolver.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionOperatorResolver.cs
similarity index 80%
rename from src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionOperatorResolver.cs
rename to src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionOperatorResolver.cs
index 1bff73997e0..32c345771d2 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionOperatorResolver.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionOperatorResolver.cs
@@ -1,4 +1,4 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules.Services
 {
     public interface IConditionOperatorResolver
     {
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionResolver.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionResolver.cs
similarity index 100%
rename from src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionResolver.cs
rename to src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionResolver.cs
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/IRuleMigrator.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleMigrator.cs
similarity index 89%
rename from src/OrchardCore/OrchardCore.Rules.Abstractions/IRuleMigrator.cs
rename to src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleMigrator.cs
index 1bfac81b65f..8f67062ede9 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/IRuleMigrator.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleMigrator.cs
@@ -1,4 +1,4 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules.Services
 {
     /// <comment>
     /// Migrates existing script rules to rules.
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/IRuleService.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleService.cs
similarity index 77%
rename from src/OrchardCore/OrchardCore.Rules.Abstractions/IRuleService.cs
rename to src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleService.cs
index 746fcabd569..795ee50e3e1 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/IRuleService.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleService.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules.Services
 {
     public interface IRuleService
     {