diff --git a/src/Sql/dbo/Functions/PolicyApplicableToUser.sql b/src/Sql/dbo/Functions/PolicyApplicableToUser.sql deleted file mode 100644 index 9118360d71..0000000000 --- a/src/Sql/dbo/Functions/PolicyApplicableToUser.sql +++ /dev/null @@ -1,44 +0,0 @@ -CREATE FUNCTION [dbo].[PolicyApplicableToUser] -( - @UserId UNIQUEIDENTIFIER, - @PolicyType TINYINT, - @MinimumStatus SMALLINT -) -RETURNS TABLE -AS RETURN -SELECT - P.* -FROM - [dbo].[PolicyView] P -INNER JOIN - [dbo].[OrganizationUserView] OU ON P.[OrganizationId] = OU.[OrganizationId] -LEFT JOIN - (SELECT - PU.UserId, - PO.OrganizationId - FROM - [dbo].[ProviderUserView] PU - INNER JOIN - [ProviderOrganizationView] PO ON PO.[ProviderId] = PU.[ProviderId]) PUPO - ON PUPO.UserId = OU.UserId - AND PUPO.OrganizationId = P.OrganizationId -WHERE - ( - ( - OU.[Status] != 0 -- OrgUsers who have accepted their invite and are linked to a UserId - AND OU.[UserId] = @UserId - ) - OR ( - OU.[Status] = 0 -- 'Invited' OrgUsers are not linked to a UserId yet, so we have to look up their email - AND OU.[Email] IN (SELECT U.Email FROM [dbo].[UserView] U WHERE U.Id = @UserId) - ) - ) - AND P.[Type] = @PolicyType - AND P.[Enabled] = 1 - AND OU.[Status] >= @MinimumStatus - AND OU.[Type] >= 2 -- Not an owner (0) or admin (1) - AND ( -- Can't manage policies - OU.[Permissions] IS NULL - OR COALESCE(JSON_VALUE(OU.[Permissions], '$.managePolicies'), 'false') = 'false' - ) - AND PUPO.[UserId] IS NULL -- Not a provider diff --git a/src/Sql/dbo/Stored Procedures/Collection_CreateWithGroups.sql b/src/Sql/dbo/Stored Procedures/Collection_CreateWithGroups.sql deleted file mode 100644 index c577e1f02a..0000000000 --- a/src/Sql/dbo/Stored Procedures/Collection_CreateWithGroups.sql +++ /dev/null @@ -1,41 +0,0 @@ -CREATE PROCEDURE [dbo].[Collection_CreateWithGroups] - @Id UNIQUEIDENTIFIER, - @OrganizationId UNIQUEIDENTIFIER, - @Name VARCHAR(MAX), - @ExternalId NVARCHAR(300), - @CreationDate DATETIME2(7), - @RevisionDate DATETIME2(7), - @Groups AS [dbo].[SelectionReadOnlyArray] READONLY -AS -BEGIN - SET NOCOUNT ON - - EXEC [dbo].[Collection_Create] @Id, @OrganizationId, @Name, @ExternalId, @CreationDate, @RevisionDate - - ;WITH [AvailableGroupsCTE] AS( - SELECT - [Id] - FROM - [dbo].[Group] - WHERE - [OrganizationId] = @OrganizationId - ) - INSERT INTO [dbo].[CollectionGroup] - ( - [CollectionId], - [GroupId], - [ReadOnly], - [HidePasswords] - ) - SELECT - @Id, - [Id], - [ReadOnly], - [HidePasswords] - FROM - @Groups - WHERE - [Id] IN (SELECT [Id] FROM [AvailableGroupsCTE]) - - EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId -END \ No newline at end of file diff --git a/src/Sql/dbo/Stored Procedures/Collection_ReadWithGroupsById.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadWithGroupsById.sql deleted file mode 100644 index 4230dca985..0000000000 --- a/src/Sql/dbo/Stored Procedures/Collection_ReadWithGroupsById.sql +++ /dev/null @@ -1,17 +0,0 @@ -CREATE PROCEDURE [dbo].[Collection_ReadWithGroupsById] - @Id UNIQUEIDENTIFIER -AS -BEGIN - SET NOCOUNT ON - - EXEC [dbo].[Collection_ReadById] @Id - - SELECT - [GroupId] [Id], - [ReadOnly], - [HidePasswords] - FROM - [dbo].[CollectionGroup] - WHERE - [CollectionId] = @Id -END \ No newline at end of file diff --git a/src/Sql/dbo/Stored Procedures/Collection_ReadWithGroupsByIdUserId.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadWithGroupsByIdUserId.sql deleted file mode 100644 index 7d30e777bd..0000000000 --- a/src/Sql/dbo/Stored Procedures/Collection_ReadWithGroupsByIdUserId.sql +++ /dev/null @@ -1,18 +0,0 @@ -CREATE PROCEDURE [dbo].[Collection_ReadWithGroupsByIdUserId] - @Id UNIQUEIDENTIFIER, - @UserId UNIQUEIDENTIFIER -AS -BEGIN - SET NOCOUNT ON - - EXEC [dbo].[Collection_ReadByIdUserId] @Id, @UserId - - SELECT - [GroupId] [Id], - [ReadOnly], - [HidePasswords] - FROM - [dbo].[CollectionGroup] - WHERE - [CollectionId] = @Id -END \ No newline at end of file diff --git a/src/Sql/dbo/Stored Procedures/Collection_UpdateWithGroups.sql b/src/Sql/dbo/Stored Procedures/Collection_UpdateWithGroups.sql deleted file mode 100644 index b0bfba442b..0000000000 --- a/src/Sql/dbo/Stored Procedures/Collection_UpdateWithGroups.sql +++ /dev/null @@ -1,51 +0,0 @@ -CREATE PROCEDURE [dbo].[Collection_UpdateWithGroups] - @Id UNIQUEIDENTIFIER, - @OrganizationId UNIQUEIDENTIFIER, - @Name VARCHAR(MAX), - @ExternalId NVARCHAR(300), - @CreationDate DATETIME2(7), - @RevisionDate DATETIME2(7), - @Groups AS [dbo].[SelectionReadOnlyArray] READONLY -AS -BEGIN - SET NOCOUNT ON - - EXEC [dbo].[Collection_Update] @Id, @OrganizationId, @Name, @ExternalId, @CreationDate, @RevisionDate - - ;WITH [AvailableGroupsCTE] AS( - SELECT - Id - FROM - [dbo].[Group] - WHERE - OrganizationId = @OrganizationId - ) - MERGE - [dbo].[CollectionGroup] AS [Target] - USING - @Groups AS [Source] - ON - [Target].[CollectionId] = @Id - AND [Target].[GroupId] = [Source].[Id] - WHEN NOT MATCHED BY TARGET - AND [Source].[Id] IN (SELECT [Id] FROM [AvailableGroupsCTE]) THEN - INSERT VALUES - ( - @Id, - [Source].[Id], - [Source].[ReadOnly], - [Source].[HidePasswords] - ) - WHEN MATCHED AND ( - [Target].[ReadOnly] != [Source].[ReadOnly] - OR [Target].[HidePasswords] != [Source].[HidePasswords] - ) THEN - UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly], - [Target].[HidePasswords] = [Source].[HidePasswords] - WHEN NOT MATCHED BY SOURCE - AND [Target].[CollectionId] = @Id THEN - DELETE - ; - - EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId -END \ No newline at end of file diff --git a/src/Sql/dbo/Stored Procedures/Policy_CountByTypeApplicableToUser.sql b/src/Sql/dbo/Stored Procedures/Policy_CountByTypeApplicableToUser.sql deleted file mode 100644 index 3577c0e3de..0000000000 --- a/src/Sql/dbo/Stored Procedures/Policy_CountByTypeApplicableToUser.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE PROCEDURE [dbo].[Policy_CountByTypeApplicableToUser] - @UserId UNIQUEIDENTIFIER, - @PolicyType TINYINT, - @MinimumStatus SMALLINT -AS -BEGIN - SET NOCOUNT ON - - SELECT COUNT(1) - FROM [dbo].[PolicyApplicableToUser](@UserId, @PolicyType, @MinimumStatus) -END diff --git a/src/Sql/dbo/Stored Procedures/Policy_ReadByTypeApplicableToUser.sql b/src/Sql/dbo/Stored Procedures/Policy_ReadByTypeApplicableToUser.sql deleted file mode 100644 index 5f215f99d4..0000000000 --- a/src/Sql/dbo/Stored Procedures/Policy_ReadByTypeApplicableToUser.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE PROCEDURE [dbo].[Policy_ReadByTypeApplicableToUser] - @UserId UNIQUEIDENTIFIER, - @PolicyType TINYINT, - @MinimumStatus SMALLINT -AS -BEGIN - SET NOCOUNT ON - - SELECT * - FROM [dbo].[PolicyApplicableToUser](@UserId, @PolicyType, @MinimumStatus) -END diff --git a/util/Migrator/DbScripts_future/2022-11-FutureMigration.sql b/util/Migrator/DbScripts/2023-06-07_00_DropUnusedCollectionSprocs.sql similarity index 100% rename from util/Migrator/DbScripts_future/2022-11-FutureMigration.sql rename to util/Migrator/DbScripts/2023-06-07_00_DropUnusedCollectionSprocs.sql diff --git a/util/Migrator/DbScripts_future/2023-03-FutureMigration.sql b/util/Migrator/DbScripts/2023-06-07_01_DropUnusedPolicySprocs.sql similarity index 100% rename from util/Migrator/DbScripts_future/2023-03-FutureMigration.sql rename to util/Migrator/DbScripts/2023-06-07_01_DropUnusedPolicySprocs.sql