From e1bede110851377046c52c30eaeeef5ebb1c6f03 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:27:54 +1000 Subject: [PATCH] Revert changes to ReferenceEvent code (#3091) * Revert changes to ReferenceEvent code This will be done in AC-1481 --- .../UpgradeOrganizationPlanCommand.cs | 4 +--- src/Core/Services/Implementations/OrganizationService.cs | 4 +--- src/Core/Tools/Models/Business/ReferenceEvent.cs | 4 ---- test/Core.Test/Services/OrganizationServiceTests.cs | 4 +--- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs b/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs index 54ca15ba13..c9fb75dc37 100644 --- a/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs +++ b/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs @@ -284,9 +284,7 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand OldPlanType = existingPasswordManagerPlan.Type, Seats = organization.Seats, Storage = organization.MaxStorageGb, - SmSeats = organization.SmSeats, - ServiceAccounts = organization.SmServiceAccounts, - UseSecretsManager = organization.UseSecretsManager + // TODO: add reference events for SmSeats and Service Accounts - see AC-1481 }); } diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 1e791214bd..3c3f5d709c 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -481,9 +481,7 @@ public class OrganizationService : IOrganizationService PlanType = passwordManagerPlan.Type, Seats = returnValue.Item1.Seats, Storage = returnValue.Item1.MaxStorageGb, - SmSeats = returnValue.Item1.SmSeats, - ServiceAccounts = returnValue.Item1.SmServiceAccounts, - UseSecretsManager = returnValue.Item1.UseSecretsManager + // TODO: add reference events for SmSeats and Service Accounts - see AC-1481 }); return returnValue; } diff --git a/src/Core/Tools/Models/Business/ReferenceEvent.cs b/src/Core/Tools/Models/Business/ReferenceEvent.cs index b50609752f..393708668a 100644 --- a/src/Core/Tools/Models/Business/ReferenceEvent.cs +++ b/src/Core/Tools/Models/Business/ReferenceEvent.cs @@ -52,7 +52,6 @@ public class ReferenceEvent public int? Seats { get; set; } public int? PreviousSeats { get; set; } - public int? PreviousServiceAccounts { get; set; } public short? Storage { get; set; } @@ -71,7 +70,4 @@ public class ReferenceEvent public string ClientId { get; set; } public Version ClientVersion { get; set; } - public int? SmSeats { get; set; } - public int? ServiceAccounts { get; set; } - public bool UseSecretsManager { get; set; } } diff --git a/test/Core.Test/Services/OrganizationServiceTests.cs b/test/Core.Test/Services/OrganizationServiceTests.cs index aa71d210b6..b786fdb83e 100644 --- a/test/Core.Test/Services/OrganizationServiceTests.cs +++ b/test/Core.Test/Services/OrganizationServiceTests.cs @@ -183,10 +183,8 @@ public class OrganizationServiceTests referenceEvent.PlanName == purchaseOrganizationPlan[0].Name && referenceEvent.PlanType == purchaseOrganizationPlan[0].Type && referenceEvent.Seats == result.Item1.Seats && - referenceEvent.SmSeats == result.Item1.SmSeats && - referenceEvent.ServiceAccounts == result.Item1.SmServiceAccounts && - referenceEvent.UseSecretsManager == result.Item1.UseSecretsManager && referenceEvent.Storage == result.Item1.MaxStorageGb)); + // TODO: add reference events for SmSeats and Service Accounts - see AC-1481 Assert.NotNull(result); Assert.NotNull(result.Item1);