Browse Source

Fix

pull/804/head
Sebastian 4 years ago
parent
commit
9e5ed6c825
  1. 11
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/Apps/MongoAppRepository.cs
  2. 9
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/Schemas/MongoSchemaRepository.cs

11
backend/src/Squidex.Domain.Apps.Entities.MongoDb/Apps/MongoAppRepository.cs

@ -48,7 +48,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Apps
{ {
using (Telemetry.Activities.StartActivity("MongoAppRepository/QueryIdsAsync")) using (Telemetry.Activities.StartActivity("MongoAppRepository/QueryIdsAsync"))
{ {
var find = Collection.Find(x => x.IndexedUserIds.Contains(contributorId) && !x.IndexedDeleted).SortBy(x => x.IndexedCreated); var find = Collection.Find(x => x.IndexedUserIds.Contains(contributorId) && !x.IndexedDeleted);
return await QueryAsync(find, ct); return await QueryAsync(find, ct);
} }
@ -59,7 +59,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Apps
{ {
using (Telemetry.Activities.StartActivity("MongoAppRepository/QueryAsync")) using (Telemetry.Activities.StartActivity("MongoAppRepository/QueryAsync"))
{ {
var find = Collection.Find(x => names.Contains(x.IndexedName) && !x.IndexedDeleted).SortBy(x => x.IndexedCreated); var find = Collection.Find(x => names.Contains(x.IndexedName) && !x.IndexedDeleted);
return await QueryAsync(find, ct); return await QueryAsync(find, ct);
} }
@ -68,7 +68,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Apps
private static async Task<Dictionary<string, DomainId>> QueryAsync(IFindFluent<MongoAppEntity, MongoAppEntity> find, private static async Task<Dictionary<string, DomainId>> QueryAsync(IFindFluent<MongoAppEntity, MongoAppEntity> find,
CancellationToken ct) CancellationToken ct)
{ {
var entities = await find.Only(x => x.DocumentId, x => x.IndexedName).ToListAsync(ct); var entities = await find.SortBy(x => x.IndexedCreated).Only(x => x.DocumentId, x => x.IndexedName).ToListAsync(ct);
var result = new Dictionary<string, DomainId>(); var result = new Dictionary<string, DomainId>();
@ -77,10 +77,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Apps
var indexedId = DomainId.Create(entity["_id"].AsString); var indexedId = DomainId.Create(entity["_id"].AsString);
var indexedName = entity["_an"].AsString; var indexedName = entity["_an"].AsString;
if (!result.ContainsKey(indexedName)) result[indexedName] = indexedId;
{
result.Add(indexedName, indexedId);
}
} }
return result; return result;

9
backend/src/Squidex.Domain.Apps.Entities.MongoDb/Schemas/MongoSchemaRepository.cs

@ -46,7 +46,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Schemas
{ {
using (Telemetry.Activities.StartActivity("MongoSchemaRepository/QueryAsync")) using (Telemetry.Activities.StartActivity("MongoSchemaRepository/QueryAsync"))
{ {
var find = Collection.Find(x => x.IndexedAppId == appId && !x.IndexedDeleted).SortBy(x => x.IndexedCreated); var find = Collection.Find(x => x.IndexedAppId == appId && !x.IndexedDeleted);
return await QueryAsync(find, ct); return await QueryAsync(find, ct);
} }
@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Schemas
private static async Task<Dictionary<string, DomainId>> QueryAsync(IFindFluent<MongoSchemaEntity, MongoSchemaEntity> find, private static async Task<Dictionary<string, DomainId>> QueryAsync(IFindFluent<MongoSchemaEntity, MongoSchemaEntity> find,
CancellationToken ct) CancellationToken ct)
{ {
var entities = await find.Only(x => x.IndexedId, x => x.IndexedName).ToListAsync(ct); var entities = await find.SortBy(x => x.IndexedCreated).Only(x => x.IndexedId, x => x.IndexedName).ToListAsync(ct);
var result = new Dictionary<string, DomainId>(); var result = new Dictionary<string, DomainId>();
@ -64,10 +64,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Schemas
var indexedId = DomainId.Create(entity["_si"].AsString); var indexedId = DomainId.Create(entity["_si"].AsString);
var indexedName = entity["_sn"].AsString; var indexedName = entity["_sn"].AsString;
if (!result.ContainsKey(indexedName)) result[indexedName] = indexedId;
{
result.Add(indexedName, indexedId);
}
} }
return result; return result;

Loading…
Cancel
Save