From 9895a1ddfb4b08dd131dbd97c2b744721afda8b0 Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Thu, 29 Jul 2021 16:35:03 +0300 Subject: [PATCH] fix(Admin): bad indentation --- .../OrganizationMembershipManagement.razor | 4 +-- .../OrganizationMembershipRepository.cs | 28 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor b/src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor index a304b2d..79f6f18 100644 --- a/src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor +++ b/src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor @@ -23,14 +23,14 @@
- + @L["OrganizationName"] - + @L["UserName"] diff --git a/src/EventHub.EntityFrameworkCore/EntityFrameworkCore/Organizations/Memberships/OrganizationMembershipRepository.cs b/src/EventHub.EntityFrameworkCore/EntityFrameworkCore/Organizations/Memberships/OrganizationMembershipRepository.cs index f540e94..fa1b3bb 100644 --- a/src/EventHub.EntityFrameworkCore/EntityFrameworkCore/Organizations/Memberships/OrganizationMembershipRepository.cs +++ b/src/EventHub.EntityFrameworkCore/EntityFrameworkCore/Organizations/Memberships/OrganizationMembershipRepository.cs @@ -12,17 +12,18 @@ using Volo.Abp.Identity; namespace EventHub.EntityFrameworkCore.Organizations.Memberships { - public class OrganizationMembershipRepository : EfCoreRepository, IOrganizationMembershipRepository + public class OrganizationMembershipRepository : EfCoreRepository, + IOrganizationMembershipRepository { - public OrganizationMembershipRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + public OrganizationMembershipRepository(IDbContextProvider dbContextProvider) + : base(dbContextProvider) { - } public async Task> GetMemberListAsync( - Guid? organizationId, + Guid? organizationId, Guid? userId, - int skipCount, + int skipCount, int maxResultCount, CancellationToken cancellationToken = default) { @@ -31,14 +32,15 @@ namespace EventHub.EntityFrameworkCore.Organizations.Memberships var organizationMembershipsDbSet = dbContext.Set(); var identityUserDbSet = dbContext.Set(); var organizationDbSet = dbContext.Set(); - + var query = organizationMembershipsDbSet - .Join(organizationDbSet, t => t.OrganizationId, organization => organization.Id - , (organizationMember, organization) => new {organizationMember, organization}) - .Join(identityUserDbSet, organizationWithMember => organizationWithMember.organizationMember.UserId, user => user.Id, - (organizationWithMember, user) => new {organizationWithMember, user}) + .Join(organizationDbSet, t => t.OrganizationId, organization => organization.Id, + (organizationMember, organization) => new {organizationMember, organization}) + .Join(identityUserDbSet, organizationWithMember => organizationWithMember.organizationMember.UserId, + user => user.Id, (organizationWithMember, user) => new {organizationWithMember, user}) .WhereIf(userId.HasValue, t => t.user.Id == userId) - .WhereIf(organizationId.HasValue, t => t.organizationWithMember.organizationMember.OrganizationId == organizationId) + .WhereIf(organizationId.HasValue, + t => t.organizationWithMember.organizationMember.OrganizationId == organizationId) .OrderByDescending(o => o.organizationWithMember.organizationMember.CreationTime) .Select(t => new OrganizationMemberWithDetails { @@ -48,14 +50,14 @@ namespace EventHub.EntityFrameworkCore.Organizations.Memberships Name = t.user.Name, Surname = t.user.Surname }); - + return await query .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } public async Task GetCountAsync( - Guid? organizationId, + Guid? organizationId, Guid? userId, CancellationToken cancellationToken = default) {