lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-08-20 10:06:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adding fix for MenuPart write concurrency issue

Browse Source
This commit is contained in:
Jasmin Savard 2018-04-27 17:20:54 -04:00
parent 9446665c95
commit 0ae9b4b4fe
1 changed files with 64 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs
View File

@ -1,31 +1,45 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Orchard.Caching;
using Orchard.ContentManagement;
using Orchard.Core.Navigation.Models;
using Orchard.Core.Title.Models;
namespace Orchard.Core.Navigation.Services {
public class MainMenuService : IMenuService {
namespace Orchard.Core.Navigation.Services
{
public class MainMenuService : IMenuService
{
private readonly IContentManager _contentManager;
private ICacheManager _cacheManager;
private ISignals _signals;
public MainMenuService(IContentManager contentManager) {
public MainMenuService(IContentManager contentManager,
ICacheManager cacheManager,
ISignals signals)
{
_contentManager = contentManager;
_cacheManager = cacheManager;
_signals = signals;
}
public IEnumerable<MenuPart> Get() {
public IEnumerable<MenuPart> Get()
{
return _contentManager.Query<MenuPart, MenuPartRecord>().List();
}
public IEnumerable<MenuPart> GetMenuParts(int menuId) {
public IEnumerable<MenuPart> GetMenuParts(int menuId)
{
return _contentManager
.Query<MenuPart, MenuPartRecord>()
.Where( x => x.MenuId == menuId)
.Where(x => x.MenuId == menuId)
.List();
}
public IContent GetMenu(string menuName) {
if(string.IsNullOrWhiteSpace(menuName)) {
public IContent GetMenu(string menuName)
{
if (string.IsNullOrWhiteSpace(menuName))
{
return null;
}
@ -36,32 +50,64 @@ namespace Orchard.Core.Navigation.Services {
.FirstOrDefault();
}
public IContent GetMenu(int menuId) {
return _contentManager.Get(menuId, VersionOptions.Published);
public IContent GetMenu(int menuId)
{
return _contentManager.Get(menuId, VersionOptions.Published);
}
public MenuPart Get(int menuPartId) {
public MenuPart Get(int menuPartId)
{
return _contentManager.Get<MenuPart>(menuPartId);
}
public IContent Create(string name) {
if(string.IsNullOrWhiteSpace(name)) {
public IContent Create(string name)
{
if (string.IsNullOrWhiteSpace(name))
{
throw new ArgumentNullException(name);
}
var menu = _contentManager.Create("Menu");
menu.As<TitlePart>().Title = name;
_signals.Trigger("MainMenuService.AllMenus");
return menu;
}
public void Delete(MenuPart menuPart) {
public void Delete(MenuPart menuPart)
{
_contentManager.Remove(menuPart.ContentItem);
}
public IEnumerable<ContentItem> GetMenus() {
return _contentManager.Query().ForType("Menu").Join<TitlePartRecord>().OrderBy(x => x.Title).List();
private IEnumerable<ContentItem> AllMenus {
get {
var fromCache = FromCache();
if (fromCache.Item1.AddMinutes(2) < DateTime.Now)
{
// give 2 minutes lifetime to cache
_signals.Trigger("MainMenuService.AllMenus");
fromCache = FromCache();
}
return fromCache.Item2;
}
}
private Tuple<DateTime, IEnumerable<ContentItem>> FromCache()
{
return _cacheManager
.Get<string, Tuple<DateTime, IEnumerable<ContentItem>>>("MainMenuService.AllMenus", true, ctx =>
{
ctx.Monitor(_signals.When("MainMenuService.AllMenus"));
return Tuple.Create(DateTime.Now,
_contentManager.Query().ForType("Menu").Join<TitlePartRecord>().OrderBy(x => x.Title).List());
});
}
public IEnumerable<ContentItem> GetMenus()
{
return AllMenus; // _contentManager.Query().ForType("Menu").Join<TitlePartRecord>().OrderBy(x => x.Title).List();
}
}
}