Improve Omnichannel Activity Managements (#472)

Author: MikeAlhayek

src/Abstractions/CrestApps.OrchardCore.ContentTransfer.Abstractions/IContentImportRowFilter.cs

@@ -1,8 +1,5 @@
 #nullable enable
 
-using System.Data;
-using OrchardCore.ContentManagement.Metadata.Models;
-
 namespace CrestApps.OrchardCore.ContentTransfer;
 
 /// <summary>

src/Core/CrestApps.OrchardCore.ContentTransfer.Core/Models/ImportContentOptionsPart.cs

@@ -8,5 +8,5 @@ public sealed class ImportContentOptionsPart
     /// <summary>
     /// Gets or sets a value indicating whether imported content should be published after it is saved.
     /// </summary>
-    public bool PublishImportedContent { get; set; }
+    public bool PublishImportedContent { get; set; } = true;
 }

src/Core/CrestApps.OrchardCore.Omnichannel.Core/Models/BulkManageActivityFilter.cs

@@ -63,6 +63,40 @@ public sealed class BulkManageActivityFilter : Entity
     /// </summary>
     public ActivityUrgencyLevel? UrgencyLevel { get; set; }
 
+    /// <summary>
+    /// Gets or sets the maximum number of records to retrieve.
+    /// When <see langword="null"/>, no limit is applied beyond normal pagination.
+    /// </summary>
+    public int? Limit { get; set; }
+
+    /// <summary>
+    /// Gets or sets the phone number to search for in contact records.
+    /// The value should be in E.164 format (e.g., +17025551234).
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// Gets or sets the match type for the phone number filter.
+    /// </summary>
+    public PhoneNumberMatchType PhoneNumberMatchType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the time zone identifiers to filter contacts by.
+    /// </summary>
+    public string[] TimeZoneIds { get; set; }
+
+    /// <summary>
+    /// Gets or sets the earliest Do Not Call date to filter by.
+    /// Matches contacts whose Do Not Call date is on or after this value.
+    /// </summary>
+    public DateTime? DoNotCallFrom { get; set; }
+
+    /// <summary>
+    /// Gets or sets the latest Do Not Call date to filter by.
+    /// Matches contacts whose Do Not Call date is on or before this value.
+    /// </summary>
+    public DateTime? DoNotCallTo { get; set; }
+
     /// <summary>
     /// Gets or sets the route values for preserving filter state during pagination.
     /// </summary>

src/Core/CrestApps.OrchardCore.Omnichannel.Core/Models/OmnichannelActivityBatch.cs

@@ -114,6 +114,38 @@ public sealed class OmnichannelActivityBatch : CatalogItem, IDisplayTextAwareMod
     /// </summary>
     public bool OnlyPublishedLeads { get; set; } = true;
 
+    /// <summary>
+    /// Gets or sets the maximum number of leads to load into the batch.
+    /// When <see langword="null"/>, all matching leads are loaded.
+    /// </summary>
+    public int? Limit { get; set; }
+
+    /// <summary>
+    /// Gets or sets the phone number to filter leads by.
+    /// The value should be in E.164 format (e.g., +17025551234).
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// Gets or sets the match type for the phone number filter.
+    /// </summary>
+    public PhoneNumberMatchType PhoneNumberMatchType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the time zone identifiers to filter leads by.
+    /// </summary>
+    public string[] TimeZoneIds { get; set; }
+
+    /// <summary>
+    /// Gets or sets the subject content type of the last completed activity to filter leads by.
+    /// </summary>
+    public string LastActivitySubjectContentType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the disposition identifier of the last completed activity to filter leads by.
+    /// </summary>
+    public string LastActivityDispositionId { get; set; }
+
     /// <summary>
     /// Creates a copy of the current activity batch.
     /// </summary>
@@ -143,6 +175,12 @@ public OmnichannelActivityBatch Clone()
             LeadCreatedFrom = LeadCreatedFrom,
             LeadCreatedTo = LeadCreatedTo,
             OnlyPublishedLeads = OnlyPublishedLeads,
+            Limit = Limit,
+            PhoneNumber = PhoneNumber,
+            PhoneNumberMatchType = PhoneNumberMatchType,
+            TimeZoneIds = TimeZoneIds?.ToArray(),
+            LastActivitySubjectContentType = LastActivitySubjectContentType,
+            LastActivityDispositionId = LastActivityDispositionId,
         };
     }
 }

src/Core/CrestApps.OrchardCore.Omnichannel.Core/Models/PhoneNumberMatchType.cs

@@ -0,0 +1,22 @@
+namespace CrestApps.OrchardCore.Omnichannel.Core.Models;
+
+/// <summary>
+/// Defines how a phone number filter value should be matched against stored phone numbers.
+/// </summary>
+public enum PhoneNumberMatchType
+{
+    /// <summary>
+    /// Match phone numbers that exactly equal the given value.
+    /// </summary>
+    Exact,
+
+    /// <summary>
+    /// Match phone numbers that start with the given value.
+    /// </summary>
+    BeginsWith,
+
+    /// <summary>
+    /// Match phone numbers that end with the given value.
+    /// </summary>
+    EndsWith,
+}

src/Core/CrestApps.OrchardCore.Omnichannel.Core/Services/BulkManageActivityFilterContext.cs

@@ -1,11 +1,12 @@
-using CrestApps.OrchardCore.Omnichannel.Core.Indexes;
 using CrestApps.OrchardCore.Omnichannel.Core.Models;
 using YesSql;
 
 namespace CrestApps.OrchardCore.Omnichannel.Core.Services;
 
 /// <summary>
-/// Represents the context for bulk manage activity filtering, containing both the filter criteria and the query to modify.
+/// Represents the context for bulk manage activity filtering.
+/// Handlers use the <see cref="SqlBuilder"/> to add INNER JOIN / LEFT JOIN
+/// and WHERE clauses that will be executed as a single server-side SQL query.
 /// </summary>
 public sealed class BulkManageActivityFilterContext
 {
@@ -15,20 +16,67 @@ public sealed class BulkManageActivityFilterContext
     public BulkManageActivityFilter Filter { get; }
 
     /// <summary>
-    /// Gets or sets the query to apply filtering to.
+    /// Gets the SQL query builder. Handlers add JOINs and WHERE clauses to this builder.
+    /// The base query already selects from the activity index table with alias "a"
+    /// and includes the base conditions (Status=NotStated, InteractionType=Manual).
     /// </summary>
-    public IQuery<OmnichannelActivity, OmnichannelActivityIndex> Query { get; set; }
+    public ISqlBuilder SqlBuilder { get; }
+
+    /// <summary>
+    /// Gets the SQL dialect for quoting table/column names.
+    /// </summary>
+    public ISqlDialect Dialect { get; }
+
+    /// <summary>
+    /// Gets the table prefix for constructing full table names.
+    /// </summary>
+    public string TablePrefix { get; }
+
+    /// <summary>
+    /// Gets the table naming convention used to resolve collection-aware index table names.
+    /// </summary>
+    public ITableNameConvention TableNameConvention { get; }
+
+    /// <summary>
+    /// Gets the database schema, if any.
+    /// </summary>
+    public string Schema { get; }
+
+    /// <summary>
+    /// Gets the query parameters dictionary. Handlers add parameterized values here.
+    /// </summary>
+    public Dictionary<string, object> Parameters => SqlBuilder.Parameters;
+
+    /// <summary>
+    /// Gets the alias used for the activity index table in the query.
+    /// </summary>
+    public string ActivityTableAlias { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="BulkManageActivityFilterContext"/> class.
     /// </summary>
     /// <param name="filter">The filter criteria.</param>
-    /// <param name="query">The query to filter.</param>
+    /// <param name="sqlBuilder">The SQL builder to compose the query.</param>
+    /// <param name="dialect">The SQL dialect.</param>
+    /// <param name="tablePrefix">The table prefix.</param>
+    /// <param name="tableNameConvention">The table naming convention.</param>
+    /// <param name="schema">The database schema.</param>
+    /// <param name="activityTableAlias">The alias for the activity index table.</param>
     public BulkManageActivityFilterContext(
         BulkManageActivityFilter filter,
-        IQuery<OmnichannelActivity, OmnichannelActivityIndex> query)
+        ISqlBuilder sqlBuilder,
+        ISqlDialect dialect,
+        string tablePrefix,
+        ITableNameConvention tableNameConvention,
+        string schema,
+        string activityTableAlias)
     {
         Filter = filter;
-        Query = query;
+        SqlBuilder = sqlBuilder;
+        Dialect = dialect;
+        TablePrefix = tablePrefix;
+        TableNameConvention = tableNameConvention;
+        Schema = schema;
+        ActivityTableAlias = activityTableAlias;
     }
 }