1
0
mirror of https://github.com/bitwarden/server synced 2025-12-14 15:23:42 +00:00

[EC-432] Add existing Organizations to Provider (#2683)

* [EC-432] Added ProviderOrganizationUnassignedOrganizationDetails_Search stored procedure

* [EC-432] Added IProviderOrganizationRepository.SearchAsync

* [EC-432] Created controller ProviderOrganizationsController to assign Organizations to a Provider

* [EC-432] Filter existing organizations by plans Enterprise or Team

* [EC-432] Existing Organization name links to edit page

* [EC-432] EF filtering out existing organizations by plan type enterprise or teams

* [EC-432] Creating multiple ProviderOrganization records

* [EC-432] Added ProviderOrganizationUnassignedOrganizationDetails_Search stored procedure

* [EC-432] Added IProviderOrganizationRepository.SearchAsync

* [EC-432] Created controller ProviderOrganizationsController to assign Organizations to a Provider

* [EC-432] Filter existing organizations by plans Enterprise or Team

* [EC-432] Existing Organization name links to edit page

* [EC-432] EF filtering out existing organizations by plan type enterprise or teams

* [EC-432] Creating multiple ProviderOrganization records

* [EC-432] Renamed migration script and added missing sproc

* [EC-432] Saving multiple events for the created ProviderOrganizations

* [EC-432] Included unit testing for ProviderService.AddOrganizations and EventService.LogProviderOrganizationEventsAsync

* [EC-432] Removed async from NoopEventService.LogProviderOrganizationEventsAsync

* [EC-432] Remove unused dependency setup in ProviderServiceTests.AddOrganizations_Success

* [EC-432] Renamed AddOrganizations to AddOrganizationsToReseller and removed addingUserId and key arguments

* [EC-432] Added DisplayName attributes to ProviderOrganizationViewModel and used them in the view

* [EC-432] Reverted changes to input fields

* [EC-432] Moved unassigned organizations search to Organizations repo

* [EC-432] Moved AddExistingOrganization action to ProvidersController

* [EC-432] dotnet format

* [EC-432] Fixed unit test issues

* [EC-432] Removed unnecessary Html.DisplayNameFor for labels

* [EC-432] Renamed OrganizationSearchViewModel to OrganizationUnassignedToProviderSearchViewModel

* [EC-432] Modified IEventService.LogProviderOrganizationEventsAsync to receive an IEnumerable as parameter

* [EC-432] Updated IProviderOrganizationRepository and replaced CreateWithManyOrganizations method with CreateManyAsync

* [EC-432] Deleted ProviderOrganization_CreateWithManyOrganizations

* [AC-432] Simplified Organization_UnassignedToProviderSearch query

* [AC-432] Removed unnecessary setup

* [EC-432] Checking if stored procedure exists before creating

* [EC-432] Renamed migration file to recent date
This commit is contained in:
Rui Tomé
2023-03-30 10:54:43 +01:00
committed by GitHub
parent 7b958f275a
commit b6bd041b30
22 changed files with 591 additions and 14 deletions

View File

@@ -18,6 +18,48 @@ public class ProviderOrganizationRepository : Repository<ProviderOrganization, G
: base(connectionString, readOnlyConnectionString)
{ }
public async Task<ICollection<ProviderOrganization>> CreateManyAsync(IEnumerable<ProviderOrganization> providerOrganizations)
{
var entities = providerOrganizations.ToList();
if (!entities.Any())
{
return default;
}
foreach (var providerOrganization in entities)
{
providerOrganization.SetNewId();
}
using (var connection = new SqlConnection(ConnectionString))
{
connection.Open();
using (var transaction = connection.BeginTransaction())
{
try
{
using (var bulkCopy = new SqlBulkCopy(connection, SqlBulkCopyOptions.KeepIdentity, transaction))
{
bulkCopy.DestinationTableName = "[dbo].[ProviderOrganization]";
var dataTable = BuildProviderOrganizationsTable(bulkCopy, entities);
await bulkCopy.WriteToServerAsync(dataTable);
}
transaction.Commit();
return entities.ToList();
}
catch
{
transaction.Rollback();
throw;
}
}
}
}
public async Task<ICollection<ProviderOrganizationOrganizationDetails>> GetManyDetailsByProviderAsync(Guid providerId)
{
using (var connection = new SqlConnection(ConnectionString))
@@ -43,4 +85,56 @@ public class ProviderOrganizationRepository : Repository<ProviderOrganization, G
return results.SingleOrDefault();
}
}
private DataTable BuildProviderOrganizationsTable(SqlBulkCopy bulkCopy, IEnumerable<ProviderOrganization> providerOrganizations)
{
var po = providerOrganizations.FirstOrDefault();
if (po == null)
{
throw new ApplicationException("Must have some ProviderOrganizations to bulk import.");
}
var providerOrganizationsTable = new DataTable("ProviderOrganizationDataTable");
var idColumn = new DataColumn(nameof(po.Id), typeof(Guid));
providerOrganizationsTable.Columns.Add(idColumn);
var providerIdColumn = new DataColumn(nameof(po.ProviderId), typeof(Guid));
providerOrganizationsTable.Columns.Add(providerIdColumn);
var organizationIdColumn = new DataColumn(nameof(po.OrganizationId), typeof(Guid));
providerOrganizationsTable.Columns.Add(organizationIdColumn);
var keyColumn = new DataColumn(nameof(po.Key), typeof(string));
providerOrganizationsTable.Columns.Add(keyColumn);
var settingsColumn = new DataColumn(nameof(po.Settings), typeof(string));
providerOrganizationsTable.Columns.Add(settingsColumn);
var creationDateColumn = new DataColumn(nameof(po.CreationDate), po.CreationDate.GetType());
providerOrganizationsTable.Columns.Add(creationDateColumn);
var revisionDateColumn = new DataColumn(nameof(po.RevisionDate), po.RevisionDate.GetType());
providerOrganizationsTable.Columns.Add(revisionDateColumn);
foreach (DataColumn col in providerOrganizationsTable.Columns)
{
bulkCopy.ColumnMappings.Add(col.ColumnName, col.ColumnName);
}
var keys = new DataColumn[1];
keys[0] = idColumn;
providerOrganizationsTable.PrimaryKey = keys;
foreach (var providerOrganization in providerOrganizations)
{
var row = providerOrganizationsTable.NewRow();
row[idColumn] = providerOrganization.Id;
row[providerIdColumn] = providerOrganization.ProviderId;
row[organizationIdColumn] = providerOrganization.OrganizationId;
row[keyColumn] = providerOrganization.Key;
row[settingsColumn] = providerOrganization.Settings;
row[creationDateColumn] = providerOrganization.CreationDate;
row[revisionDateColumn] = providerOrganization.RevisionDate;
providerOrganizationsTable.Rows.Add(row);
}
return providerOrganizationsTable;
}
}