Merge pull request #31 from OpenWebhook/migrate-searchable-path

Migrate searchable path

prisma/migrations/20220704171013_add_searchable_path/migration.sql

@@ -0,0 +1,3 @@
+-- This is an empty migration.
+
+SELECT path, REGEXP_REPLACE(CONCAT(path, '/'), '\/[0-9]*\/', ':id/') FROM "Webhook";

src/application/app.service.ts

@@ -93,11 +93,11 @@ const whereConditionFactory = (
     OR: [
       {
         host,
-        searchablePath: { startsWith: validPath },
+        searchablePath: { contains: validPath },
       },
       {
         host,
-        path: { startsWith: validPath },
+        path: { contains: validPath },
       },
     ],
   };

src/helpers/parse-searchable-path/parse-searchable-path.helper.ts

@@ -1,3 +1,7 @@
+function removeTrailingSlash(str: string): string {
+  return str.replace(/\/+$/, '');
+}
+
 export const pathToSearchablePath = (path: string): string => {
   const pathWithATrailingSlash =
     path[path.length - 1] === '/' ? path : `${path}/`;
@@ -11,10 +15,7 @@ export const pathToSearchablePath = (path: string): string => {
     '/:id/',
   );
 
-  const pathWithoutTrailingSlash = pathWithoutNumeralIds.substring(
-    0,
-    pathWithoutNumeralIds.length - 1,
-  );
+  const pathWithoutTrailingSlash = removeTrailingSlash(pathWithoutNumeralIds);
   return pathWithoutTrailingSlash;
 };
 

src/test/webhook.resolver.filters.e2e.spec.ts

@@ -180,5 +180,32 @@ describe('CustomerResolver (e2e)', () => {
       expect(Array.isArray(res.body.data.webhooks)).toBe(true);
       expect(res.body.data.webhooks).toHaveLength(2);
     });
+
+    it('should find webhooks with exact id', async () => {
+      const paths = [
+        '/organisation/123432/update',
+        '/organisation/123432/create',
+        '/organisation/123432/delete',
+      ];
+      const webhookWithComplexPath: Prisma.WebhookCreateInput[] = paths.map(
+        (path) => ({
+          host: hostname,
+          path,
+          body: {},
+          headers: {},
+          ip: 'random.ip',
+          searchablePath: pathToSearchablePath(path),
+        }),
+      );
+      await prismaService.webhook.createMany({ data: webhookWithComplexPath });
+      const res = await request(app.getHttpServer())
+        .post(gql)
+        .send({
+          query: 'query {webhooks(path: "/123432") {path}}',
+        })
+        .expect(200);
+      expect(Array.isArray(res.body.data.webhooks)).toBe(true);
+      expect(res.body.data.webhooks).toHaveLength(3);
+    });
   });
 });