From 154666100aa2d7e03338da3d0d95a991a9c05e7d Mon Sep 17 00:00:00 2001 From: Jawwad Mukhtar Date: Tue, 18 Jul 2023 16:54:29 +0100 Subject: [PATCH 1/4] tidy up of groups --- .../HelpMyStreet.Utils/Enums/Groups.cs | 43 ++------------ .../Enums/RegistrationFormVariant.cs | 22 ++------ .../Enums/RequestHelpFormVariant.cs | 32 +---------- .../Extensions/GroupsExtensions.cs | 56 +------------------ .../RequestHelpFormVariantExtensions.cs | 10 ---- 5 files changed, 14 insertions(+), 149 deletions(-) diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs index 4c01168ce..420512faf 100644 --- a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs +++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs @@ -2,45 +2,10 @@ namespace HelpMyStreet.Utils.Enums { public enum Groups { - Generic = -1, - FTLOS = -2, - AgeUKLSL = -3, - HLP = -4, - Tankersley = -5, + Generic = -1, Ruddington = -6, - AgeUKWirral = -7, - AgeUKNottsBalderton = -8, - AgeUKNorthWestKent = -9, - AgeUKNottsNorthMuskham = -10, - AgeUKSouthKentCoast = -11, - AgeUKFavershamAndSittingbourne = -13, - LincolnshireVolunteers = -12, - EastLindseyPCN = -14, - GranthamPCN = -15, - SouthLincolnPCN = -16, - StamfordPCN = -17, - SpilsbyPCN = -18, - BostonPCN = -19, - LincolnPCN = -20, - LincolnPortlandPCN = -21, - Sandbox = -22, - AgeConnectsCardiff = -23, - MeadowsCommunityHelpers = -24, - MansfieldCVS = -25, - MansfieldWickes = -26, - GamstonCommunityHall = -27, - RichardHerrodCentre = -28, - KingsMeadowCampus = -29, - ForestRecreationGround = -30, - Southwell = -31, - ApexBankStaff = -32, - AgeUKMidMersey = -33, - BostonGNS = -34, - UkraineRefugees = -35, - LincolnshireVCS = -36, - LincolnshireLCVS = -37, - NHSVRDemo=-38, - NottinghamshireCountyCouncil = -39, - NottinghamshireIntegratedCareBoard = -40 + AgeUKWirral = -7, + Sandbox = -22, + Southwell = -31 } } diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/RegistrationFormVariant.cs b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/RegistrationFormVariant.cs index 16cf1c3c1..f131abf70 100644 --- a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/RegistrationFormVariant.cs +++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/RegistrationFormVariant.cs @@ -2,25 +2,11 @@ { public enum RegistrationFormVariant { - Default = 0, - FtLOS = 2, - AgeUKLSL = 3, + Default = 0, FaceMasks = 4, - AgeUKWirral = 5, - AgeUKNottsBalderton = 6, - AgeUKNWK = 7, - AgeUKSKC = 8, - AgeUKFandS = 9, - LincolnshireVolunteers = 10, - Ruddington = 11, - AgeConnectsCardiff = 12, - MeadowsCommunityHelpers = 13, - MansfieldCVS = 14, - Southwell = 15, - ApexBankStaff = 16, - AgeUKMidMersey = 17, - BostonGNS = 18, - UkraineRefugees = 19 + AgeUKWirral = 5, + Ruddington = 11, + Southwell = 15 } } \ No newline at end of file diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/RequestHelpFormVariant.cs b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/RequestHelpFormVariant.cs index f5308a25a..a5f116c89 100644 --- a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/RequestHelpFormVariant.cs +++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/RequestHelpFormVariant.cs @@ -3,36 +3,10 @@ public enum RequestHelpFormVariant { Default = 1, - VitalsForVeterans = 2, - DIY = 3, - FtLOS = 4, FaceMasks = 5, Ruddington = 7, - AgeUKWirral = 8, - AgeUKNottsBalderton = 9, - AgeUKNorthWestKent_Public = 10, - AgeUKNorthWestKent_RequestSubmitter = 11, - AgeUKNottsNorthMuskham = 12, - AgeUKSouthKentCoast_Public = 13, - AgeUKSouthKentCoast_RequestSubmitter = 14, - AgeUKFavershamAndSittingbourne_Public = 15, - AgeUKFavershamAndSittingbourne_RequestSubmitter = 16, - LincolnshireVolunteers = 17, - ChildGroupSelector = 18, - Sandbox_RequestSubmitter = 19, - AgeConnectsCardiff_RequestSubmitter = 20, - AgeConnectsCardiff_Public = 21, - MeadowsCommunityHelpers_Public = 22, - MeadowsCommunityHelpers_RequestSubmitter = 23, - Mansfield_CVS = 24, - Soutwell_Public = 25, - ApexBankStaff_RequestSubmitter = 26, - AgeUKMidMersey_Public = 27, - AgeUKMidMersey_RequestSubmitter = 28, - BostonGNS_Public = 29, - BostonGNS_RequestSubmitter = 30, - LincolnshireVolunteersRequests_RequestSubmitter = 32, - UkraineRefugees_RequestSubmitter = 33, - NHSVRDemo_RequestSubmitter = 34 + AgeUKWirral = 8, + Sandbox_RequestSubmitter = 19, + Soutwell_Public = 25 } } diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/Extensions/GroupsExtensions.cs b/HelpMyStreet.Utils/HelpMyStreet.Utils/Extensions/GroupsExtensions.cs index 8582c8073..bb2ca17b0 100644 --- a/HelpMyStreet.Utils/HelpMyStreet.Utils/Extensions/GroupsExtensions.cs +++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/Extensions/GroupsExtensions.cs @@ -10,46 +10,11 @@ public static string GroupIdentifier(this Groups groups) { return groups switch { - Groups.Generic => "HMS", - Groups.FTLOS => "FTL", - Groups.AgeUKLSL => "LSL", - Groups.HLP => "HLP", - Groups.Tankersley => "TAP", + Groups.Generic => "HMS", Groups.Ruddington => "RUD", - Groups.AgeUKWirral => "WIR", - Groups.AgeUKNottsBalderton => "BAL", - Groups.AgeUKNorthWestKent => "NWK", - Groups.AgeUKNottsNorthMuskham => "NMK", - Groups.AgeUKSouthKentCoast => "SKC", - Groups.AgeUKFavershamAndSittingbourne => "FAS", - Groups.LincolnshireVolunteers => "LCN", - Groups.EastLindseyPCN => "EL", - Groups.GranthamPCN => "GRA", - Groups.SouthLincolnPCN => "SLN", - Groups.StamfordPCN => "SFD", - Groups.SpilsbyPCN => "SBY", - Groups.BostonPCN => "BTN", - Groups.LincolnPCN => "APX", - Groups.LincolnPortlandPCN => "LPL", - Groups.Sandbox => "TEST", - Groups.AgeConnectsCardiff => "ACC", - Groups.MeadowsCommunityHelpers => "MCC", - Groups.MansfieldCVS => "MAN", - Groups.MansfieldWickes => "WKS", - Groups.GamstonCommunityHall => "GMS", - Groups.RichardHerrodCentre => "RHC", - Groups.KingsMeadowCampus => "KMC", - Groups.ForestRecreationGround => "FRG", + Groups.AgeUKWirral => "WIR", + Groups.Sandbox => "TEST", Groups.Southwell => "SW", - Groups.ApexBankStaff => "ABS", - Groups.AgeUKMidMersey => "MDM", - Groups.BostonGNS => "GNS", - Groups.UkraineRefugees => "UKR", - Groups.LincolnshireVCS => "VCS", - Groups.LincolnshireLCVS=> "LCV", - Groups.NHSVRDemo => "NHS", - Groups.NottinghamshireCountyCouncil=> "NCC", - Groups.NottinghamshireIntegratedCareBoard=>"ICB", _ => throw new ArgumentException(message: $"Unexpected Group: {groups}", paramName: nameof(groups)) }; } @@ -58,21 +23,6 @@ public static bool IsEnabled(this Groups groups) { return groups switch { - Groups.HLP => false, - Groups.GranthamPCN => false, - Groups.SouthLincolnPCN => false, - Groups.SpilsbyPCN => false, - Groups.BostonPCN => false, - Groups.LincolnPortlandPCN => false, - Groups.MeadowsCommunityHelpers => false, - Groups.MansfieldCVS => false, - Groups.MansfieldWickes => false, - Groups.GamstonCommunityHall => false, - Groups.RichardHerrodCentre => false, - Groups.KingsMeadowCampus => false, - Groups.ForestRecreationGround => false, - Groups.BostonGNS => false, - Groups.UkraineRefugees => false, _ => true }; } diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/Extensions/RequestHelpFormVariantExtensions.cs b/HelpMyStreet.Utils/HelpMyStreet.Utils/Extensions/RequestHelpFormVariantExtensions.cs index 7c2d4aaa2..6da080312 100644 --- a/HelpMyStreet.Utils/HelpMyStreet.Utils/Extensions/RequestHelpFormVariantExtensions.cs +++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/Extensions/RequestHelpFormVariantExtensions.cs @@ -10,17 +10,8 @@ public static bool IsPublic(this RequestHelpFormVariant requestHelpFormVariant) { return requestHelpFormVariant switch { - RequestHelpFormVariant.AgeUKNorthWestKent_RequestSubmitter => false, - RequestHelpFormVariant.AgeUKFavershamAndSittingbourne_RequestSubmitter => false, - RequestHelpFormVariant.AgeUKSouthKentCoast_RequestSubmitter => false, - RequestHelpFormVariant.AgeConnectsCardiff_RequestSubmitter=> false, - RequestHelpFormVariant.MeadowsCommunityHelpers_RequestSubmitter => false, RequestHelpFormVariant.Sandbox_RequestSubmitter => false, RequestHelpFormVariant.AgeUKWirral => false, - RequestHelpFormVariant.VitalsForVeterans => false, - RequestHelpFormVariant.AgeUKMidMersey_RequestSubmitter => false, - RequestHelpFormVariant.BostonGNS_RequestSubmitter => false, - RequestHelpFormVariant.UkraineRefugees_RequestSubmitter => false, _ => true }; } @@ -29,7 +20,6 @@ public static bool UseAppliedForStatusIfApplicable(this RequestHelpFormVariant r { return requestHelpFormVariant switch { - RequestHelpFormVariant.LincolnshireVolunteersRequests_RequestSubmitter => true, _ => false }; } From d29d5fdfab950524180ef77421d6e2ce102799f8 Mon Sep 17 00:00:00 2001 From: Jawwad Mukhtar Date: Wed, 19 Jul 2023 08:31:22 +0100 Subject: [PATCH 2/4] dummy commit --- HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs index 420512faf..92d4e9ada 100644 --- a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs +++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Groups.cs @@ -8,4 +8,4 @@ public enum Groups Sandbox = -22, Southwell = -31 } -} +} \ No newline at end of file From 2536c0d2e1654bbef0ae2b7277c88e0da9bb712f Mon Sep 17 00:00:00 2001 From: Jawwad Mukhtar Date: Wed, 19 Jul 2023 11:35:31 +0100 Subject: [PATCH 3/4] add usedotnet step --- azure-pipelines.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e7583456..3606f0ce3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,6 +12,14 @@ pool: vmImage: 'windows-latest' steps: + +- task: UseDotNet@2 + displayName: 'Install .NET Core SDK' + inputs: + version: 3.x + performMultiLevelLookup: true + includePreviewVersions: true # Required for preview versions + - task: DotNetCoreCLI@2 displayName: DotNetCore build inputs: From fca3729527358c53aa4b3a457cc42f5528730517 Mon Sep 17 00:00:00 2001 From: Jawwad Mukhtar Date: Fri, 28 Jul 2023 08:00:01 +0100 Subject: [PATCH 4/4] Remove unused location --- .../HelpMyStreet.Utils/Enums/Location.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Location.cs b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Location.cs index d770c8b33..842ad6a2b 100644 --- a/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Location.cs +++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/Enums/Location.cs @@ -2,21 +2,9 @@ { public enum Location { - LincolnCountyHospital = -1, - PilgramHospitalBolton = -2, LouthCommunityHospital = -3, - TableTennisClubGrantham = -4, - WaddingtonBranchSurgerySouthLincoln = -5, StMarysMedicalPracticeStamford = -6, - FranklinHallSpilsby = -7, - SidingsMedicalPracticeBoston = -8, RustonsSportsAndSocialClubLincoln = -9, - PortlandMedicalPracticeLincoln = -10, - MansfieldWickesSite = -11, - GamstonCommunityHall = -12, - RichardHerrodCentre = -13, - KingsMeadowCampus = -14, - ForestRecreationGround = -15, RichmondMedicalCentre = -16 } } \ No newline at end of file