mirror of
https://github.com/bitwarden/server.git
synced 2025-07-04 09:32:48 -05:00
Initial db work (#1687)
* Add organization sponsorship databases to all providers * Generalize create and update for database, specialize in code
This commit is contained in:
@ -76,6 +76,7 @@ namespace Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures
|
||||
cfg.AddProfile<GroupUserMapperProfile>();
|
||||
cfg.AddProfile<InstallationMapperProfile>();
|
||||
cfg.AddProfile<OrganizationMapperProfile>();
|
||||
cfg.AddProfile<OrganizationSponsorshipMapperProfile>();
|
||||
cfg.AddProfile<OrganizationUserMapperProfile>();
|
||||
cfg.AddProfile<ProviderMapperProfile>();
|
||||
cfg.AddProfile<ProviderUserMapperProfile>();
|
||||
|
@ -0,0 +1,59 @@
|
||||
using AutoFixture;
|
||||
using TableModel = Bit.Core.Models.Table;
|
||||
using AutoFixture.Kernel;
|
||||
using System;
|
||||
using Bit.Core.Repositories.EntityFramework;
|
||||
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
|
||||
using Bit.Test.Common.AutoFixture;
|
||||
using Bit.Test.Common.AutoFixture.Attributes;
|
||||
using Bit.Core.Test.AutoFixture.OrganizationUserFixtures;
|
||||
|
||||
namespace Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures
|
||||
{
|
||||
internal class OrganizationSponsorshipBuilder : ISpecimenBuilder
|
||||
{
|
||||
public object Create(object request, ISpecimenContext context)
|
||||
{
|
||||
if (context == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(context));
|
||||
}
|
||||
|
||||
var type = request as Type;
|
||||
if (type == null || type != typeof(TableModel.OrganizationSponsorship))
|
||||
{
|
||||
return new NoSpecimen();
|
||||
}
|
||||
|
||||
var fixture = new Fixture();
|
||||
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.OrganizationSponsorship>();
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
|
||||
internal class EfOrganizationSponsorship : ICustomization
|
||||
{
|
||||
public void Customize(IFixture fixture)
|
||||
{
|
||||
fixture.Customizations.Add(new IgnoreVirtualMembersCustomization());
|
||||
fixture.Customizations.Add(new GlobalSettingsBuilder());
|
||||
fixture.Customizations.Add(new OrganizationSponsorshipBuilder());
|
||||
fixture.Customizations.Add(new OrganizationUserBuilder());
|
||||
fixture.Customizations.Add(new EfRepositoryListBuilder<OrganizationSponsorshipRepository>());
|
||||
fixture.Customizations.Add(new EfRepositoryListBuilder<OrganizationRepository>());
|
||||
}
|
||||
}
|
||||
|
||||
internal class EfOrganizationSponsorshipAutoDataAttribute : CustomAutoDataAttribute
|
||||
{
|
||||
public EfOrganizationSponsorshipAutoDataAttribute() : base(new SutProviderCustomization(), new EfOrganizationSponsorship())
|
||||
{ }
|
||||
}
|
||||
|
||||
internal class InlineEfOrganizationSponsorshipAutoDataAttribute : InlineCustomAutoDataAttribute
|
||||
{
|
||||
public InlineEfOrganizationSponsorshipAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
|
||||
typeof(EfOrganizationSponsorship) }, values)
|
||||
{ }
|
||||
}
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using Bit.Core.Models.Table;
|
||||
|
||||
namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
|
||||
{
|
||||
public class OrganizationSponsorshipCompare : IEqualityComparer<OrganizationSponsorship>
|
||||
{
|
||||
public bool Equals(OrganizationSponsorship x, OrganizationSponsorship y)
|
||||
{
|
||||
return x.InstallationId.Equals(y.InstallationId) &&
|
||||
x.SponsoringOrganizationId.Equals(y.SponsoringOrganizationId) &&
|
||||
x.SponsoringOrganizationUserId.Equals(y.SponsoringOrganizationUserId) &&
|
||||
x.SponsoredOrganizationId.Equals(y.SponsoredOrganizationId) &&
|
||||
x.OfferedToEmail.Equals(y.OfferedToEmail) &&
|
||||
x.CloudSponsor.Equals(y.CloudSponsor) &&
|
||||
x.TimesRenewedWithoutValidation.Equals(y.TimesRenewedWithoutValidation) &&
|
||||
x.SponsorshipLapsedDate.ToString().Equals(y.SponsorshipLapsedDate.ToString());
|
||||
}
|
||||
|
||||
public int GetHashCode([DisallowNull] OrganizationSponsorship obj)
|
||||
{
|
||||
return base.GetHashCode();
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,138 @@
|
||||
using EfRepo = Bit.Core.Repositories.EntityFramework;
|
||||
using SqlRepo = Bit.Core.Repositories.SqlServer;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using TableModel = Bit.Core.Models.Table;
|
||||
using Xunit;
|
||||
using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
|
||||
using Bit.Core.Test.AutoFixture.Attributes;
|
||||
using Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures;
|
||||
|
||||
namespace Bit.Core.Test.Repositories.EntityFramework
|
||||
{
|
||||
public class OrganizationSponsorshipRepositoryTests
|
||||
{
|
||||
[CiSkippedTheory, EfOrganizationSponsorshipAutoData]
|
||||
public async void CreateAsync_Works_DataMatches(
|
||||
TableModel.OrganizationSponsorship organizationSponsorship, TableModel.Organization sponsoringOrg,
|
||||
List<EfRepo.OrganizationRepository> efOrgRepos,
|
||||
SqlRepo.OrganizationRepository sqlOrganizationRepo,
|
||||
SqlRepo.OrganizationSponsorshipRepository sqlOrganizationSponsorshipRepo,
|
||||
OrganizationSponsorshipCompare equalityComparer,
|
||||
List<EfRepo.OrganizationSponsorshipRepository> suts)
|
||||
{
|
||||
organizationSponsorship.InstallationId = null;
|
||||
organizationSponsorship.SponsoredOrganizationId = null;
|
||||
|
||||
var savedOrganizationSponsorships = new List<TableModel.OrganizationSponsorship>();
|
||||
foreach (var (sut, orgRepo) in suts.Zip(efOrgRepos))
|
||||
{
|
||||
var efSponsoringOrg = await orgRepo.CreateAsync(sponsoringOrg);
|
||||
sut.ClearChangeTracking();
|
||||
organizationSponsorship.SponsoringOrganizationId = efSponsoringOrg.Id;
|
||||
|
||||
await sut.CreateAsync(organizationSponsorship);
|
||||
sut.ClearChangeTracking();
|
||||
|
||||
var savedOrganizationSponsorship = await sut.GetByIdAsync(organizationSponsorship.Id);
|
||||
savedOrganizationSponsorships.Add(savedOrganizationSponsorship);
|
||||
}
|
||||
|
||||
var sqlSponsoringOrg = await sqlOrganizationRepo.CreateAsync(sponsoringOrg);
|
||||
organizationSponsorship.SponsoringOrganizationId = sqlSponsoringOrg.Id;
|
||||
|
||||
var sqlOrganizationSponsorship = await sqlOrganizationSponsorshipRepo.CreateAsync(organizationSponsorship);
|
||||
savedOrganizationSponsorships.Add(await sqlOrganizationSponsorshipRepo.GetByIdAsync(sqlOrganizationSponsorship.Id));
|
||||
|
||||
var distinctItems = savedOrganizationSponsorships.Distinct(equalityComparer);
|
||||
Assert.True(!distinctItems.Skip(1).Any());
|
||||
}
|
||||
|
||||
[CiSkippedTheory, EfOrganizationSponsorshipAutoData]
|
||||
public async void ReplaceAsync_Works_DataMatches(TableModel.OrganizationSponsorship postOrganizationSponsorship,
|
||||
TableModel.OrganizationSponsorship replaceOrganizationSponsorship, TableModel.Organization sponsoringOrg,
|
||||
List<EfRepo.OrganizationRepository> efOrgRepos,
|
||||
SqlRepo.OrganizationRepository sqlOrganizationRepo,
|
||||
SqlRepo.OrganizationSponsorshipRepository sqlOrganizationSponsorshipRepo,
|
||||
OrganizationSponsorshipCompare equalityComparer, List<EfRepo.OrganizationSponsorshipRepository> suts)
|
||||
{
|
||||
postOrganizationSponsorship.InstallationId = null;
|
||||
postOrganizationSponsorship.SponsoredOrganizationId = null;
|
||||
replaceOrganizationSponsorship.InstallationId = null;
|
||||
replaceOrganizationSponsorship.SponsoredOrganizationId = null;
|
||||
|
||||
var savedOrganizationSponsorships = new List<TableModel.OrganizationSponsorship>();
|
||||
foreach (var (sut, orgRepo) in suts.Zip(efOrgRepos))
|
||||
{
|
||||
var efSponsoringOrg = await orgRepo.CreateAsync(sponsoringOrg);
|
||||
sut.ClearChangeTracking();
|
||||
postOrganizationSponsorship.SponsoringOrganizationId = efSponsoringOrg.Id;
|
||||
replaceOrganizationSponsorship.SponsoringOrganizationId = efSponsoringOrg.Id;
|
||||
|
||||
var postEfOrganizationSponsorship = await sut.CreateAsync(postOrganizationSponsorship);
|
||||
sut.ClearChangeTracking();
|
||||
|
||||
replaceOrganizationSponsorship.Id = postEfOrganizationSponsorship.Id;
|
||||
await sut.ReplaceAsync(replaceOrganizationSponsorship);
|
||||
sut.ClearChangeTracking();
|
||||
|
||||
var replacedOrganizationSponsorship = await sut.GetByIdAsync(replaceOrganizationSponsorship.Id);
|
||||
savedOrganizationSponsorships.Add(replacedOrganizationSponsorship);
|
||||
}
|
||||
|
||||
var sqlSponsoringOrg = await sqlOrganizationRepo.CreateAsync(sponsoringOrg);
|
||||
postOrganizationSponsorship.SponsoringOrganizationId = sqlSponsoringOrg.Id;
|
||||
|
||||
var postSqlOrganization = await sqlOrganizationSponsorshipRepo.CreateAsync(postOrganizationSponsorship);
|
||||
replaceOrganizationSponsorship.Id = postSqlOrganization.Id;
|
||||
await sqlOrganizationSponsorshipRepo.ReplaceAsync(replaceOrganizationSponsorship);
|
||||
savedOrganizationSponsorships.Add(await sqlOrganizationSponsorshipRepo.GetByIdAsync(replaceOrganizationSponsorship.Id));
|
||||
|
||||
var distinctItems = savedOrganizationSponsorships.Distinct(equalityComparer);
|
||||
Assert.True(!distinctItems.Skip(1).Any());
|
||||
}
|
||||
|
||||
[CiSkippedTheory, EfOrganizationSponsorshipAutoData]
|
||||
public async void DeleteAsync_Works_DataMatches(TableModel.OrganizationSponsorship organizationSponsorship,
|
||||
TableModel.Organization sponsoringOrg,
|
||||
List<EfRepo.OrganizationRepository> efOrgRepos,
|
||||
SqlRepo.OrganizationRepository sqlOrganizationRepo,
|
||||
SqlRepo.OrganizationSponsorshipRepository sqlOrganizationSponsorshipRepo,
|
||||
List<EfRepo.OrganizationSponsorshipRepository> suts)
|
||||
{
|
||||
organizationSponsorship.InstallationId = null;
|
||||
organizationSponsorship.SponsoredOrganizationId = null;
|
||||
|
||||
foreach (var (sut, orgRepo) in suts.Zip(efOrgRepos))
|
||||
{
|
||||
var efSponsoringOrg = await orgRepo.CreateAsync(sponsoringOrg);
|
||||
sut.ClearChangeTracking();
|
||||
organizationSponsorship.SponsoringOrganizationId = efSponsoringOrg.Id;
|
||||
|
||||
var postEfOrganizationSponsorship = await sut.CreateAsync(organizationSponsorship);
|
||||
sut.ClearChangeTracking();
|
||||
|
||||
var savedEfOrganizationSponsorship = await sut.GetByIdAsync(postEfOrganizationSponsorship.Id);
|
||||
sut.ClearChangeTracking();
|
||||
Assert.True(savedEfOrganizationSponsorship != null);
|
||||
|
||||
await sut.DeleteAsync(savedEfOrganizationSponsorship);
|
||||
sut.ClearChangeTracking();
|
||||
|
||||
savedEfOrganizationSponsorship = await sut.GetByIdAsync(savedEfOrganizationSponsorship.Id);
|
||||
Assert.True(savedEfOrganizationSponsorship == null);
|
||||
}
|
||||
|
||||
var sqlSponsoringOrg = await sqlOrganizationRepo.CreateAsync(sponsoringOrg);
|
||||
organizationSponsorship.SponsoringOrganizationId = sqlSponsoringOrg.Id;
|
||||
|
||||
var postSqlOrganizationSponsorship = await sqlOrganizationSponsorshipRepo.CreateAsync(organizationSponsorship);
|
||||
var savedSqlOrganizationSponsorship = await sqlOrganizationSponsorshipRepo.GetByIdAsync(postSqlOrganizationSponsorship.Id);
|
||||
Assert.True(savedSqlOrganizationSponsorship != null);
|
||||
|
||||
await sqlOrganizationSponsorshipRepo.DeleteAsync(postSqlOrganizationSponsorship);
|
||||
savedSqlOrganizationSponsorship = await sqlOrganizationSponsorshipRepo.GetByIdAsync(postSqlOrganizationSponsorship.Id);
|
||||
Assert.True(savedSqlOrganizationSponsorship == null);
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user