Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed membership request being added in the user's DB #2582

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
198 changes: 111 additions & 87 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,136 +4,160 @@ import _import from "eslint-plugin-import";
import { fixupPluginRules } from "@eslint/compat";
import globals from "globals";
import tsParser from "@typescript-eslint/parser";
import parser from "@graphql-eslint/eslint-plugin";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";
import graphqlEslint from "@graphql-eslint/eslint-plugin";
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
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended
});

export default [{
export default [
{
ignores: [
"**/.github",
"**/.vscode",
"**/build",
"**/coverage",
"**/node_modules",
"src/types",
"docs/Schema.md",
"**/.github",
"**/.vscode",
"**/build",
"**/coverage",
"**/node_modules",
"src/types",
"docs/Schema.md",
],
}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"), {
},
...compat.extends(
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
),
{
plugins: {
"@typescript-eslint": typescriptEslint,
tsdoc,
"import": fixupPluginRules(_import),
"@typescript-eslint": typescriptEslint,
tsdoc,
import: fixupPluginRules(_import),
},

languageOptions: {
env: {
node: true,
parser: tsParser,
globals: {
...globals.node,
},
},
parser: tsParser,
}
,

rules: {
"no-restricted-imports": ["error", {
patterns: ["**/src/**"],
}],
"no-restricted-imports": [
"error",
{
patterns: ["**/src/**"],
},
],

"import/no-duplicates": "error",
"tsdoc/syntax": "error",
"@typescript-eslint/ban-ts-comment": "error",
"@typescript-eslint/ban-types": "error",
"@typescript-eslint/no-duplicate-enum-values": "error",
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-non-null-asserted-optional-chain": "error",
"@typescript-eslint/no-non-null-assertion": "error",
"@typescript-eslint/no-var-requires": "error",
"import/no-duplicates": "error",
"tsdoc/syntax": "error",
"@typescript-eslint/ban-ts-comment": "error",
"@typescript-eslint/ban-types": "error",
"@typescript-eslint/no-duplicate-enum-values": "error",
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-non-null-asserted-optional-chain": "error",
"@typescript-eslint/no-non-null-assertion": "error",
"@typescript-eslint/no-var-requires": "error",
},
}, {
},
{
files: ["**/*.ts"],

languageOptions: {
parser: tsParser,
ecmaVersion: "latest",
sourceType: "module",
parser: tsParser,
ecmaVersion: "latest",
sourceType: "module",

parserOptions: {
project: "./tsconfig.json",
tsconfigRootDir: ".",
},
parserOptions: {
project: "./tsconfig.json",
tsconfigRootDir: ".",
},
},

rules: {
"@typescript-eslint/array-type": "error",
"@typescript-eslint/consistent-type-assertions": "error",
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/explicit-function-return-type": "error",
"@typescript-eslint/array-type": "error",
"@typescript-eslint/consistent-type-assertions": "error",
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/explicit-function-return-type": "error",

"@typescript-eslint/naming-convention": ["error", {
selector: "interface",
format: ["PascalCase"],
prefix: ["Interface", "TestInterface"],
}, {
selector: ["typeAlias", "typeLike", "enum"],
format: ["PascalCase"],
}, {
selector: "typeParameter",
format: ["PascalCase"],
prefix: ["T"],
}, {
selector: "variable",
format: ["camelCase", "UPPER_CASE"],
leadingUnderscore: "allow",
}, {
selector: "parameter",
format: ["camelCase"],
leadingUnderscore: "allow",
}, {
selector: "function",
format: ["camelCase"],
}, {
selector: "memberLike",
modifiers: ["private"],
format: ["camelCase"],
leadingUnderscore: "require",
}, {
selector: "variable",
modifiers: ["exported"],
format: null,
}],
"@typescript-eslint/naming-convention": [
"error",
{
selector: "interface",
format: ["PascalCase"],
prefix: ["Interface", "TestInterface"],
},
{
selector: ["typeAlias", "typeLike", "enum"],
format: ["PascalCase"],
},
{
selector: "typeParameter",
format: ["PascalCase"],
prefix: ["T"],
},
{
selector: "variable",
format: ["camelCase", "UPPER_CASE"],
leadingUnderscore: "allow",
},
{
selector: "parameter",
format: ["camelCase"],
leadingUnderscore: "allow",
},
{
selector: "function",
format: ["camelCase"],
},
{
selector: "memberLike",
modifiers: ["private"],
format: ["camelCase"],
leadingUnderscore: "require",
},
{
selector: "variable",
modifiers: ["exported"],
format: null,
},
],
},
}, {
},
{
files: ["./src/typeDefs/**/*.ts"],
processor: "@graphql-eslint/graphql",
}, {
},
{
files: ["./src/typeDefs/**/*.graphql"],

plugins: {
"@graphql-eslint": graphqlEslint,
"@graphql-eslint": graphqlEslint,
},

languageOptions: {
parser: parser,
parser: graphqlEslint.parser,
},
}, {
},
{
files: ["tests/**/*"],

rules: {
"no-restricted-imports": "off",
"no-restricted-imports": "off",
},
}, {
},
{
files: ["./src/index.ts", "./src/utilities/copyToClipboard.ts"],

rules: {
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-empty-function": "off",
},
}];
},
];
15 changes: 15 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-tsdoc": "^0.3.0",
"get-graphql-schema": "^2.1.2",
"globals": "^15.11.0",
"graphql-markdown": "^7.1.0",
"husky": "^9.1.5",
"lint-staged": "^15.2.10",
Expand Down
36 changes: 28 additions & 8 deletions src/resolvers/Mutation/sendMembershipRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,15 @@ export const sendMembershipRequest: MutationResolvers["sendMembershipRequest"] =

// Checks if the user is blocked
const user = await User.findById(context.userId).lean();
if (user === null) {
throw new errors.NotFoundError(
requestContext.translate(USER_NOT_FOUND_ERROR.MESSAGE),
USER_NOT_FOUND_ERROR.CODE,
USER_NOT_FOUND_ERROR.PARAM,
);
}
syedali237 marked this conversation as resolved.
Show resolved Hide resolved

if (
user !== null &&
organization.blockedUsers.some((blockedUser) =>
new mongoose.Types.ObjectId(blockedUser.toString()).equals(user._id),
)
Expand All @@ -96,21 +103,35 @@ 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.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 },
);
}

syedali237 marked this conversation as resolved.
Show resolved Hide resolved
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,
Expand All @@ -129,16 +150,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 },
syedali237 marked this conversation as resolved.
Show resolved Hide resolved
);

return createdMembershipRequest.toObject();
Expand Down
Loading
Loading