diff --git a/src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs b/src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs index a9d5f69..8428358 100644 --- a/src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs +++ b/src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs @@ -41,9 +41,8 @@ namespace EventHub.Organizations.Memberships [Authorize] public async Task LeaveAsync(Guid organizationId) { - await _organizationMembershipManager.LeaveAsync( - await _organizationRepository.GetAsync(organizationId), - await _userRepository.GetAsync(CurrentUser.GetId()) + await _organizationMembershipsRepository.DeleteAsync( + x => x.OrganizationId == organizationId && x.UserId == CurrentUser.GetId() ); } diff --git a/src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs b/src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs index 3e32daa..4121725 100644 --- a/src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs +++ b/src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs @@ -33,15 +33,6 @@ namespace EventHub.Organizations.Memberships ); } - public async Task LeaveAsync( - Organization organization, - AppUser user) - { - await _organizationMembershipsRepository.DeleteAsync( - x => x.OrganizationId == organization.Id && x.UserId == user.Id - ); - } - public async Task IsJoinedAsync( Organization organization, AppUser user) diff --git a/test/EventHub.Domain.Tests/Organizations/Memberships/OrganizationMembershipManagerTests.cs b/test/EventHub.Domain.Tests/Organizations/Memberships/OrganizationMembershipManagerTests.cs index 7929927..6ff8ad8 100644 --- a/test/EventHub.Domain.Tests/Organizations/Memberships/OrganizationMembershipManagerTests.cs +++ b/test/EventHub.Domain.Tests/Organizations/Memberships/OrganizationMembershipManagerTests.cs @@ -33,31 +33,6 @@ namespace EventHub.Organizations.Memberships .ShouldNotBeNull(); } - [Fact] - public async Task Should_Leave_From_An_Organization() - { - await WithUnitOfWorkAsync(async () => - { - await _organizationMembershipRepository.InsertAsync( - new OrganizationMembership( - Guid.NewGuid(), - _testData.OrganizationVolosoftId, - _testData.UserAdminId - ) - ); - }); - - await WithUnitOfWorkAsync(async () => - { - var user = await GetUserAsync(_testData.UserAdminId); - var organization = await GetOrganizationAsync(_testData.OrganizationVolosoftName); - await _organizationMembershipManager.LeaveAsync(organization, user); - }); - - (await GetMembershipOrNull(_testData.OrganizationVolosoftId, _testData.UserAdminId)) - .ShouldBeNull(); - } - private async Task GetMembershipOrNull(Guid organizationId, Guid userId) { return await WithUnitOfWorkAsync(async () =>