[AC-1682] Flexible collections: EF data migrations integration tests #3937

r-tome · 2024-03-28T16:33:31Z

Type of change

- [ ] Bug fix
- [X] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps)
- [ ] Other

Objective

Enable the existing integration tests written for SQL to also validate the EF migrations that will run for Self-host instances.

Code changes

src/Core/AdminConsole/Repositories/IOrganizationRepository.cs: Added a summary for the EnableCollectionEnhancements method.
src/Infrastructure.EntityFramework/AdminConsole/Repositories/Executions/*: Moved the scripts to the Infrastructure.EntityFramework project
src/Infrastructure.EntityFramework/AdminConsole/Repositories/Executions/OrganizationEnableCollectionEnhancementsExecution.cs: Added a helper class to run the relevant script for the executing database provider
src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs: Implemented the method for EF
test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationEnableCollectionEnhancementTests.cs: Updated the integration tests to run for EF

Before you submit

Please check for formatting errors (dotnet format --verify-no-changes) (required)
If making database changes - make sure you also update Entity Framework queries and/or migrations
Please add unit tests where it makes sense to do so (encouraged but not required)
If this change requires a documentation update - notify the documentation team
If this change has particular deployment requirements - notify the DevOps team

… = 1 for all users with Manager role or 'EditAssignedCollections' permission

…mmendations

…lection assignments Co-authored-by: Thomas Rittson <[email protected]>

…signedCollectionUsers sql script

…o file name

…permissions

…EditAssignedCollections permission assigned to groups with collection access

…rmissions

…into ac/ac-1682/ef-migrations

…rmissions

…nd set all Managers to Users

… date

…e organization data for flexible collections

…collections

This reverts commit 54cc6fa.

…ate by each OrgUser

…rmissions

…ncements for organizations that have not yet migrated

…ser_BumpAccountRevisionDateByCollectionId

(cherry picked from commit 00eea06)

(cherry picked from commit 26f5bf8)

(cherry picked from commit c20912f)

…already wraps it under its own transaction (cherry picked from commit 7b54d78)

… migrated in previous steps (cherry picked from commit 28bba94)

(cherry picked from commit a957530)

(cherry picked from commit deee483)

(cherry picked from commit c3ca9ec)

(cherry picked from commit fada0a8)

…ll existing Orgs (cherry picked from commit bd3b21b)

(cherry picked from commit eb7794d)

(cherry picked from commit 26768b7)

…ager available (cherry picked from commit 2890f78)

…mework project and added an interface (IExecution) to run them against the database

…ations and checked for incorrect associations between organization users and collections

…itwarden/server into ac/ac-1682/ef-migrations-tests # Conflicts: # src/Api/Billing/Controllers/ProviderBillingController.cs # src/Api/Billing/Models/Responses/ProviderSubscriptionResponse.cs # src/Billing/Controllers/StripeController.cs # src/Core/Billing/Commands/IAssignSeatsToClientOrganizationCommand.cs # src/Core/Billing/Extensions/BillingExtensions.cs # src/Core/Billing/Extensions/ServiceCollectionExtensions.cs # src/Core/Billing/Models/ConfiguredProviderPlanDTO.cs # src/Core/Billing/Queries/IProviderBillingQueries.cs # src/Core/Billing/Queries/ISubscriberQueries.cs # src/Core/Billing/Queries/Implementations/ProviderBillingQueries.cs # src/Core/Billing/Queries/Implementations/SubscriberQueries.cs # src/Core/Constants.cs # src/Core/Core.csproj # src/Core/Models/Business/SubscriptionUpdate.cs # src/Core/Services/Implementations/StripePaymentService.cs # src/Infrastructure.EntityFramework/AdminConsole/Repositories/Executions/Sqlite/OrganizationEnableCollectionEnhancements.sql # test/Api.IntegrationTest/SecretsManager/Controllers/SecretsControllerTests.cs # test/Api.Test/Billing/Controllers/ProviderBillingControllerTests.cs # test/Core.Test/Billing/Queries/ProviderBillingQueriesTests.cs # test/Core.Test/Billing/Queries/SubscriberQueriesTests.cs

r-tome and others added 30 commits November 10, 2023 15:28

[AC-1682] Data migrations for OrgUsers or Groups with AccessAll enabled

e14ba4d

[AC-1682] Added script to update [dbo].[CollectionUser] with [Manage]…

1527af7

… = 1 for all users with Manager role or 'EditAssignedCollections' permission

[AC-1682] Updated sql data migration procedures with performance reco…

577e591

…mmendations

[AC-1682] Moved data migration scripts to DbScripts_transition folder

23a3e5c

Apply suggestions from code review: Remove Manage permission from Col…

d693511

…lection assignments Co-authored-by: Thomas Rittson <[email protected]>

[AC-1682] Removed unnecessary Collection table join on ManagersEditAs…

0475b93

…signedCollectionUsers sql script

[AC-1682] Change JOIN to INNER JOIN in SQL scripts

3e7e3a0

[AC-1682] Renamed sql script to recent date and added correct order t…

be35a2b

…o file name

Merge branch 'master' into ac/ac-1682/data-migrations-for-deprecated-…

b7773b6

…permissions

[AC-1682] Added EF migrations

003b6dc

[AC-1682] dotnet format

2e9be13

[AC-1682] Add new rows to CollectionUser for Managers and users with …

7d718b6

…EditAssignedCollections permission assigned to groups with collection access

Merge branch 'main' into ac/ac-1682/data-migrations-for-deprecated-pe…

69c0997

…rmissions

Merge branch 'ac/ac-1682/data-migrations-for-deprecated-permissions' …

87d420a

…into ac/ac-1682/ef-migrations

[AC-1682] Added new mysql migration

5f1f7d6

[AC-1682] mySql scripts formatting

fc8606a

[AC-1682] MySql migrations

c5f1be4

[AC-1682] Postgres migrations

86ba89f

[AC-1682] Sqlite migrations + dotnet format

73a1315

Merge branch 'main' into ac/ac-1682/data-migrations-for-deprecated-pe…

e7ce15f

…rmissions

[AC-1682] Update FC data migration scripts to clear AccessAll flags a…

fcd2dd3

…nd set all Managers to Users

[AC-1682] Updated data migration scripts to bump the account revision…

8bf17eb

… date

[AC-1682] Created Organization_EnableCollectionEnhancements to migrat…

dfc4032

…e organization data for flexible collections

[AC-1682] Added script to migrate all organization data for flexible …

0d8609a

…collections

[AC-1682] Deleted old data migration scripts

54cc6fa

Revert "[AC-1682] Deleted old data migration scripts"

a214c60

This reverts commit 54cc6fa.

[AC-1682] Modified AccessAllCollectionUsers script to bump revision d…

ee43767

…ate by each OrgUser

Merge branch 'main' into ac/ac-1682/data-migrations-for-deprecated-pe…

71978fe

…rmissions

[AC-1682] Update data migration script to only enable collection enha…

f4450c0

…ncements for organizations that have not yet migrated

[AC-1682] Updated AccessAllCollectionGroups migration script to use U…

8cc8895

…ser_BumpAccountRevisionDateByCollectionId

r-tome and others added 26 commits April 10, 2024 19:24

[AC-1682] dotnet format

95e76f8

(cherry picked from commit 00eea06)

[AC-1682] Fixed Sqlite query

d9c08d8

(cherry picked from commit 26f5bf8)

[AC-1682] Drop temp tables if they exist when starting the scripts

7f7ffe1

(cherry picked from commit c20912f)

[AC-1682] Removed MySql transaction from script because EF migration …

bbff087

…already wraps it under its own transaction (cherry picked from commit 7b54d78)

[AC-1682] Setting FlexibleCollections = 1 only for Orgs that had data…

139318e

… migrated in previous steps (cherry picked from commit 28bba94)

[AC-1682] Updated queries to check for OrganizationId

4ed911a

(cherry picked from commit a957530)

[AC-1682] Fixed MySql script

e2857ad

(cherry picked from commit deee483)

[AC-1682] Fixed Postgres query

467e3dc

(cherry picked from commit c3ca9ec)

[AC-1682] Fix Sqlite query

28bfb52

(cherry picked from commit fada0a8)

[AC-1682] Reverted scripts back to enabling Flexible Collections to a…

0a1f297

…ll existing Orgs (cherry picked from commit bd3b21b)

[AC-1682] Removed dropping temporary table from scripts

51c914e

(cherry picked from commit eb7794d)

[AC-1682] Removed other temp table drops

c37b0c1

(cherry picked from commit 26768b7)

[AC-1978] Fix issue that allows the web app to have the user type Man…

7dc789f

…ager available (cherry picked from commit 2890f78)

Merge branch 'main' into ac-1682

ed988ae

Merge branch 'main' into ac-1682

c0f16f4

[AC-1682] Bump dates on migration scripts

36cdca7

Merge branch 'main' into ac-1682

ba274f2

[AC-1682] Updated integration tests to run for EF database providers

ee50ea5

[AC-1682] Moved EF data migration scripts to Infrastructure.EntityFra…

6edf1e0

…mework project and added an interface (IExecution) to run them against the database

[AC-1682] Updated migrations to use execution interface

040e640

[AC-1682] Added summary to EnableCollectionEnhancements method

ad659bd

[AC-1682] Added unit test to verify migration across multiple organiz…

51ac31e

…ations and checked for incorrect associations between organization users and collections

[AC-1682] Added group to test

22204a9

[AC-1682] Added assertions for the groups access on the unit test

8af2e95

[AC-1682] Update EF migration scripts

f79bba5

r-tome changed the base branch from ac/ac-1682/ef-migrations to ac-1682 April 26, 2024 09:28

Base automatically changed from ac-1682 to main April 26, 2024 13:11

r-tome closed this Apr 30, 2024

r-tome deleted the ac/ac-1682/ef-migrations-tests branch April 30, 2024 17:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[AC-1682] Flexible collections: EF data migrations integration tests #3937

[AC-1682] Flexible collections: EF data migrations integration tests #3937

r-tome commented Mar 28, 2024

[AC-1682] Flexible collections: EF data migrations integration tests #3937

[AC-1682] Flexible collections: EF data migrations integration tests #3937

Conversation

r-tome commented Mar 28, 2024

Type of change

Objective

Code changes

Before you submit