feat: delete link from cache aswell

origranot · Dec 1, 2023 · 1023e19 · 1023e19
1 parent a0dbc33
commit 1023e19
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git a/apps/backend/src/cache/cache.service.ts b/apps/backend/src/cache/cache.service.ts
@@ -8,6 +8,7 @@ export class AppCacheService {
 
   set = this.cacheManager.set;
   get = this.cacheManager.get;
+  del = this.cacheManager.del;
 
   getCacheManager = this.cacheManager;
 }
diff --git a/apps/backend/src/core/reports/reports.controller.spec.ts b/apps/backend/src/core/reports/reports.controller.spec.ts
@@ -11,11 +11,13 @@ import { IFindAllOptions } from '../entity.service';
 import { SortOrder } from '../../shared/enums/sort-order.enum';
 import { LinksService } from '../links/links.service';
 import { OptionalJwtAuthGuard } from '../../auth/guards/optional-jwt-auth.guard';
+import { AppCacheService } from '../../cache/cache.service';
 
 describe('ReportsController', () => {
   let app: INestApplication;
   let reportsService: ReportsService;
   let linksService: LinksService;
+  let cacheService: AppCacheService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -38,6 +40,12 @@ describe('ReportsController', () => {
             delete: jest.fn(),
           },
         },
+        {
+          provide: AppCacheService,
+          useValue: {
+            del: jest.fn(),
+          },
+        },
       ],
     })
       .overrideGuard(OptionalJwtAuthGuard)
@@ -61,6 +69,7 @@ describe('ReportsController', () => {
 
     reportsService = module.get<ReportsService>(ReportsService);
     linksService = module.get<LinksService>(LinksService);
+    cacheService = module.get<AppCacheService>(AppCacheService);
   });
 
   afterEach(async () => {
@@ -236,10 +245,11 @@ describe('ReportsController', () => {
     });
 
     it('should delete link if deleteLink query parameter is set to true', async () => {
-      jest.spyOn(reportsService, 'findById').mockResolvedValue({ link: { id: '1' }, category: 1 } as any);
+      jest.spyOn(reportsService, 'findById').mockResolvedValue({ link: { id: '1', key: 'some_key' }, category: 1 } as any);
 
       await request(app.getHttpServer()).delete('/reports/1?deleteLink=true').expect(200);
       expect(linksService.delete).toHaveBeenCalledWith('1');
+      expect(cacheService.del).toHaveBeenCalledWith('some_key');
     });
 
     it('should not delete link if deleteLink query parameter is not set', async () => {

diff --git a/apps/backend/src/core/reports/reports.controller.ts b/apps/backend/src/core/reports/reports.controller.ts
@@ -7,14 +7,19 @@ import { ReportsService } from './reports.service';
 import { FindAllQueryDto, CreateReportDto } from './dto';
 import { LinksService } from '../links/links.service';
 import { OptionalJwtAuthGuard } from '../../auth/guards/optional-jwt-auth.guard';
+import { AppCacheService } from '../../cache/cache.service';
 
 @UseGuards(OptionalJwtAuthGuard, RolesGuard)
 @Controller({
   path: 'reports',
   version: '1',
 })
 export class ReportsController {
-  constructor(private readonly reportsService: ReportsService, private readonly linksService: LinksService) {}
+  constructor(
+    private readonly reportsService: ReportsService,
+    private readonly linksService: LinksService,
+    private readonly cacheService: AppCacheService
+  ) {}
 
   @Get()
   @Roles(Role.ADMIN)
@@ -60,6 +65,9 @@ export class ReportsController {
     }
 
     if (deleteLink) {
+      // Should delete the link from the cache as well
+      await this.cacheService.del(report.link?.key);
+
       return this.linksService.delete(report.link.id);
     }
 

diff --git a/apps/frontend/src/components/dashboard/links/link-modal/link-modal.tsx b/apps/frontend/src/components/dashboard/links/link-modal/link-modal.tsx
@@ -3,6 +3,7 @@ import { HiXMarkOutline } from '@qwikest/icons/heroicons';
 import { Form, globalAction$, zod$ } from '@builder.io/qwik-city';
 import { z } from 'zod';
 import { ACCESS_COOKIE_NAME } from '../../../../shared/auth.service';
+import { normalizeUrl } from '../../../../utils';
 
 export const LINK_MODAL_ID = 'link-modal';
 
@@ -15,7 +16,7 @@ const useCreateLink = globalAction$(
         Authorization: `Bearer ${cookie.get(ACCESS_COOKIE_NAME)?.value}`,
       },
       body: JSON.stringify({
-        url,
+        url: normalizeUrl(url),
         expirationTime: null, // forever
       }),
     });
@@ -41,7 +42,9 @@ const useCreateLink = globalAction$(
       .min(1, {
         message: "The url field can't be empty.",
       })
-      .url("The url you've entered is not valid..."),
+      .regex(/^(?:https?:\/\/)?(?:[\w-]+\.)+[a-z]{2,}(?::\d{1,5})?(?:\/\S*)?$/, {
+        message: "The url you've entered is not valid...",
+      }),
   })
 );
 

diff --git a/apps/frontend/src/routes/dashboard/admin/reports/index.tsx b/apps/frontend/src/routes/dashboard/admin/reports/index.tsx
@@ -101,7 +101,7 @@ export default component$(() => {
 
   return (
     <>
-      <div class="rounded-xl w-full p-5">
+      <div class="shadow-[0_8px_30px_rgb(0,0,0,0.12)] rounded-xl w-full p-5">
         <TableServerPagination endpoint={`${process.env.CLIENTSIDE_API_DOMAIN}/api/v1/reports`} refetch={refetchSignal} columns={columns} />
       </div>
     </>