fix: yaml so long bruh -- correct types

GenerateNU · Jan 26, 2025 · 86ccd8a · 86ccd8a
1 parent b53588b
commit 86ccd8a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/backend/src/entities/members/controller.ts b/backend/src/entities/members/controller.ts
@@ -40,10 +40,9 @@ export class MemberControllerImpl implements MemberController {
 
   async deleteMember(ctx: Context): Promise<DEL_MEMBER> {
     const deleteMemberImpl = async () => {
-      // get userId from decoded JWT
       const clientId = parseUUID(ctx.get("userId"));
-      const userId = parseUUID(ctx.req.param("userId"));
       const groupId = parseUUID(ctx.req.param("id"));
+      const userId = parseUUID(ctx.req.param("userId"));
 
       await this.memberService.deleteMember(clientId, userId, groupId);
       return ctx.json({ message: "Successfully delete user" }, Status.OK);

diff --git a/backend/src/tests/members/delete.test.ts b/backend/src/tests/members/delete.test.ts
@@ -14,10 +14,10 @@ import {
 describe("DELETE groups/{id}/members/{userId}", () => {
   let app: Hono;
   const testBuilder = new TestBuilder();
-  const jwt = generateJWTFromID(generateUUID());
-  const manager_jwt = generateJWTFromID(USER_ALICE_ID);
-  const ana_jwt = generateJWTFromID(USER_ANA_ID);
-  const bob_jwt = generateJWTFromID(USER_BOB_ID);
+  const RANDOM_JWT = generateJWTFromID(generateUUID());
+  const ALICE_JWT = generateJWTFromID(USER_ALICE_ID);
+  const ANA_JWT = generateJWTFromID(USER_ANA_ID);
+  const BOB_JWT = generateJWTFromID(USER_BOB_ID);
   const forbiddenMessage = "You do not have the rights to remove this member.";
 
   const authPayload = (jwt: string) => {
@@ -49,7 +49,7 @@ describe("DELETE groups/{id}/members/{userId}", () => {
         app,
         type: HTTPRequest.DELETE,
         route: `/api/v1/groups/${DEARLY_GROUP_ID}/members/${USER_ANA_ID}`,
-        ...authPayload(ana_jwt),
+        ...authPayload(ANA_JWT),
       })
     )
       .assertStatusCode(Status.OK)
@@ -63,7 +63,7 @@ describe("DELETE groups/{id}/members/{userId}", () => {
         app,
         type: HTTPRequest.DELETE,
         route: `/api/v1/groups/${DEARLY_GROUP_ID}/members/${USER_ANA_ID}`,
-        ...authPayload(manager_jwt),
+        ...authPayload(ALICE_JWT),
       })
     )
       .assertStatusCode(Status.OK)
@@ -75,7 +75,7 @@ describe("DELETE groups/{id}/members/{userId}", () => {
         app,
         type: HTTPRequest.DELETE,
         route: `/api/v1/groups/${DEARLY_GROUP_ID}/members/${USER_ANA_ID}`,
-        ...authPayload(manager_jwt),
+        ...authPayload(ALICE_JWT),
       })
     )
       .assertStatusCode(Status.OK)
@@ -89,7 +89,7 @@ describe("DELETE groups/{id}/members/{userId}", () => {
         app,
         type: HTTPRequest.DELETE,
         route: `/api/v1/groups/${DEARLY_GROUP_ID}/members/${USER_ANA_ID}`,
-        ...authPayload(ana_jwt),
+        ...authPayload(ANA_JWT),
       })
     )
       .assertStatusCode(Status.OK)
@@ -102,7 +102,7 @@ describe("DELETE groups/{id}/members/{userId}", () => {
         app,
         type: HTTPRequest.DELETE,
         route: `/api/v1/groups/${DEARLY_GROUP_ID}/members/${USER_BOB_ID}`,
-        ...authPayload(bob_jwt),
+        ...authPayload(BOB_JWT),
       })
     )
       .assertStatusCode(Status.OK)
@@ -117,7 +117,7 @@ describe("DELETE groups/{id}/members/{userId}", () => {
         app,
         type: HTTPRequest.DELETE,
         route: `/api/v1/groups/${DEARLY_GROUP_ID}/members/${USER_ALICE_ID}`,
-        ...authPayload(ana_jwt),
+        ...authPayload(ANA_JWT),
       })
     )
       .assertStatusCode(Status.Forbidden)
@@ -128,7 +128,7 @@ describe("DELETE groups/{id}/members/{userId}", () => {
         app,
         type: HTTPRequest.DELETE,
         route: `/api/v1/groups/${DEARLY_GROUP_ID}/members/${USER_ALICE_ID}`,
-        ...authPayload(random_jwt),
+        ...authPayload(RANDOM_JWT),
       })
     )
       .assertStatusCode(Status.Forbidden)
@@ -143,7 +143,7 @@ describe("DELETE groups/{id}/members/{userId}", () => {
         app,
         type: HTTPRequest.DELETE,
         route: `/api/v1/groups/${DEARLY_GROUP_ID}/members/${USER_ALICE_ID}`,
-        ...authPayload(bob_jwt),
+        ...authPayload(BOB_JWT),
       })
     )
       .assertStatusCode(Status.Forbidden)

diff --git a/backend/src/types/api/routes/members.ts b/backend/src/types/api/routes/members.ts
@@ -3,12 +3,12 @@ import { components, paths } from "../../../gen/openapi";
 import { API_ERROR } from "../schemas/error";
 
 export type ADD_MEMBER = TypedResponse<
-  | paths["/api/v1/groups/{id}/members/{userId}"]["post"]["responses"]["201"]["content"]["application/json"]
+  | paths["/api/v1/groups/{groupId}/members/{userId}"]["post"]["responses"]["201"]["content"]["application/json"]
   | API_ERROR
 >;
 
 export type DEL_MEMBER = TypedResponse<
-  | paths["/api/v1/groups/{id}/members/{userId}"]["delete"]["responses"]["200"]["content"]["application/json"]
+  | paths["/api/v1/groups/{groupId}/members/{userId}"]["delete"]["responses"]["200"]["content"]["application/json"]
   | API_ERROR
 >;
 

diff --git a/openapi.yaml b/openapi.yaml
@@ -1339,7 +1339,7 @@ paths:
               schema:
                 $ref: "#/components/schemas/Error"
 
-  /api/v1/groups/{groupId}/members/{userId}:
+  /api/v1/groups/{id}/members/{userId}:
     post:
       tags:
         - Members Endpoints
@@ -1465,14 +1465,14 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
-  /api/v1/groups/{groupId}/members:
+  /api/v1/groups/{id}/members:
     get:
       tags:
         - Members Endpoints
       summary: Gets members of this group.
       description: Gets all the members in this group.
       parameters:
-        - name: groupId
+        - name: id
           in: path
           description: ID of the group
           required: true