Merge branch 'develop' into bug/@mui

Author: Aryan4884

.github/dependabot.yaml

@@ -12,7 +12,7 @@ updates:
     labels:
       - "dependencies"
     # Specify the target branch for PRs
-    target-branch: "develop"
+    target-branch: "develop-postgres"
     # Customize commit message prefix
     commit-message:
       prefix: "chore(deps):"

.github/pull_request_template.md

@@ -24,10 +24,6 @@ Thanks for submitting a pull request! Please provide enough information so that
 
 Fixes #<!--Add related issue number here.-->
 
-**Did you add tests for your changes?**
-
-<!--Yes or No. Note: Add unit tests or automation tests for your code.-->
-
 **Snapshots/Videos:**
 
 <!--Add snapshots or videos wherever possible.-->
@@ -45,6 +41,19 @@ Fixes #<!--Add related issue number here.-->
 
 <!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
 
+## Checklist
+
+### CodeRabbit AI Review
+- [ ] I have reviewed and addressed all critical issues flagged by CodeRabbit AI
+- [ ] I have implemented or provided justification for each non-critical suggestion
+- [ ] I have documented my reasoning in the PR comments where CodeRabbit AI suggestions were not implemented
+
+### Test Coverage
+- [ ] I have written tests for all new changes/features
+- [ ] I have verified that test coverage meets or exceeds 95%
+- [ ] I have run the test suite locally and all tests pass
+
+
 **Other information**
 
 <!--Add extra information about this PR here-->

.github/workflows/pull-request.yml

@@ -318,7 +318,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check if base branch is develop"
-        if: github.event.pull_request.base.ref != 'develop'
+        if: github.event.pull_request.base.ref != 'develop-postgres'
         run: |
-          echo "PR is not against develop branch. Please refer PR_GUIDELINES.md"
+          echo "PR is not against develop-postgres branch. Please refer PR_GUIDELINES.md"
           exit 1

eslint.config.mjs

@@ -14,8 +14,8 @@ import * as graphqlEslint from "@graphql-eslint/eslint-plugin";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const compat = new FlatCompat({
-  baseDirectory: __dirname,
-  recommendedConfig: js.configs.recommended,
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended
 });
 
 export default [
@@ -44,7 +44,9 @@ export default [
 
     languageOptions: {
       parser: tsParser,
-      globals: globals.node,
+      globals: {
+        ...globals.node,
+      },
     },
     rules: {
       "no-restricted-imports": [
@@ -142,7 +144,7 @@ export default [
     },
 
     languageOptions: {
-      parser: parser,
+      parser: graphqlEslint.parser,
     },
   },
   {

requirements.txt

@@ -1,4 +1,4 @@
-black==22.12.0
+black==24.3.0
 pydocstyle==6.3.0
 pylint==2.15.10
 pymongo==4.3.3

src/resolvers/Mutation/sendMembershipRequest.ts

@@ -78,8 +78,9 @@ export const sendMembershipRequest: MutationResolvers["sendMembershipRequest"] =
 
     // Checks if the user is blocked
     const user = await User.findById(context.userId).lean();
+
     if (
-      user !== null &&
+      user != null &&
       organization.blockedUsers.some((blockedUser) =>
         new mongoose.Types.ObjectId(blockedUser.toString()).equals(user._id),
       )
@@ -96,21 +97,38 @@ export const sendMembershipRequest: MutationResolvers["sendMembershipRequest"] =
       user: context.userId,
       organization: organization._id,
     });
-
     if (membershipRequestExists) {
+      // Check if the request is already in the user's document
+      if (
+        user != null &&
+        !user.membershipRequests.includes(membershipRequestExists._id)
+      ) {
+        // If it's not in the user's document, add it
+        await User.findByIdAndUpdate(
+          context.userId,
+          {
+            $push: {
+              membershipRequests: membershipRequestExists._id,
+            },
+          },
+          { new: true, runValidators: true },
+        );
+      }
+
       throw new errors.ConflictError(
         requestContext.translate(MEMBERSHIP_REQUEST_ALREADY_EXISTS.MESSAGE),
         MEMBERSHIP_REQUEST_ALREADY_EXISTS.CODE,
         MEMBERSHIP_REQUEST_ALREADY_EXISTS.PARAM,
       );
     }
 
+    // Creating Membership Request
     const createdMembershipRequest = await MembershipRequest.create({
       user: context.userId,
       organization: organization._id,
     });
 
-    // add membership request to organization
+    // Updating Membership Request in organization
     const updatedOrganization = await Organization.findOneAndUpdate(
       {
         _id: organization._id,
@@ -129,16 +147,15 @@ export const sendMembershipRequest: MutationResolvers["sendMembershipRequest"] =
       await cacheOrganizations([updatedOrganization]);
     }
 
-    // add membership request to user
-    await User.updateOne(
-      {
-        _id: context.userId,
-      },
+    // Updating User
+    await User.findByIdAndUpdate(
+      context.userId,
       {
         $push: {
           membershipRequests: createdMembershipRequest._id,
         },
       },
+      { new: true, runValidators: true },
     );
 
     return createdMembershipRequest.toObject();

tests/resolvers/Query/getVolunteerRanks.spec.ts

@@ -76,7 +76,7 @@ describe("resolvers -> Query -> getVolunteerRanks", () => {
       },
       {},
     )) as unknown as VolunteerRank[];
-    expect(volunteerRanks[0].hoursVolunteered).toEqual(2);
+    expect(volunteerRanks[0].hoursVolunteered).toEqual(6);
     expect(volunteerRanks[0].user._id).toEqual(testUser1?._id);
     expect(volunteerRanks[0].rank).toEqual(1);
   });