From 119c815c160c557cb16f6ef648d11e494fc93b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Tue, 17 Jan 2023 15:21:36 +0000
Subject: [PATCH] [EC-912] Updated IdentityServerTests to reinitialize the
 database on constructor (#2538)

* [EC-912] Updated IdentityServerTests to reinitialize the database on constructor

* [EC-912] dotnet format
---
 .../Endpoints/IdentityServerTests.cs          | 60 +++++++------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
index e475bebf3d..af23e79bb0 100644
--- a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
+++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
@@ -22,6 +22,7 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
     public IdentityServerTests(IdentityApplicationFactory factory)
     {
         _factory = factory;
+        ReinitializeDbForTests();
     }
 
     [Fact]
@@ -554,48 +555,21 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
         var organizationUserRepository = _factory.Services.GetService<IOrganizationUserRepository>();
         var policyRepository = _factory.Services.GetService<IPolicyRepository>();
 
-        var organization = await organizationRepository.GetByIdAsync(organizationId);
-        if (organization == null)
-        {
-            organization = new Bit.Core.Entities.Organization { Id = organizationId, Enabled = true, UseSso = ssoPolicyEnabled };
-            await organizationRepository.CreateAsync(organization);
-        }
-        else
-        {
-            organization.UseSso = ssoPolicyEnabled;
-            await organizationRepository.ReplaceAsync(organization);
-        }
+        var organization = new Bit.Core.Entities.Organization { Id = organizationId, Enabled = true, UseSso = ssoPolicyEnabled };
+        await organizationRepository.CreateAsync(organization);
 
         var user = await userRepository.GetByEmailAsync(username);
-        var organizationUser = await organizationUserRepository.GetByOrganizationEmailAsync(organization.Id, username);
-        if (organizationUser == null)
+        var organizationUser = new Bit.Core.Entities.OrganizationUser
         {
-            organizationUser = new Bit.Core.Entities.OrganizationUser
-            {
-                OrganizationId = organization.Id,
-                UserId = user.Id,
-                Status = OrganizationUserStatusType.Confirmed,
-                Type = organizationUserType
-            };
-            await organizationUserRepository.CreateAsync(organizationUser);
-        }
-        else
-        {
-            organizationUser.Type = organizationUserType;
-            await organizationUserRepository.ReplaceAsync(organizationUser);
-        }
+            OrganizationId = organization.Id,
+            UserId = user.Id,
+            Status = OrganizationUserStatusType.Confirmed,
+            Type = organizationUserType
+        };
+        await organizationUserRepository.CreateAsync(organizationUser);
 
-        var ssoPolicy = await policyRepository.GetByOrganizationIdTypeAsync(organization.Id, PolicyType.RequireSso);
-        if (ssoPolicy == null)
-        {
-            ssoPolicy = new Bit.Core.Entities.Policy { OrganizationId = organization.Id, Type = PolicyType.RequireSso, Enabled = ssoPolicyEnabled };
-            await policyRepository.CreateAsync(ssoPolicy);
-        }
-        else
-        {
-            ssoPolicy.Enabled = ssoPolicyEnabled;
-            await policyRepository.ReplaceAsync(ssoPolicy);
-        }
+        var ssoPolicy = new Bit.Core.Entities.Policy { OrganizationId = organization.Id, Type = PolicyType.RequireSso, Enabled = ssoPolicyEnabled };
+        await policyRepository.CreateAsync(ssoPolicy);
     }
 
     private static string DeviceTypeAsString(DeviceType deviceType)
@@ -660,4 +634,14 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
         var errorDescription = AssertHelper.AssertJsonProperty(root, "error_description", JsonValueKind.String).GetString();
         Assert.StartsWith("sso authentication", errorDescription.ToLowerInvariant());
     }
+
+    private void ReinitializeDbForTests()
+    {
+        var databaseContext = _factory.GetDatabaseContext();
+        databaseContext.Policies.RemoveRange(databaseContext.Policies);
+        databaseContext.OrganizationUsers.RemoveRange(databaseContext.OrganizationUsers);
+        databaseContext.Organizations.RemoveRange(databaseContext.Organizations);
+        databaseContext.Users.RemoveRange(databaseContext.Users);
+        databaseContext.SaveChanges();
+    }
 }