improve(app-server): return free page on permanent deletion

Author: gustavotoyota

apps/app-server/src/trpc/api/pages/deletion/delete-permanently.ts

@@ -56,15 +56,46 @@ export async function deletePermanently({
               });
             }
 
-            // Delete page permanently
+            // Check if page is free
+
+            let numFreePages;
 
-            await ctx.dataAbstraction.patch(
+            const pageIsFree = await ctx.dataAbstraction.hget(
               'page',
               input.pageId,
-              { permanent_deletion_date: addDays(new Date(), -1) },
-              { dtrx },
+              'free',
             );
 
+            if (pageIsFree) {
+              numFreePages = await ctx.dataAbstraction.hget(
+                'user',
+                ctx.userId,
+                'num-free-pages',
+              );
+            }
+
+            // Delete page permanently
+
+            await Promise.all([
+              ctx.dataAbstraction.patch(
+                'page',
+                input.pageId,
+                { permanent_deletion_date: addDays(new Date(), -1) },
+                { dtrx },
+              ),
+
+              ...(pageIsFree
+                ? [
+                    ctx.dataAbstraction.patch(
+                      'user',
+                      ctx.userId,
+                      { num_free_pages: numFreePages + 1 },
+                      { dtrx },
+                    ),
+                  ]
+                : []),
+            ]);
+
             checkRedlockSignalAborted(signals);
           });
         },

apps/app-server/src/trpc/api/pages/deletion/restore.ts

@@ -41,16 +41,28 @@ export async function restore({
 
             // Check if page is deleted
 
+            const permanentDeletionDate = await ctx.dataAbstraction.hget(
+              'page',
+              input.pageId,
+              'permanent-deletion-date',
+            );
+
+            if (permanentDeletionDate == null) {
+              throw new TRPCError({
+                code: 'BAD_REQUEST',
+                message: 'Page is not deleted.',
+              });
+            }
+
+            // Check if page is free and permanently deleted
+
             if (
-              (await ctx.dataAbstraction.hget(
-                'page',
-                input.pageId,
-                'permanent-deletion-date',
-              )) == null
+              new Date() > permanentDeletionDate &&
+              (await ctx.dataAbstraction.hget('page', input.pageId, 'free'))
             ) {
               throw new TRPCError({
                 code: 'BAD_REQUEST',
-                message: 'Page is not deleted.',
+                message: 'Cannot restore a permanently deleted free page.',
               });
             }