lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Implements #7921 extend query to support latest versions (#7923)

Browse Source 
* - Adds the column LatestValue to all type of FieldIndexRecord
- Adds Indexes to increase performances in queries
- Adds Handler to store LatestValue during Update event
- Adds Service to Get and Set the LatestValue of a field
- Adds heavy projections index tables update to the Upgrade module

* - Adds a new Transaction foreach content update in order to prevent tables locks during import

* - Adds Index over FieldIndexPartRecord_Id

* - Adds Column ScopeVersion to QueryPartRecord and manage it during the part's lifecycle
- Manage Queries using ScopeVersion informations

* - Manage the scope of the query within Fields

* - Manage the sort criterion for fields based on the VersionScope of the query

* - Adds the source QueryPartRecord which generates the IHqlQuery to FilterContext and SortCriteriaContext: used in ProjectionManager
- Adds a method which returns the columnName to Sort/Filter to FilterContext and SortCriteriaContext: used in ContentFieldsSortCriteria
- Externalize the logic to calculate the column to index
- Merge Update 4 and 5
- Modified the label "Query Version Scope" into "Content's version"

* - Batch upgrade for LatestValue

* - async ajax call in order to prevent freezing UI

* - Created a context for lambda diversification
This commit is contained in:
Hermes Sbicego 2018-01-04 21:20:51 +01:00 committed by Sébastien Ros
parent 5dc0003f25
commit 5800e18324
29 changed files with 525 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.Projections/Descriptors/Filter/FilterContext.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using Orchard.ContentManagement;
using Orchard.Projections.Models;
namespace Orchard.Projections.Descriptors.Filter {
public class FilterContext {
@ -10,5 +11,10 @@ namespace Orchard.Projections.Descriptors.Filter {
public IDictionary<string, object> Tokens { get; set; }
public dynamic State { get; set; }
public IHqlQuery Query { get; set; }
public QueryPartRecord QueryPartRecord { get; set; }
public string GetFilterColumnName() {
return QueryPartRecord != null && QueryPartRecord.VersionScope == QueryVersionScopeOptions.Latest ? "LatestValue" : "Value";
}
}
}

6
src/Orchard.Web/Modules/Orchard.Projections/Descriptors/SortCriterion/SortCriteriaContext.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using Orchard.ContentManagement;
using Orchard.Projections.Models;
namespace Orchard.Projections.Descriptors.SortCriterion {
public class SortCriterionContext {
@ -10,5 +11,10 @@ namespace Orchard.Projections.Descriptors.SortCriterion {
public IDictionary<string, object> Tokens { get; set; }
public dynamic State { get; set; }
public IHqlQuery Query { get; set; }
public QueryPartRecord QueryPartRecord { get; set; }
public string GetSortColumnName() {
return QueryPartRecord != null && QueryPartRecord.VersionScope == QueryVersionScopeOptions.Latest ? "LatestValue" : "Value";
}
}
}

37
src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs
View File

@ -7,9 +7,10 @@ using Orchard.ContentManagement.Handlers;
using Orchard.Forms.Services;
using Orchard.Projections.Models;
using Orchard.Projections.Services;
using Orchard.Projections.ViewModels;
namespace Orchard.Projections.Drivers {
public class QueryPartDriver : ContentPartDriver<QueryPart> {
private readonly IProjectionManager _projectionManager;
private readonly IFormManager _formManager;
@ -18,13 +19,25 @@ namespace Orchard.Projections.Drivers {
_projectionManager = projectionManager;
_formManager = formManager;
}
protected override DriverResult Editor(QueryPart part, IUpdateModel updater, dynamic shapeHelper) {
if(updater == null) {
return null;
protected override string Prefix {
get {
return "Query_Part";
}
return null;
}
protected override DriverResult Editor(QueryPart part, dynamic shapeHelper) {
return Editor(part, null, shapeHelper);
}
protected override DriverResult Editor(QueryPart part, IUpdateModel updater, dynamic shapeHelper) {
var model = new QueryViewModel { VersionScope = part.VersionScope };
if (updater != null) {
if (updater.TryUpdateModel(model, Prefix, null, null)) {
part.VersionScope = model.VersionScope;
}
}
return ContentShape("Parts_QueryPart_Edit",
() => {
return shapeHelper.EditorTemplate(TemplateName: "Parts/QueryPart_Edit", Model: model, Prefix: Prefix);
});
}
protected override void Exporting(QueryPart part, ExportContentContext context) {
@ -114,16 +127,16 @@ namespace Orchard.Projections.Drivers {
foreach (var item in queryElement.Element("FilterGroups").Elements("FilterGroup").Select(filterGroup =>
new FilterGroupRecord {
Filters = filterGroup.Elements("Filter").Select(filter => {
var category = filter.Attribute("Category").Value;
var type = filter.Attribute("Type").Value;
var state = filter.Attribute("State").Value;
var descriptor = _projectionManager.GetFilter(category, type);
if (descriptor != null) {
state = _formManager.Import(descriptor.Form, state, context);
}
return new FilterRecord {
Category = category,
Description = filter.Attribute("Description").Value,
@ -186,7 +199,7 @@ namespace Orchard.Projections.Drivers {
}
private XElement GetPropertyXml(PropertyRecord property) {
if(property == null) {
if (property == null) {
return null;
}
@ -226,7 +239,7 @@ namespace Orchard.Projections.Drivers {
}
private PropertyRecord GetProperty(XElement property) {
if(property == null) {
if (property == null) {
return null;
}

2
src/Orchard.Web/Modules/Orchard.Projections/FieldTypeEditors/BooleanFieldTypeEditor.cs
View File

@ -25,7 +25,7 @@ namespace Orchard.Projections.FieldTypeEditors {
}
public Action<IHqlExpressionFactory> GetFilterPredicate(dynamic formState) {
return BooleanFilterForm.GetFilterPredicate(formState, "Value");
return BooleanFilterForm.GetFilterPredicate(formState, formState.VersionScope == QueryVersionScopeOptions.Latest ? "LatestValue" : "Value");
}
public LocalizedString DisplayFilter(string fieldName, string storageName, dynamic formState) {

2
src/Orchard.Web/Modules/Orchard.Projections/FieldTypeEditors/DateTimeFieldTypeEditor.cs
View File

@ -29,7 +29,7 @@ namespace Orchard.Projections.FieldTypeEditors {
}
public Action<IHqlExpressionFactory> GetFilterPredicate(dynamic formState) {
return DateTimeFilterForm.GetFilterPredicate(formState, "Value", _clock.UtcNow, true);
return DateTimeFilterForm.GetFilterPredicate(formState, formState.VersionScope == QueryVersionScopeOptions.Latest ? "LatestValue" : "Value", _clock.UtcNow, true);
}
public LocalizedString DisplayFilter(string fieldName, string storageName, dynamic formState) {

2
src/Orchard.Web/Modules/Orchard.Projections/FieldTypeEditors/DecimalFieldTypeEditor.cs
View File

@ -27,7 +27,7 @@ namespace Orchard.Projections.FieldTypeEditors {
}
public Action<IHqlExpressionFactory> GetFilterPredicate(dynamic formState) {
return NumericFilterForm.GetFilterPredicate(formState, "Value");
return NumericFilterForm.GetFilterPredicate(formState, formState.VersionScope == QueryVersionScopeOptions.Latest ? "LatestValue" : "Value");
}
public LocalizedString DisplayFilter(string fieldName, string storageName, dynamic formState) {

2
src/Orchard.Web/Modules/Orchard.Projections/FieldTypeEditors/FloatFieldTypeEditor.cs
View File

@ -28,7 +28,7 @@ namespace Orchard.Projections.FieldTypeEditors {
}
public Action<IHqlExpressionFactory> GetFilterPredicate(dynamic formState) {
return NumericFilterForm.GetFilterPredicate(formState, "Value");
return NumericFilterForm.GetFilterPredicate(formState, formState.VersionScope == QueryVersionScopeOptions.Latest ? "LatestValue" : "Value");
}
public LocalizedString DisplayFilter(string fieldName, string storageName, dynamic formState) {

2
src/Orchard.Web/Modules/Orchard.Projections/FieldTypeEditors/IntegerFieldTypeEditor.cs
View File

@ -34,7 +34,7 @@ namespace Orchard.Projections.FieldTypeEditors {
}
public Action<IHqlExpressionFactory> GetFilterPredicate(dynamic formState) {
return NumericFilterForm.GetFilterPredicate(formState, "Value");
return NumericFilterForm.GetFilterPredicate(formState, formState.VersionScope == QueryVersionScopeOptions.Latest ? "LatestValue" : "Value");
}
public LocalizedString DisplayFilter(string fieldName, string storageName, dynamic formState) {

2
src/Orchard.Web/Modules/Orchard.Projections/FieldTypeEditors/StringFieldTypeEditor.cs
View File

@ -25,7 +25,7 @@ namespace Orchard.Projections.FieldTypeEditors {
}
public Action<IHqlExpressionFactory> GetFilterPredicate(dynamic formState) {
return StringFilterForm.GetFilterPredicate(formState, "Value");
return StringFilterForm.GetFilterPredicate(formState, formState.VersionScope == QueryVersionScopeOptions.Latest ? "LatestValue" : "Value");
}
public LocalizedString DisplayFilter(string fieldName, string storageName, dynamic formState) {

62
src/Orchard.Web/Modules/Orchard.Projections/Handlers/FieldIndexPartHandler.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers;
@ -16,11 +17,13 @@ namespace Orchard.Projections.Handlers {
private readonly IFieldIndexService _fieldIndexService;
private readonly IFieldStorageProvider _fieldStorageProvider;
private readonly IEnumerable<IContentFieldDriver> _contentFieldDrivers;
private readonly IDraftFieldIndexService _draftFieldIndexService;
public FieldIndexPartHandler(
IContentDefinitionManager contentDefinitionManager,
IRepository<FieldIndexPartRecord> repository,
IFieldIndexService fieldIndexService,
IDraftFieldIndexService draftFieldIndexService,
IFieldStorageProvider fieldStorageProvider,
IEnumerable<IContentFieldDriver> contentFieldDrivers) {
Filters.Add(StorageFilter.For(repository));
@ -28,7 +31,8 @@ namespace Orchard.Projections.Handlers {
_fieldIndexService = fieldIndexService;
_fieldStorageProvider = fieldStorageProvider;
_contentFieldDrivers = contentFieldDrivers;
_draftFieldIndexService = draftFieldIndexService;
OnUpdated<FieldIndexPart>(Updated);
OnPublishing<FieldIndexPart>(Publishing);
}
@ -43,29 +47,55 @@ namespace Orchard.Projections.Handlers {
context.Builder.Weld<FieldIndexPart>();
}
}
private void Updated(UpdateContentContext context, FieldIndexPart fieldIndexPart) {
if (context.UpdatingItemVersionRecord.Latest) { // updates projection draft indexes only if it is the latest version
DescribeValuesToindex(fieldIndexPart, (indexServiceContext) => {
_draftFieldIndexService.Set(fieldIndexPart,
indexServiceContext.LocalPart.PartDefinition.Name,
indexServiceContext.LocalField.Name,
indexServiceContext.StorageName, indexServiceContext.FieldValue, indexServiceContext.StorageType);
});
}
}
public void Publishing(PublishContentContext context, FieldIndexPart fieldIndexPart) {
DescribeValuesToindex(fieldIndexPart, (indexServiceContext) => {
_fieldIndexService.Set(fieldIndexPart,
indexServiceContext.LocalPart.PartDefinition.Name,
indexServiceContext.LocalField.Name,
indexServiceContext.StorageName, indexServiceContext.FieldValue, indexServiceContext.StorageType);
});
}
/// <summary>
///
/// </summary>
/// <param name="fieldIndexPart"></param>
/// <param name="indexService"></param>
private void DescribeValuesToindex(FieldIndexPart fieldIndexPart, Action<IndexServiceContext> indexService) {
foreach (var part in fieldIndexPart.ContentItem.Parts) {
foreach(var field in part.PartDefinition.Fields) {
foreach (var field in part.PartDefinition.Fields) {
// get all drivers for the current field type
// the driver will describe what values of the field should be indexed
var drivers = _contentFieldDrivers.Where(x => x.GetFieldInfo().Any(fi => fi.FieldTypeName == field.FieldDefinition.Name)).ToList();
ContentPart localPart = part;
ContentPartFieldDefinition localField = field;
var membersContext = new DescribeMembersContext(
var membersContext = new DescribeMembersContext(
(storageName, storageType, displayName, description) => {
var fieldStorage = _fieldStorageProvider.BindStorage(localPart, localField);
// fieldStorage.Get<T>(storageName)
var getter = typeof(IFieldStorage).GetMethod("Get").MakeGenericMethod(storageType);
var fieldValue = getter.Invoke(fieldStorage, new[] {storageName});
_fieldIndexService.Set(fieldIndexPart,
localPart.PartDefinition.Name,
localField.Name,
storageName, fieldValue, storageType);
var fieldValue = getter.Invoke(fieldStorage, new[] { storageName });
indexService(new IndexServiceContext {
LocalPart = localPart,
LocalField = localField,
StorageName = storageName,
FieldValue = fieldValue,
StorageType = storageType });
});
foreach (var driver in drivers) {
@ -74,5 +104,13 @@ namespace Orchard.Projections.Handlers {
}
}
}
private class IndexServiceContext {
public ContentPart LocalPart { get; set; }
public ContentPartFieldDefinition LocalField { get; set; }
public string StorageName { get; set; }
public object FieldValue { get; set; }
public Type StorageType { get; set; }
}
}
}

33
src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Data;
using System.Data;
using Orchard.ContentManagement.MetaData;
using Orchard.Core.Common.Models;
using Orchard.Core.Contents.Extensions;
@ -282,5 +281,35 @@ namespace Orchard.Projections {
return 4;
}
public int UpdateFrom4() {
SchemaBuilder.AlterTable("StringFieldIndexRecord", table => table
.AddColumn<string>("LatestValue", c => c.WithLength(4000)));
SchemaBuilder.AlterTable("IntegerFieldIndexRecord", table => table
.AddColumn<long>("LatestValue"));
SchemaBuilder.AlterTable("DoubleFieldIndexRecord", table => table
.AddColumn<double>("LatestValue"));
SchemaBuilder.AlterTable("DecimalFieldIndexRecord", table => table
.AddColumn<decimal>("LatestValue"));
//Adds indexes for better performances in queries
SchemaBuilder.AlterTable("StringFieldIndexRecord", table => table.CreateIndex("IX_PropertyName", new string[] { "PropertyName" }));
SchemaBuilder.AlterTable("StringFieldIndexRecord", table => table.CreateIndex("IX_FieldIndexPartRecord_Id", new string[] { "FieldIndexPartRecord_Id" }));
SchemaBuilder.AlterTable("IntegerFieldIndexRecord", table => table.CreateIndex("IX_PropertyName", new string[] { "PropertyName" }));
SchemaBuilder.AlterTable("IntegerFieldIndexRecord", table => table.CreateIndex("IX_FieldIndexPartRecord_Id", new string[] { "FieldIndexPartRecord_Id" }));
SchemaBuilder.AlterTable("DoubleFieldIndexRecord", table => table.CreateIndex("IX_PropertyName", new string[] { "PropertyName" }));
SchemaBuilder.AlterTable("DoubleFieldIndexRecord", table => table.CreateIndex("IX_FieldIndexPartRecord_Id", new string[] { "FieldIndexPartRecord_Id" }));
SchemaBuilder.AlterTable("DecimalFieldIndexRecord", table => table.CreateIndex("IX_PropertyName", new string[] { "PropertyName" }));
SchemaBuilder.AlterTable("DecimalFieldIndexRecord", table => table.CreateIndex("IX_FieldIndexPartRecord_Id", new string[] { "FieldIndexPartRecord_Id" }));
SchemaBuilder.AlterTable("QueryPartRecord", table => table
.AddColumn<string>("VersionScope", c => c.WithLength(15)));
return 5;
}
}
}

4
src/Orchard.Web/Modules/Orchard.Projections/Models/FieldIndexRecord.cs
View File

@ -8,18 +8,22 @@ namespace Orchard.Projections.Models {
public class StringFieldIndexRecord : FieldIndexRecord {
public virtual string Value { get; set; }
public virtual string LatestValue { get; set; }
}
public class IntegerFieldIndexRecord : FieldIndexRecord {
public virtual long? Value { get; set; }
public virtual long? LatestValue { get; set; }
}
public class DoubleFieldIndexRecord : FieldIndexRecord {
public virtual double? Value { get; set; }
public virtual double? LatestValue { get; set; }
}
public class DecimalFieldIndexRecord : FieldIndexRecord {
public virtual decimal? Value { get; set; }
public virtual decimal? LatestValue { get; set; }
}
}

4
src/Orchard.Web/Modules/Orchard.Projections/Models/QueryPart.cs
View File

@ -10,6 +10,10 @@ namespace Orchard.Projections.Models {
set { this.As<TitlePart>().Title = value; }
}
public QueryVersionScopeOptions VersionScope {
get { return this.Retrieve(x => x.VersionScope); }
set { this.Store(x => x.VersionScope, value); }
}
public IList<SortCriterionRecord> SortCriteria {
get { return Record.SortCriteria; }
}

4
src/Orchard.Web/Modules/Orchard.Projections/Models/QueryPartRecord.cs
View File

@ -1,16 +1,20 @@
using System.Collections.Generic;
using System.Xml.Serialization;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Records;
using Orchard.Data.Conventions;
namespace Orchard.Projections.Models {
public class QueryPartRecord : ContentPartRecord {
public QueryPartRecord() {
VersionScope = QueryVersionScopeOptions.Published;
FilterGroups = new List<FilterGroupRecord>();
SortCriteria = new List<SortCriterionRecord>();
Layouts = new List<LayoutRecord>();
}
public virtual QueryVersionScopeOptions VersionScope { get; set; }
[CascadeAllDeleteOrphan, Aggregate]
[XmlArray("FilterGroupRecords")]
public virtual IList<FilterGroupRecord> FilterGroups { get; set; }

7
src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
View File

@ -179,6 +179,9 @@
<Compile Include="Providers\Layouts\ShapeLayoutForms.cs" />
<Compile Include="Providers\Properties\CustomValueProperties.cs" />
<Compile Include="Navigation\NavigationQueryProvider.cs" />
<Compile Include="QueryVersionScopeOptions.cs" />
<Compile Include="Services\DraftFieldIndexService.cs" />
<Compile Include="Services\IDraftFieldIndexService.cs" />
<Compile Include="Services\IProjectionManagerExtension.cs" />
<Compile Include="Shapes.cs" />
<Compile Include="Descriptors\Layout\LayoutComponentResult.cs" />
@ -282,6 +285,7 @@
<Compile Include="ViewModels\LayoutAddViewModel.cs" />
<Compile Include="ViewModels\LayoutEditViewModel.cs" />
<Compile Include="ViewModels\ProjectionPartEditViewModel.cs" />
<Compile Include="ViewModels\QueryViewModel.cs" />
<Compile Include="ViewModels\SortCriteriaAddViewModel.cs" />
<Compile Include="ViewModels\SortCriteriaEditViewModel.cs" />
<Compile Include="ViewModels\FilterAddViewModel.cs" />
@ -325,6 +329,9 @@
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\Parts\QueryPart_Edit.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

2
src/Orchard.Web/Modules/Orchard.Projections/Placement.info
View File

@ -5,7 +5,7 @@
<Place Parts_NavigationQueryPart_Edit="Content:5"/>
<Place Parts_NavigationQueryPart="-"/>
<Place Parts_QueryPart_Edit="Content:5" />
<Match DisplayType="Detail" ContentType="ProjectionPage">
<Place Parts_Common_Metadata="-" />
</Match>

4
src/Orchard.Web/Modules/Orchard.Projections/Providers/Filters/ContentFieldsFilter.cs
View File

@ -75,7 +75,9 @@ namespace Orchard.Projections.Providers.Filters {
var relationship = fieldTypeEditor.GetFilterRelationship(propertyName.ToSafeName());
// generate the predicate based on the editor which has been used
Action<IHqlExpressionFactory> predicate = fieldTypeEditor.GetFilterPredicate(context.State);
dynamic fullState = context.State;
fullState.VersionScope = context.QueryPartRecord.VersionScope;
Action<IHqlExpressionFactory> predicate = fieldTypeEditor.GetFilterPredicate(fullState);
// combines the predicate with a filter on the specific property name of the storage, as implemented in FieldIndexService
Action<IHqlExpressionFactory> andPredicate = x => x.And(y => y.Eq("PropertyName", propertyName), predicate);

18
src/Orchard.Web/Modules/Orchard.Projections/Providers/SortCriteria/ContentFieldsSortCriteria.cs
View File

@ -32,14 +32,14 @@ namespace Orchard.Projections.Providers.SortCriteria {
public Localizer T { get; set; }
public void Describe(DescribeSortCriterionContext describe) {
foreach(var part in _contentDefinitionManager.ListPartDefinitions()) {
if(!part.Fields.Any()) {
foreach (var part in _contentDefinitionManager.ListPartDefinitions()) {
if (!part.Fields.Any()) {
continue;
}
var descriptor = describe.For(part.Name + "ContentFields", T("{0} Content Fields", part.Name.CamelFriendly()), T("Content Fields for {0}", part.Name.CamelFriendly()));
foreach(var field in part.Fields) {
foreach (var field in part.Fields) {
var localField = field;
var localPart = part;
var drivers = _contentFieldDrivers.Where(x => x.GetFieldInfo().Any(fi => fi.FieldTypeName == localField.FieldDefinition.Name)).ToList();
@ -57,8 +57,8 @@ namespace Orchard.Projections.Providers.SortCriteria {
display: context => DisplaySortCriterion(context, localPart, localField),
form: SortCriterionFormProvider.FormName);
});
foreach(var driver in drivers) {
foreach (var driver in drivers) {
driver.Describe(membersContext);
}
}
@ -79,11 +79,11 @@ namespace Orchard.Projections.Providers.SortCriteria {
// apply where clause
context.Query = context.Query.Where(relationship, predicate);
// apply sort
context.Query = ascending
? context.Query.OrderBy(relationship, x => x.Asc("Value"))
: context.Query.OrderBy(relationship, x => x.Desc("Value"));
context.Query = ascending
? context.Query.OrderBy(relationship, x => x.Asc(context.GetSortColumnName()))
: context.Query.OrderBy(relationship, x => x.Desc(context.GetSortColumnName()));
}
public LocalizedString DisplaySortCriterion(SortCriterionContext context, ContentPartDefinition part, ContentPartFieldDefinition fieldDefinition) {

11
src/Orchard.Web/Modules/Orchard.Projections/QueryVersionScopeOptions.cs Normal file
View File

@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Orchard.Projections {
public enum QueryVersionScopeOptions {
Published,
Latest
}
}

125
src/Orchard.Web/Modules/Orchard.Projections/Services/DraftFieldIndexService.cs Normal file
View File

@ -0,0 +1,125 @@
using System;
using System.Linq;
using Orchard.Projections.Models;
namespace Orchard.Projections.Services {
public class DraftFieldIndexService : IDraftFieldIndexService {
public void Set(FieldIndexPart part, string partName, string fieldName, string valueName, object value, Type valueType) {
var propertyName = String.Join(".", partName, fieldName, valueName ?? "");
var typeCode = Type.GetTypeCode(valueType);
if(valueType.IsGenericType && valueType.GetGenericTypeDefinition() == typeof(Nullable<>)) {
typeCode = Type.GetTypeCode(Nullable.GetUnderlyingType(valueType));
}
switch (typeCode) {
case TypeCode.Char:
case TypeCode.String:
var stringRecord = part.Record.StringFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
if (stringRecord == null) {
stringRecord = new StringFieldIndexRecord { PropertyName = propertyName };
part.Record.StringFieldIndexRecords.Add(stringRecord);
}
// take the first 4000 chars as it is the limit for the field
stringRecord.LatestValue = value == null ? null : value.ToString().Substring(0, Math.Min(value.ToString().Length, 4000));
break;
case TypeCode.Byte:
case TypeCode.SByte:
case TypeCode.Int16:
case TypeCode.Int32:
case TypeCode.Int64:
case TypeCode.UInt16:
case TypeCode.UInt32:
case TypeCode.UInt64:
var integerRecord = part.Record.IntegerFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
if (integerRecord == null) {
integerRecord = new IntegerFieldIndexRecord { PropertyName = propertyName };
part.Record.IntegerFieldIndexRecords.Add(integerRecord);
}
integerRecord.LatestValue = value == null ? default(long?) : Convert.ToInt64(value);
break;
case TypeCode.DateTime:
var dateTimeRecord = part.Record.IntegerFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
if (dateTimeRecord == null) {
dateTimeRecord = new IntegerFieldIndexRecord { PropertyName = propertyName };
part.Record.IntegerFieldIndexRecords.Add(dateTimeRecord);
}
dateTimeRecord.LatestValue = value == null ? default(long?) : ((DateTime)value).Ticks;
break;
case TypeCode.Boolean:
var booleanRecord = part.Record.IntegerFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
if (booleanRecord == null) {
booleanRecord = new IntegerFieldIndexRecord { PropertyName = propertyName };
part.Record.IntegerFieldIndexRecords.Add(booleanRecord);
}
booleanRecord.LatestValue = value == null ? default(long?) : Convert.ToInt64((bool)value);
break;
case TypeCode.Decimal:
var decimalRecord = part.Record.DecimalFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
if (decimalRecord == null) {
decimalRecord = new DecimalFieldIndexRecord { PropertyName = propertyName };
part.Record.DecimalFieldIndexRecords.Add(decimalRecord);
}
decimalRecord.LatestValue = value == null ? default(decimal?) : Convert.ToDecimal((decimal)value);
break;
case TypeCode.Single:
case TypeCode.Double:
var doubleRecord = part.Record.DoubleFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
if (doubleRecord == null) {
doubleRecord = new DoubleFieldIndexRecord { PropertyName = propertyName };
part.Record.DoubleFieldIndexRecords.Add(doubleRecord);
}
doubleRecord.LatestValue = value == null ? default(double?) : Convert.ToDouble(value);
break;
}
}
public T Get<T>(FieldIndexPart part, string partName, string fieldName, string valueName) {
var propertyName = String.Join(".", partName, fieldName, valueName ?? "");
var typeCode = Type.GetTypeCode(typeof(T));
switch (typeCode) {
case TypeCode.Char:
case TypeCode.String:
var stringRecord = part.Record.StringFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
return stringRecord != null ? (T)Convert.ChangeType(stringRecord.LatestValue, typeof(T)) : default(T);
case TypeCode.Byte:
case TypeCode.SByte:
case TypeCode.Int16:
case TypeCode.Int32:
case TypeCode.Int64:
case TypeCode.UInt16:
case TypeCode.UInt32:
case TypeCode.UInt64:
var integerRecord = part.Record.IntegerFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
return integerRecord != null ? (T)Convert.ChangeType(integerRecord.LatestValue, typeof(T)) : default(T);
case TypeCode.Decimal:
var decimalRecord = part.Record.DecimalFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
return decimalRecord != null ? (T)Convert.ChangeType(decimalRecord.LatestValue, typeof(T)) : default(T);
case TypeCode.Single:
case TypeCode.Double:
var doubleRecord = part.Record.DoubleFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
return doubleRecord != null ? (T)Convert.ChangeType(doubleRecord.LatestValue, typeof(T)) : default(T);
case TypeCode.DateTime:
var dateTimeRecord = part.Record.IntegerFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
return dateTimeRecord != null ? (T)Convert.ChangeType(new DateTime(Convert.ToInt64(dateTimeRecord.LatestValue)), typeof(T)) : default(T);
case TypeCode.Boolean:
var booleanRecord = part.Record.IntegerFieldIndexRecords.FirstOrDefault(r => r.PropertyName == propertyName);
return booleanRecord != null ? (T)Convert.ChangeType(booleanRecord.LatestValue, typeof(T)) : default(T);
default:
return default(T);
}
}
}
}

9
src/Orchard.Web/Modules/Orchard.Projections/Services/IDraftFieldIndexService.cs Normal file
View File

@ -0,0 +1,9 @@
using System;
using Orchard.Projections.Models;
namespace Orchard.Projections.Services {
public interface IDraftFieldIndexService : IDependency {
void Set(FieldIndexPart part, string partName, string fieldName, string valueName, object value, Type valueType);
T Get<T>(FieldIndexPart part, string partName, string fieldName, string valueName);
}
}

18
src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs
View File

@ -168,7 +168,8 @@ namespace Orchard.Projections.Services {
foreach (var sortCriterion in queryRecord.SortCriteria.OrderBy(s => s.Position)) {
var sortCriterionContext = new SortCriterionContext {
Query = groupQuery,
State = FormParametersHelper.ToDynamic(sortCriterion.State)
State = FormParametersHelper.ToDynamic(sortCriterion.State),
QueryPartRecord = queryRecord
};
string category = sortCriterion.Category;
@ -200,16 +201,24 @@ namespace Orchard.Projections.Services {
}
// pre-executing all groups
var versionScope = queryRecord.VersionScope;
foreach (var group in queryRecord.FilterGroups) {
var contentQuery = _contentManager.HqlQuery().ForVersion(VersionOptions.Published);
IHqlQuery contentQuery;
if (versionScope == QueryVersionScopeOptions.Latest) {
contentQuery = _contentManager.HqlQuery().ForVersion(VersionOptions.Latest);
}
else {
contentQuery = _contentManager.HqlQuery().ForVersion(VersionOptions.Published);
}
// iterate over each filter to apply the alterations to the query object
foreach (var filter in group.Filters) {
var tokenizedState = _tokenizer.Replace(filter.State, tokens);
var filterContext = new FilterContext {
Query = contentQuery,
State = FormParametersHelper.ToDynamic(tokenizedState)
State = FormParametersHelper.ToDynamic(tokenizedState),
QueryPartRecord = queryRecord
};
string category = filter.Category;
@ -235,7 +244,8 @@ namespace Orchard.Projections.Services {
foreach (var sortCriterion in sortCriteria.OrderBy(s => s.Position)) {
var sortCriterionContext = new SortCriterionContext {
Query = contentQuery,
State = FormParametersHelper.ToDynamic(sortCriterion.State)
State = FormParametersHelper.ToDynamic(sortCriterion.State),
QueryPartRecord= queryRecord
};
string category = sortCriterion.Category;

1
src/Orchard.Web/Modules/Orchard.Projections/ViewModels/FilterEditViewModel.cs
View File

@ -7,5 +7,6 @@ namespace Orchard.Projections.ViewModels {
public string Description { get; set; }
public FilterDescriptor Filter { get; set; }
public dynamic Form { get; set; }
public QueryVersionScopeOptions VersionScope { get; set; }
}
}

10
src/Orchard.Web/Modules/Orchard.Projections/ViewModels/QueryViewModel.cs Normal file
View File

@ -0,0 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Orchard.Projections.ViewModels {
public class QueryViewModel {
public QueryVersionScopeOptions VersionScope { get; set; }
}
}

8
src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/QueryPart_Edit.cshtml Normal file
View File

@ -0,0 +1,8 @@
@model Orchard.Projections.ViewModels.QueryViewModel
@using Orchard.Projections;
<fieldset>
@Html.LabelFor(m => m.VersionScope, T("Content's version"))
@Html.DropDownListFor(m=>m.VersionScope, new SelectList(Enum.GetValues(typeof(QueryVersionScopeOptions)), Model.VersionScope))
<span class="hint">@T("The content's version to query.")</span>
</fieldset>

3
src/Orchard.Web/Modules/Upgrade/AdminMenu.cs
View File

@ -13,7 +13,8 @@ namespace Upgrade {
public void GetNavigation(NavigationBuilder builder) {
builder
.AddImageSet("upgrade")
.Add(T("Upgrade to 1.8"), "0", menu => menu.Action("Index", "Route", new { area = "Upgrade" })
.Add(T("Upgrade to 1.10.3"), "0", menu => menu.Action("Index", "Route", new { area = "Upgrade" })
.Add(T("Projections (1.10.3)"), "1.0", item => item.Action("Index", "Projections", new { area = "Upgrade" }).LocalNav().Permission(StandardPermissions.SiteOwner))
.Add(T("Infoset (1.8)"), "1.0", item => item.Action("Index", "Infoset", new { area = "Upgrade" }).LocalNav().Permission(StandardPermissions.SiteOwner))
.Add(T("Messaging (1.8)"), "1.1", item => item.Action("Index", "Messaging", new { area = "Upgrade" }).LocalNav().Permission(StandardPermissions.SiteOwner))
.Add(T("Media (1.7)"), "2", item => item.Action("Index", "Media", new { area = "Upgrade" }).LocalNav().Permission(StandardPermissions.SiteOwner))

113
src/Orchard.Web/Modules/Upgrade/Controllers/ProjectionsController.cs Normal file
View File

@ -0,0 +1,113 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Authentication;
using System.Web.Mvc;
using Orchard;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers;
using Orchard.ContentManagement.MetaData;
using Orchard.Data;
using Orchard.Environment.Features;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Projections.Handlers;
using Orchard.Security;
using Orchard.UI.Admin;
using Orchard.UI.Notify;
using Upgrade.ViewModels;
namespace Upgrade.Controllers {
[Admin]
public class ProjectionsController : Controller {
private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly IOrchardServices _orchardServices;
private readonly IFeatureManager _featureManager;
private readonly Lazy<IEnumerable<IContentHandler>> _handlers;
private readonly ITransactionManager _transactionManager;
private const int BATCH = 50;
public ProjectionsController(
IContentDefinitionManager contentDefinitionManager,
IOrchardServices orchardServices,
ITransactionManager transactionManager,
IFeatureManager featureManager,
Lazy<IEnumerable<IContentHandler>> handlers) {
_contentDefinitionManager = contentDefinitionManager;
_orchardServices = orchardServices;
_transactionManager = transactionManager;
_featureManager = featureManager;
_handlers = handlers;
Logger = NullLogger.Instance;
}
public Localizer T { get; set; }
public ILogger Logger { get; set; }
public ActionResult Index() {
var viewModel = new MigrateViewModel { ContentTypes = new List<ContentTypeEntry>() };
foreach (var contentType in _contentDefinitionManager.ListTypeDefinitions().OrderBy(c => c.Name)) {
// only display parts with fields
if (contentType.Parts.Any(x => x.PartDefinition.Fields.Any())) {
viewModel.ContentTypes.Add(new ContentTypeEntry { ContentTypeName = contentType.Name });
}
}
if (!viewModel.ContentTypes.Any()) {
_orchardServices.Notifier.Warning(T("There are no content types with custom fields"));
}
if (!_featureManager.GetEnabledFeatures().Any(x => x.Id == "Orchard.Fields")) {
_orchardServices.Notifier.Warning(T("You need to enable Orchard.Fields in order to migrate current fields."));
}
return View(viewModel);
}
//[HttpPost, ActionName("Index")]
//public ActionResult IndexPOST() {
// if (!_orchardServices.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not allowed to update fields' indexes.")))
// return new HttpUnauthorizedResult();
// // Get all ContentTypes with fields and Updates the LatestValue if necessary
// var contentTypesWithFields = _contentDefinitionManager.ListTypeDefinitions().OrderBy(c => c.Name).Where(w => w.Parts.Any(x => x.PartDefinition.Fields.Any()));
// foreach (var contentTypeWithFields in contentTypesWithFields) {
// var contents = _orchardServices.ContentManager.HqlQuery().ForType(contentTypeWithFields.Name).ForVersion(VersionOptions.Latest).List();
// foreach (var content in contents) {
// _handlers.Value.Where(x => x.GetType() == typeof(FieldIndexPartHandler)).Invoke(handler => handler.Updated(new UpdateContentContext(content)), Logger);
// _transactionManager.RequireNew();
// }
// }
// _orchardServices.Notifier.Information(T("Fields latest values were indexed successfully"));
// return RedirectToAction("Index");
//}
[HttpPost]
public JsonResult MigrateLatestValue(int id) {
if (!_orchardServices.Authorizer.Authorize(StandardPermissions.SiteOwner))
throw new AuthenticationException("");
var contentTypeNamesWithFields = _contentDefinitionManager.ListTypeDefinitions()
.Where(w => w.Parts.Any(x => x.PartDefinition.Fields.Any()))
.Select(x => x.Name)
.ToArray();
var contents = _orchardServices.ContentManager.HqlQuery().ForVersion(VersionOptions.Latest)
.Where(ci => ci.ContentItem(), cix => cix.Gt("Id", id))
.OrderBy(alias => alias.ContentItem(), order => order.Asc("Id"))
.Slice(0, BATCH).ToList();
var lastContentItemId = id;
foreach (var content in contents) {
if (contentTypeNamesWithFields.Contains(content.ContentType)) {
_handlers.Value.Where(x => x.GetType() == typeof(FieldIndexPartHandler)).Invoke(handler => handler.Updated(new UpdateContentContext(content)), Logger);
}
lastContentItemId = content.Id;
}
return new JsonResult { Data = lastContentItemId };
}
}
}

8
src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
View File

@ -122,6 +122,7 @@
<Content Include="Styles\menu.upgrade-admin.css" />
<Content Include="Web.config" />
<Content Include="Styles\Web.config" />
<Compile Include="Controllers\ProjectionsController.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="Module.txt" />
</ItemGroup>
@ -148,6 +149,10 @@
<Project>{73a7688a-5bd3-4f7e-adfa-ce36c5a10e3b}</Project>
<Name>Orchard.MediaLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Projections\Orchard.Projections.csproj">
<Project>{5531e894-d259-45a3-aa61-26dbe720c1ce}</Project>
<Name>Orchard.Projections</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Widgets\Orchard.Widgets.csproj">
<Project>{194d3ccc-1153-474d-8176-fde8d7d0d0bd}</Project>
<Name>Orchard.Widgets</Name>
@ -184,6 +189,9 @@
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Projections\Index.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

68
src/Orchard.Web/Modules/Upgrade/Views/Projections/Index.cshtml Normal file
View File

@ -0,0 +1,68 @@
@model Upgrade.ViewModels.MigrateViewModel
@{ Layout.Title = T("Updates projections index tables with fields' latest values.").ToString(); }
@if (Model.ContentTypes.Count() > 0) {
<div class="message message-Warning" id="message-progress" style="display: none"></div>
using (Html.BeginFormAntiForgeryPost()) {
Html.ValidationSummary();
<h2>@T("The update will process fields data and will update their latest value into projections index tables.")</h2>
<div>
<span>@T("These types will be processed:")</span>
<ol>
@foreach (var contentTypeEntry in Model.ContentTypes) {
<li>
@contentTypeEntry.ContentTypeName
</li>
}
</ol>
</div>
<fieldset>
<button type="button" class="button button-migrate" data-url="@Url.Action("MigrateLatestValue", "Projections")">@T("Migrate")</button>
</fieldset>
}
}
else {
<h3>@T("There are no content types with custom fields, nothing to upgrade.")</h3>
}
@using (Script.Foot()) {
<script type="text/javascript">
$(function() {
var antiForgeryToken = '@HttpUtility.JavaScriptStringEncode(Html.AntiForgeryTokenValueOrchard().ToString())';
var endMessage = '@HttpUtility.JavaScriptStringEncode(T("All items have been processed").Text)';
var MigrationBatch = function (importUrl, startId) {
$.ajax({
type: 'POST',
url: importUrl,
async: true,
data: {
__RequestVerificationToken: antiForgeryToken,
id: startId // start at index 0
},
success: function (data) {
if (Number(data) == startId) {
$('#message-progress').text(endMessage);
}
else {
startId = Number(data);
$('#message-progress').text('Processing content item ' + startId);
MigrationBatch(importUrl, startId);
}
},
fail: function (result) {
console.log("An error occured: " + result);
}
});
};
$('.button-migrate').click(function () {
var importUrl = $(this).data('url');
var startId = 0;
$('#message-progress').show();
MigrationBatch(importUrl, startId);
});
});
</script>
}