Added test for updateAgendaCategory.ts (PalisadoesFoundation#2207)

* Replace package vm2 with isolated-vm (PalisadoesFoundation#1532) * Replace package vm2 with isolated-vm * Removed package isolated-vm * chore(deps): bump follow-redirects from 1.15.3 to 1.15.4 (PalisadoesFoundation#1668) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump vite from 3.2.7 to 3.2.8 (PalisadoesFoundation#1724) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 3.2.7 to 3.2.8. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v3.2.8/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v3.2.8/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update README.md * Update pull-request.yml * Update INSTALLATION.md Adding information for MongoDB retry writes feature access. * Bug Fix Issue#1792 * Fix Issue#1792 * Conflicitng fix Issue#1792 * Conflicitng fix Issue#1792 * Conflicitng fix Issue#1792 * fixed code cov * fixed tests * fixed cov * fixed cov * fixed prettier * fixed prettier * fixed coverage * fixed req changes * added test for getWhere.ts * added test for getWhere.ts * added test for createAgendaCategory.ts * added test for updateAgendaCategory.ts --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Sarthak Patel <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Harrison <[email protected]> Co-authored-by: Crystian I <[email protected]> Co-authored-by: krishna <[email protected]>
akhilender-bongirwar · Apr 15, 2024 · 9c9ae2e · 9c9ae2e
1 parent 7674f57
commit 9c9ae2e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 58 deletions.
diff --git a/src/resolvers/Mutation/updateAgendaCategory.ts b/src/resolvers/Mutation/updateAgendaCategory.ts
@@ -1,4 +1,3 @@
-import { Types } from "mongoose";
 import {
   AGENDA_CATEGORY_NOT_FOUND_ERROR,
   USER_NOT_AUTHORIZED_ERROR,
@@ -96,16 +95,11 @@ export const updateAgendaCategory: MutationResolvers["updateAgendaCategory"] =
     )
       .select("organizationId")
       .lean();
-    // console.log(currentOrg);
 
     const currentUserIsOrgAdmin = currentUserAppProfile.adminFor.some(
-      (organizationId) =>
-        new Types.ObjectId(organizationId?.toString()).equals(
-          currentOrg?.organizationId?.toString() || "",
-        ),
+      (organizationId) => organizationId?.toString() === currentOrg?.toString(),
     );
-    // console.log(currentUserIsOrgAdmin, currentUserAppProfile.isSuperAdmin);
-    // If the user is a normal user, throw an error
+
     if (
       currentUserIsOrgAdmin === false &&
       !currentUserAppProfile.isSuperAdmin

diff --git a/tests/resolvers/Mutation/updateAgendaCategory.spec.ts b/tests/resolvers/Mutation/updateAgendaCategory.spec.ts
@@ -14,7 +14,6 @@ import {
   AgendaCategoryModel,
   AppUserProfile,
   Organization,
-  User,
 } from "../../../src/models";
 import type { TestUserType } from "../../helpers/user";
 import { createTestUser } from "../../helpers/user";
@@ -47,16 +46,6 @@ beforeAll(async () => {
     creatorId: testUser?._id,
   });
 
-  await User.updateOne(
-    {
-      _id: testUser?._id,
-    },
-    {
-      $push: {
-        adminFor: testOrganization?._id,
-      },
-    },
-  );
   testAgendaCategory = await AgendaCategoryModel.create({
     name: "Sample Agenda Category",
     organization: testOrganization?._id,
@@ -142,29 +131,32 @@ describe("resolvers -> Mutation -> updateAgendaCategory", () => {
         description: "Updated Description",
       },
     };
-
+    await AppUserProfile.findOneAndUpdate(
+      { userId: testUser?._id },
+      {
+        $set: {
+          adminFor: [testOrganization?._id.toString()],
+          isSuperAdmin: true,
+        },
+      },
+      { new: true, upsert: true },
+    );
     const context = {
       userId: testUser?._id,
     };
 
-    try {
-      const updatedAgendaCategoryPayload = await updateAgendaCategoryResolver?.(
-        {},
-        args,
-        context,
-      );
+    const updatedAgendaCategoryPayload = await updateAgendaCategoryResolver?.(
+      {},
+      args,
+      context,
+    );
 
-      expect(updatedAgendaCategoryPayload).toEqual(
-        expect.objectContaining({
-          name: "Updated Name",
-          description: "Updated Description",
-        }),
-      );
-    } catch (error: unknown) {
-      expect((error as Error).message).toEqual(
-        USER_NOT_AUTHORIZED_ERROR.MESSAGE,
-      );
-    }
+    expect(updatedAgendaCategoryPayload).toEqual(
+      expect.objectContaining({
+        name: "Updated Name",
+        description: "Updated Description",
+      }),
+    );
   });
   //   it(`updates the agenda category and returns it for the admin`, async () => {
   //   const args: MutationUpdateAgendaCategoryArgs = {
@@ -193,19 +185,19 @@ describe("resolvers -> Mutation -> updateAgendaCategory", () => {
   //   );
   // });
   it(`updates the agenda category and returns it as superadmin`, async () => {
-    const superAdminTestUser = await User.findOneAndUpdate(
+    await AppUserProfile.findOneAndUpdate(
       {
-        _id: randomUser?._id,
+        userId: testUser?._id,
       },
       {
-        userType: "SUPERADMIN",
+        isSuperAdmin: true,
       },
       {
         new: true,
       },
     );
     const context = {
-      userId: superAdminTestUser?._id,
+      userId: testUser?._id,
     };
     const args: MutationUpdateAgendaCategoryArgs = {
       id: testAgendaCategory?._id,
@@ -215,24 +207,18 @@ describe("resolvers -> Mutation -> updateAgendaCategory", () => {
       },
     };
 
-    try {
-      const updatedAgendaCategoryPayload = await updateAgendaCategoryResolver?.(
-        {},
-        args,
-        context,
-      );
+    const updatedAgendaCategoryPayload = await updateAgendaCategoryResolver?.(
+      {},
+      args,
+      context,
+    );
 
-      expect(updatedAgendaCategoryPayload).toEqual(
-        expect.objectContaining({
-          name: "Updated Name",
-          description: "Updated Description",
-        }),
-      );
-    } catch (error: unknown) {
-      expect((error as Error).message).toEqual(
-        USER_NOT_AUTHORIZED_ERROR.MESSAGE,
-      );
-    }
+    expect(updatedAgendaCategoryPayload).toEqual(
+      expect.objectContaining({
+        name: "Updated Name",
+        description: "Updated Description",
+      }),
+    );
   });
   it("throws an error if the user does not have appUserProfile", async () => {
     await AppUserProfile.deleteOne({