yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v8/8.17' into v9/feature/merge_v8.17-rc

Browse Source
This commit is contained in:
Ronald Barendse
2021-09-07 12:10:58 +02:00
parent e31dad6552 05d0a29e03
commit ee2da5b8ca
335 changed files with 9119 additions and 2275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/NotificationsRepository.cs
View File

@@ -39,22 +39,22 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
sql
.OrderBy<UserDto>(x => x.Id)
.OrderBy<NodeDto>(dto => dto.NodeId);
return AmbientScope.Database.Fetch<dynamic>(sql).Select(x => new Notification(x.nodeId, x.userId, x.action, objectType));
return AmbientScope.Database.Fetch<UserNotificationDto>(sql).Select(x => new Notification(x.NodeId, x.UserId, x.Action, objectType));
}
public IEnumerable<Notification> GetUserNotifications(IUser user)
{
var sql = AmbientScope.SqlContext.Sql()
.Select("DISTINCT umbracoNode.id, umbracoUser2NodeNotify.userId, umbracoNode.nodeObjectType, umbracoUser2NodeNotify.action")
.Select("DISTINCT umbracoNode.id AS nodeId, umbracoUser2NodeNotify.userId, umbracoNode.nodeObjectType, umbracoUser2NodeNotify.action")
.From<User2NodeNotifyDto>()
.InnerJoin<NodeDto>()
.On<User2NodeNotifyDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
.Where<User2NodeNotifyDto>(dto => dto.UserId == (int)user.Id)
.OrderBy<NodeDto>(dto => dto.NodeId);
var dtos = AmbientScope.Database.Fetch<dynamic>(sql);
var dtos = AmbientScope.Database.Fetch<UserNotificationDto>(sql);
//need to map the results
return dtos.Select(d => new Notification(d.id, d.userId, d.action, d.nodeObjectType)).ToList();
return dtos.Select(d => new Notification(d.NodeId, d.UserId, d.Action, d.NodeObjectType)).ToList();
}
public IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions)
@@ -66,16 +66,16 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
public IEnumerable<Notification> GetEntityNotifications(IEntity entity)
{
var sql = AmbientScope.SqlContext.Sql()
.Select("DISTINCT umbracoNode.id, umbracoUser2NodeNotify.userId, umbracoNode.nodeObjectType, umbracoUser2NodeNotify.action")
.Select("DISTINCT umbracoNode.id as nodeId, umbracoUser2NodeNotify.userId, umbracoNode.nodeObjectType, umbracoUser2NodeNotify.action")
.From<User2NodeNotifyDto>()
.InnerJoin<NodeDto>()
.On<User2NodeNotifyDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
.Where<User2NodeNotifyDto>(dto => dto.NodeId == entity.Id)
.OrderBy<NodeDto>(dto => dto.NodeId);
var dtos = AmbientScope.Database.Fetch<dynamic>(sql);
var dtos = AmbientScope.Database.Fetch<UserNotificationDto>(sql);
//need to map the results
return dtos.Select(d => new Notification(d.id, d.userId, d.action, d.nodeObjectType)).ToList();
return dtos.Select(d => new Notification(d.NodeId, d.UserId, d.Action, d.NodeObjectType)).ToList();
}
public int DeleteNotifications(IEntity entity)