Updated PR comments, changed smart defaults for behavior, updated Cipher table index

src/Core/Repositories/ICipherRepository.cs

@@ -23,8 +23,8 @@ namespace Bit.Core.Repositories
         Task UpdatePartialAsync(Guid id, Guid userId, Guid? folderId, bool favorite);
         Task UpdateAttachmentAsync(CipherAttachment attachment);
         Task DeleteAttachmentAsync(Guid cipherId, string attachmentId);
-        Task DeleteAsync(Cipher obj, bool permanent = false);
+        Task DeleteAsync(Cipher obj, bool permanent = true);
-        Task DeleteAsync(IEnumerable<Guid> ids, Guid userId, bool permanent = false);
+        Task DeleteAsync(IEnumerable<Guid> ids, Guid userId, bool permanent = true);
         Task MoveAsync(IEnumerable<Guid> ids, Guid? folderId, Guid userId);
         Task DeleteByUserIdAsync(Guid userId);
         Task DeleteByOrganizationIdAsync(Guid organizationId);

src/Core/Repositories/SqlServer/CipherRepository.cs

@@ -215,9 +215,9 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
-        public async Task DeleteAsync(Cipher obj, bool permanent = false)
+        public async Task DeleteAsync(Cipher obj, bool permanent = true)
         {
-            using (var connection = new SqlConnection(ConnectionString))
+            using(var connection = new SqlConnection(ConnectionString))
             {
                 var results = await connection.ExecuteAsync(
                     $"[{Schema}].[Cipher_DeleteById]",
@@ -226,7 +226,7 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
-        public async Task DeleteAsync(IEnumerable<Guid> ids, Guid userId, bool permanent = false)
+        public async Task DeleteAsync(IEnumerable<Guid> ids, Guid userId, bool permanent = true)
         {
             using(var connection = new SqlConnection(ConnectionString))
             {

src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserId.sql

@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserId]
     @UserId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON

src/Sql/dbo/Stored Procedures/CipherDetails_ReadWithoutOrganizationsByUserId.sql

@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
     @UserId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON

src/Sql/dbo/Stored Procedures/CipherOrganizationDetails_ReadById.sql

@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherOrganizationDetails_ReadById]
     @Id UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON

src/Sql/dbo/Stored Procedures/Cipher_Delete.sql

@@ -1,7 +1,7 @@
 CREATE PROCEDURE [dbo].[Cipher_Delete]
     @Ids AS [dbo].[GuidIdArray] READONLY,
     @UserId AS UNIQUEIDENTIFIER,
-    @Permanent AS BIT = 0
+    @Permanent AS BIT
 AS
 BEGIN
     SET NOCOUNT ON

src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql

@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[Cipher_DeleteById]
     @Id UNIQUEIDENTIFIER,
-    @Permanent AS BIT = 0
+    @Permanent AS BIT
 WITH RECOMPILE
 AS
 BEGIN

src/Sql/dbo/Stored Procedures/Cipher_ReadByOrganizationId.sql

@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[Cipher_ReadByOrganizationId]
     @OrganizationId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON

src/Sql/dbo/Tables/Cipher.sql

@@ -19,7 +19,7 @@
 GO
 CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_OrganizationId_IncludeAll]
     ON [dbo].[Cipher]([UserId] ASC, [OrganizationId] ASC)
-    INCLUDE ([Type], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate]);
+    INCLUDE ([Type], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate], [DeletedDate]);
 
 
 GO

util/Migrator/DbScripts/2020-03-26_00_CipherSoftDelete.sql

@@ -67,7 +67,7 @@ GO
 
 CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
     @UserId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -96,7 +96,7 @@ GO
 
 CREATE PROCEDURE [dbo].[Cipher_ReadByOrganizationId]
     @OrganizationId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -124,7 +124,7 @@ GO
 
 CREATE PROCEDURE [dbo].[CipherOrganizationDetails_ReadById]
     @Id UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -157,7 +157,7 @@ GO
 
 CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserId]
     @UserId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -181,7 +181,7 @@ GO
 CREATE PROCEDURE [dbo].[Cipher_Delete]
     @Ids AS [dbo].[GuidIdArray] READONLY,
     @UserId AS UNIQUEIDENTIFIER,
-    @Permanent AS BIT = 0
+    @Permanent AS BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -282,7 +282,7 @@ GO
 
 CREATE PROCEDURE [dbo].[Cipher_DeleteById]
     @Id UNIQUEIDENTIFIER,
-    @Permanent AS BIT = 0
+    @Permanent AS BIT
 WITH RECOMPILE
 AS
 BEGIN
@@ -481,3 +481,11 @@ BEGIN
     EXECUTE sp_refreshsqlmodule N'[dbo].[Cipher_UpdateWithCollections]';
 END
 GO
+
+DROP INDEX IF EXISTS [IX_Cipher_UserId_OrganizationId_IncludeAll]
+    ON [dbo].[Cipher];
+GO
+CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_OrganizationId_IncludeAll]
+    ON [dbo].[Cipher]([UserId] ASC, [OrganizationId] ASC)
+    INCLUDE([Type], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate], [DeletedDate]);
+GO

util/Migrator/Migrator.csproj

@@ -9,10 +9,6 @@
     <EmbeddedResource Include="DbScripts\**\*.sql" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="DbScripts\2020-03-26_00_CipherSoftDelete.sql" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="dbup-sqlserver" Version="4.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />