Feed: add braces
This commit is contained in:
parent
ccd017a927
commit
e9c52a232d
@ -32,7 +32,7 @@ namespace ASC.Feed.Data
|
|||||||
private readonly TenantManager _tenantManager;
|
private readonly TenantManager _tenantManager;
|
||||||
private readonly TenantUtil _tenantUtil;
|
private readonly TenantUtil _tenantUtil;
|
||||||
private readonly Lazy<FeedDbContext> _lazyFeedDbContext;
|
private readonly Lazy<FeedDbContext> _lazyFeedDbContext;
|
||||||
private readonly FeedDbContext FeedDbContext => _lazyFeedDbContext.Value;
|
private FeedDbContext FeedDbContext => _lazyFeedDbContext.Value;
|
||||||
|
|
||||||
public FeedAggregateDataProvider(
|
public FeedAggregateDataProvider(
|
||||||
AuthContext authContext,
|
AuthContext authContext,
|
||||||
@ -76,11 +76,15 @@ namespace ASC.Feed.Data
|
|||||||
foreach (var feed in feeds)
|
foreach (var feed in feeds)
|
||||||
{
|
{
|
||||||
feedsPortion.Add(feed);
|
feedsPortion.Add(feed);
|
||||||
if (feedsPortion.Sum(f => f.Users.Count) <= feedsPortionSize) continue;
|
if (feedsPortion.Sum(f => f.Users.Count) <= feedsPortionSize)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
SaveFeedsPortion(feedsPortion, aggregatedDate);
|
SaveFeedsPortion(feedsPortion, aggregatedDate);
|
||||||
feedsPortion.Clear();
|
feedsPortion.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (feedsPortion.Count > 0)
|
if (feedsPortion.Count > 0)
|
||||||
{
|
{
|
||||||
SaveFeedsPortion(feedsPortion, aggregatedDate);
|
SaveFeedsPortion(feedsPortion, aggregatedDate);
|
||||||
@ -93,7 +97,10 @@ namespace ASC.Feed.Data
|
|||||||
|
|
||||||
foreach (var f in feeds)
|
foreach (var f in feeds)
|
||||||
{
|
{
|
||||||
if (0 >= f.Users.Count) continue;
|
if (0 >= f.Users.Count)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
var feedAggregate = new FeedAggregate
|
var feedAggregate = new FeedAggregate
|
||||||
{
|
{
|
||||||
@ -181,6 +188,7 @@ namespace ASC.Feed.Data
|
|||||||
&& tryCount++ < 5);
|
&& tryCount++ < 5);
|
||||||
|
|
||||||
filter.Offset = filterOffset;
|
filter.Offset = filterOffset;
|
||||||
|
|
||||||
return feeds.Take(filterLimit).SelectMany(group => group.Value).ToList();
|
return feeds.Take(filterLimit).SelectMany(group => group.Value).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -351,12 +359,16 @@ namespace ASC.Feed.Data
|
|||||||
feedMin.Author = new FeedMinUser { UserInfo = userManager.GetUsers(feedMin.AuthorId) };
|
feedMin.Author = new FeedMinUser { UserInfo = userManager.GetUsers(feedMin.AuthorId) };
|
||||||
feedMin.CreatedDate = CreatedDate;
|
feedMin.CreatedDate = CreatedDate;
|
||||||
|
|
||||||
if (feedMin.Comments == null) return feedMin;
|
if (feedMin.Comments == null)
|
||||||
|
{
|
||||||
|
return feedMin;
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var comment in feedMin.Comments)
|
foreach (var comment in feedMin.Comments)
|
||||||
{
|
{
|
||||||
comment.Author = new FeedMinUser { UserInfo = userManager.GetUsers(comment.AuthorId) };
|
comment.Author = new FeedMinUser { UserInfo = userManager.GetUsers(comment.AuthorId) };
|
||||||
}
|
}
|
||||||
|
|
||||||
return feedMin;
|
return feedMin;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,7 +78,10 @@ namespace ASC.Feed.Data
|
|||||||
|
|
||||||
public void SetTimeReaded(Guid user, DateTime time, string module, int tenant)
|
public void SetTimeReaded(Guid user, DateTime time, string module, int tenant)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(module)) return;
|
if (string.IsNullOrEmpty(module))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var feedReaded = new FeedReaded
|
var feedReaded = new FeedReaded
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user