feat: update

Author: nosbog

package-lock.json

@@ -38,28 +38,27 @@
     "@fastify/env": "^4.2.0",
     "@fastify/sensible": "^5.0.0",
     "@fastify/swagger": "^8.6.0",
-    "@fastify/swagger-ui": "^1.9.0",
-    "@fastify/type-provider-typebox": "^3.2.0",
+    "@fastify/swagger-ui": "^2.0.0",
+    "@fastify/type-provider-typebox": "^4.0.0",
     "@prisma/client": "^5.0.0",
     "dataloader": "^2.1.0",
     "fastify": "^4.0.0",
-    "fastify-cli": "^5.5.1",
+    "fastify-cli": "^6.0.0",
     "fastify-plugin": "^4.0.0",
     "graphql": "^16.6.0",
     "graphql-depth-limit": "^1.1.0",
     "graphql-parse-resolve-info": "^4.13.0"
   },
   "devDependencies": {
     "@types/graphql-depth-limit": "^1.1.3",
-    "@types/node": "^18.0.0",
+    "@types/node": "^20.0.0",
     "@types/tap": "^15.0.5",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.59.11",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
     "concurrently": "^7.0.0",
     "eslint": "^8.43.0",
-    "eslint-config-prettier": "^8.8.0",
-    "fastify-tsconfig": "^1.0.1",
-    "npm": "^9.8.0",
+    "eslint-config-prettier": "^9.0.0",
+    "fastify-tsconfig": "^2.0.0",
     "prettier": "^3.0.0",
     "prisma": "^5.0.0",
     "tap": "^16.1.0",

package.json

@@ -12,13 +12,14 @@ export class HttpCompatibleError extends Error {
 }
 
 export default fp(
-  async (fastify) =>
+  async (fastify) => {
     fastify.setErrorHandler((error) => {
       if (error instanceof HttpCompatibleError) {
         return fastify.httpErrors.getHttpError(error.httpCode, error.message);
       }
       return error;
-    }),
+    });
+  },
   {
     dependencies: [sensiblePluginTag],
   },

src/plugins/handle-http-error.ts

@@ -7,6 +7,7 @@ import {
   getPrismaStats,
   gqlQuery,
   subscribeTo,
+  unsubscribeFrom,
 } from '../utils/requests.js';
 import { MemberTypeId } from '../../src/routes/member-types/schemas.js';
 
@@ -71,4 +72,41 @@ await test('gql-loader', async (t) => {
     t.ok(foundPostCall);
     t.ok(foundMemberTypeCall);
   });
+
+  await t.test('Dataloader should be created per request.', async (t) => {
+    const { body: user1 } = await createUser(app);
+    const { body: user2 } = await createUser(app);
+
+    await subscribeTo(app, user1.id, user2.id);
+
+    await gqlQuery(app, {
+      query: `query {
+        users {
+          id
+          userSubscribedTo {
+            id
+          }
+        }
+      }`,
+    });
+
+    await unsubscribeFrom(app, user1.id, user2.id);
+
+    const {
+      body: { data },
+    } = await gqlQuery(app, {
+      query: `query {
+        users {
+          id
+          userSubscribedTo {
+            id
+          }
+        }
+      }`,
+    });
+
+    const foundUser1 = data.users.find(({ id }) => id === user1.id);
+
+    t.ok(foundUser1.userSubscribedTo.length === 0);
+  });
 });

test/routes/gql-loader.test.ts

@@ -22,13 +22,10 @@ await test('gql-queries', async (t) => {
     await createPost(app, user1.id);
     await createProfile(app, user1.id, MemberTypeId.BASIC);
 
-    const [{ body: memberTypes }, { body: posts }, { body: users }, { body: profiles }] =
-      await Promise.all([
-        getMemberTypes(app),
-        getPosts(app),
-        getUsers(app),
-        getProfiles(app),
-      ]);
+    const { body: memberTypes } = await getMemberTypes(app);
+    const { body: posts } = await getPosts(app);
+    const { body: users } = await getUsers(app);
+    const { body: profiles } = await getProfiles(app);
 
     const {
       body: { data },
@@ -151,7 +148,7 @@ await test('gql-queries', async (t) => {
     const { body: profile1 } = await createProfile(app, user1.id, MemberTypeId.BASIC);
 
     const {
-      body: { data: dataUser, errors: errorsUser },
+      body: { data: dataUser },
     } = await gqlQuery(app, {
       query: `query ($userId: UUID!) {
           user(id: $userId) {
@@ -172,7 +169,7 @@ await test('gql-queries', async (t) => {
       },
     });
     const {
-      body: { data: dataUsers, errors: errorsUsers },
+      body: { data: dataUsers },
     } = await gqlQuery(app, {
       query: `query {
           users {
@@ -190,8 +187,6 @@ await test('gql-queries', async (t) => {
       }`,
     });
 
-    t.ok(!errorsUser);
-    t.ok(!errorsUsers);
     t.ok(dataUser.user.id === user1.id);
     t.ok(dataUser.user.profile.id === profile1.id);
     t.ok(dataUser.user.profile.memberType?.id === MemberTypeId.BASIC);
@@ -217,12 +212,14 @@ await test('gql-queries', async (t) => {
               id
               userSubscribedTo {
                   id
+                  name
                   subscribedToUser {
                       id
                   }
               }
               subscribedToUser {
                   id
+                  name
                   userSubscribedTo {
                       id
                   }
@@ -234,10 +231,12 @@ await test('gql-queries', async (t) => {
       },
     });
 
-    t.ok(data.user.id === user1.id);
     t.ok(data.user.userSubscribedTo[0].id === user2.id);
+    t.ok(data.user.userSubscribedTo[0].name === user2.name);
     t.ok(data.user.userSubscribedTo[0].subscribedToUser[0].id === user1.id);
+
     t.ok(data.user.subscribedToUser[0].id === user3.id);
+    t.ok(data.user.subscribedToUser[0].name === user3.name);
     t.ok(data.user.subscribedToUser[0].userSubscribedTo[0].id === user1.id);
   });
 });

test/routes/gql-queries.test.ts

@@ -151,22 +151,25 @@ export async function subscribeTo(
   return { res, body };
 }
 
-export async function usedSubscribedTo(app: FastifyInstance, userId: string) {
+export async function subscribedToUser(app: FastifyInstance, userId: string) {
   const res = await app.inject({
-    url: `/users/${userId}/user-subscribed-to`,
+    url: `/users/${userId}/subscribed-to-user`,
     method: 'GET',
   });
   const body = (await res.json()) as UserBody[];
   return { res, body };
 }
 
-export async function subscribedToUser(app: FastifyInstance, userId: string) {
+export async function unsubscribeFrom(
+  app: FastifyInstance,
+  userId: string,
+  authorId: string,
+) {
   const res = await app.inject({
-    url: `/users/${userId}/subscribed-to-user`,
-    method: 'GET',
+    url: `/users/${userId}/user-subscribed-to/${authorId}`,
+    method: 'DELETE',
   });
-  const body = (await res.json()) as UserBody[];
-  return { res, body };
+  return { res, body: {} };
 }
 
 export async function getPrismaStats(app: FastifyInstance) {

test/utils/requests.ts

@@ -3,7 +3,6 @@
   "compilerOptions": {
     "noImplicitAny": false,
     "noUnusedLocals": false,
-    "target": "ES2022",
     "outDir": "dist",
     "sourceMap": true,
     "moduleResolution": "nodenext",