use temp tables for better execution plans

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

@@ -6,6 +6,22 @@ BEGIN
 
     DECLARE @Storage BIGINT
 
+    CREATE TABLE #Temp
+    ( 
+        [Id] UNIQUEIDENTIFIER NOT NULL,
+        [Attachments] VARCHAR(MAX) NULL
+    )
+
+    INSERT INTO #Temp
+    SELECT
+        [Id],
+        [Attachments]
+    FROM
+        [dbo].[Cipher]
+    WHERE
+        [UserId] IS NULL
+        AND [OrganizationId] = @Id
+
     ;WITH [CTE] AS (
         SELECT
             [Id],
@@ -16,17 +32,14 @@ BEGIN
                     OPENJSON([Attachments])
             ) [Size]
         FROM
-            [dbo].[Cipher]
+            #Temp
     )
     SELECT
-        @Storage = SUM([CTE].[Size])
+        @Storage = SUM([Size])
     FROM
-        [dbo].[Cipher] C
-    LEFT JOIN
-        [CTE] ON C.[Id] = [CTE].[Id]
-    WHERE
-        C.[UserId] IS NULL
-        AND C.[OrganizationId] = @Id
+        [CTE]
+
+    DROP TABLE #Temp
 
     UPDATE
         [dbo].[Organization]

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

@@ -6,6 +6,21 @@ BEGIN
 
     DECLARE @Storage BIGINT
 
+    CREATE TABLE #Temp
+    ( 
+        [Id] UNIQUEIDENTIFIER NOT NULL,
+        [Attachments] VARCHAR(MAX) NULL
+    )
+
+    INSERT INTO #Temp
+    SELECT
+        [Id],
+        [Attachments]
+    FROM
+        [dbo].[Cipher]
+    WHERE
+        [UserId] = @Id
+
     ;WITH [CTE] AS (
         SELECT
             [Id],
@@ -16,16 +31,14 @@ BEGIN
                     OPENJSON([Attachments])
             ) [Size]
         FROM
-            [dbo].[Cipher]
+            #Temp
     )
     SELECT
         @Storage = SUM([CTE].[Size])
     FROM
-        [dbo].[Cipher] C
-    LEFT JOIN
-        [CTE] ON C.[Id] = [CTE].[Id]
-    WHERE
-        C.[UserId] = @Id
+        [CTE]
+
+    DROP TABLE #Temp
 
     UPDATE
         [dbo].[User]

util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql

@@ -47,3 +47,120 @@ BEGIN
         )
 END
 GO
+
+IF OBJECT_ID('[dbo].[Organization_UpdateStorage]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Organization_UpdateStorage]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Organization_UpdateStorage]
+    @Id UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DECLARE @Storage BIGINT
+
+    CREATE TABLE #Temp
+    ( 
+        [Id] UNIQUEIDENTIFIER NOT NULL,
+        [Attachments] VARCHAR(MAX) NULL
+    )
+
+    INSERT INTO #Temp
+    SELECT
+        [Id],
+        [Attachments]
+    FROM
+        [dbo].[Cipher]
+    WHERE
+        [UserId] IS NULL
+        AND [OrganizationId] = @Id
+
+    ;WITH [CTE] AS (
+        SELECT
+            [Id],
+            (
+                SELECT
+                    SUM(CAST(JSON_VALUE(value,'$.Size') AS BIGINT))
+                FROM
+                    OPENJSON([Attachments])
+            ) [Size]
+        FROM
+            #Temp
+    )
+    SELECT
+        @Storage = SUM([Size])
+    FROM
+        [CTE]
+
+    DROP TABLE #Temp
+
+    UPDATE
+        [dbo].[Organization]
+    SET
+        [Storage] = @Storage,
+        [RevisionDate] = GETUTCDATE()
+    WHERE
+        [Id] = @Id
+END
+GO
+
+IF OBJECT_ID('[dbo].[User_UpdateStorage]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[User_UpdateStorage]
+END
+GO
+
+CREATE PROCEDURE [dbo].[User_UpdateStorage]
+    @Id UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DECLARE @Storage BIGINT
+
+    CREATE TABLE #Temp
+    ( 
+        [Id] UNIQUEIDENTIFIER NOT NULL,
+        [Attachments] VARCHAR(MAX) NULL
+    )
+
+    INSERT INTO #Temp
+    SELECT
+        [Id],
+        [Attachments]
+    FROM
+        [dbo].[Cipher]
+    WHERE
+        [UserId] = @Id
+
+    ;WITH [CTE] AS (
+        SELECT
+            [Id],
+            (
+                SELECT
+                    SUM(CAST(JSON_VALUE(value,'$.Size') AS BIGINT))
+                FROM
+                    OPENJSON([Attachments])
+            ) [Size]
+        FROM
+            #Temp
+    )
+    SELECT
+        @Storage = SUM([CTE].[Size])
+    FROM
+        [CTE]
+
+    DROP TABLE #Temp
+
+    UPDATE
+        [dbo].[User]
+    SET
+        [Storage] = @Storage,
+        [RevisionDate] = GETUTCDATE()
+    WHERE
+        [Id] = @Id
+END
+GO