Sign up route changed with bug fix and proper data importation

package.json

@@ -22,6 +22,7 @@
     "generate:graphql-schema": "get-graphql-schema http://localhost:4000/graphql --json > docs/schema.json",
     "generate:ssl-private-key": "openssl genrsa -out ./key.pem",
     "import:sample-data": "tsx ./src/utilities/loadSampleData.ts",
+    "import:sample-data-defaultOrg": "tsx ./src/utilities/loadDefaultOrganizationScript.ts",
     "import:sample-data:prod": "node ./build/utilities/loadSampleData.js",
     "gen:schema": "graphql-inspector introspect ./src/typeDefs/**/**/*.ts --write ./schema.graphql ",
     "update:toc": "node scripts/githooks/update-toc.js"

sample_data/defaultOrganization.json

@@ -0,0 +1,31 @@
+[
+  {
+    "_id": "65ecb98712e5d1c5a4504ce4",
+    "status": "ACTIVE",
+    "members": ["65ecb93989225c818f784821"],
+    "admins": ["65ecb93989225c818f784821"],
+    "groupChats": [],
+    "posts": [],
+    "pinnedPosts": [],
+    "membershipRequests": [],
+    "blockedUsers": [],
+    "name": "Default Organization",
+    "description": "Default description. Needs to be changed.",
+    "address": {
+      "city": "Default Address. Needs to be changed",
+      "countryCode": "IN",
+      "dependentLocality": "Default Address. Needs to be changed",
+      "line1": "default1",
+      "line2": "default2",
+      "postalCode": "711205",
+      "sortingCode": "default sorting code",
+      "state": "default state"
+    },
+    "userRegistrationRequired": false,
+    "visibleInSearch": true,
+    "image": null,
+    "creatorId": "65ecb93989225c818f784821",
+    "createdAt": "2023-04-13T05:16:52.827Z",
+    "__v": 0
+  }
+]

sample_data/defaultOrganizationAdmin.json

@@ -0,0 +1,19 @@
+[
+  {
+    "_id": "65ecb93989225c818f784821",
+    "appUserProfileId": "66043dbcd72afa8f13db5854",
+    "joinedOrganizations": ["65ecb98712e5d1c5a4504ce4"],
+    "registeredEvents": [],
+    "membershipRequests": [],
+    "organizationsBlockedBy": [],
+    "status": "ACTIVE",
+    "pluginCreationAllowed": true,
+    "firstName": "Default",
+    "lastName": "Admin",
+    "email": "[email protected]",
+    "password": "$2a$12$bSYpay6TRMpTOaAmYPFXku4avwmqfFBtmgg39TabxmtFEiz4plFtW",
+    "image": null,
+    "createdAt": "2023-04-13T04:53:17.742Z",
+    "__v": 0
+  }
+]

sample_data/defaultOrganizationAdminProfileId.json

@@ -0,0 +1,18 @@
+[
+  {
+    "_id": "66043dbcd72afa8f13db5854",
+    "userId": "65ecb93989225c818f784821",
+    "adminFor": ["65ecb98712e5d1c5a4504ce4"],
+    "appLanguageCode": "en",
+    "createdEvents": [],
+    "createdOrganizations": ["65ecb98712e5d1c5a4504ce4"],
+    "eventAdmin": [],
+    "pluginCreationAllowed": true,
+    "token": null,
+    "tokenVersion": 0,
+    "isSuperAdmin": false,
+    "adminApproved": true,
+    "createdAt": "2023-04-13T04:53:17.742Z",
+    "__v": 0
+  }
+]

schema.graphql

@@ -1727,8 +1727,8 @@ input UserInput {
   email: EmailAddress!
   firstName: String!
   lastName: String!
-  organizationUserBelongsToId: ID
   password: String!
+  selectedOrgainzation: ID!
 }
 
 enum UserOrderByInput {

setup.ts

@@ -23,13 +23,14 @@ import {
   checkExistingRedis,
   checkRedisConnection,
 } from "./src/setup/redisConfiguration";
+import { askForSuperAdminEmail } from "./src/setup/superAdmin";
+import { updateEnvVariable } from "./src/setup/updateEnvVariable";
+import { verifySmtpConnection } from "./src/setup/verifySmtpConnection";
+import { importDefaultOrganization } from "./src/setup/importDefaultOrganization";
 import {
   setImageUploadSize,
   validateImageFileSize,
 } from "./src/setup/setImageUploadSize";
-import { askForSuperAdminEmail } from "./src/setup/superAdmin";
-import { updateEnvVariable } from "./src/setup/updateEnvVariable";
-import { verifySmtpConnection } from "./src/setup/verifySmtpConnection";
 /* eslint-enable */
 
 dotenv.config();
@@ -566,7 +567,6 @@ export async function twoFactorAuth(): Promise<void> {
     updateEnvVariable(config);
   }
 }
-
 /**
  * The function `configureSmtp` prompts the user to configure SMTP settings for sending emails through
  * Talawa and saves the configuration in a .env file.
@@ -910,8 +910,6 @@ async function main(): Promise<void> {
     },
   ]);
 
-  await setImageUploadSize(imageSizeLimit * 1000);
-
   if (!isDockerInstallation) {
     const { shouldRunDataImport } = await inquirer.prompt([
       {
@@ -921,12 +919,15 @@ async function main(): Promise<void> {
         default: false,
       },
     ]);
-
     if (shouldRunDataImport) {
       await importData();
+    } else {
+      await importDefaultOrganization();
     }
   }
 
+  await setImageUploadSize(imageSizeLimit * 1000);
+
   console.log(
     "\nCongratulations! Talawa API has been successfully setup! 🥂🎉",
   );

src/db.ts

@@ -5,9 +5,11 @@ import { checkReplicaSet } from "./utilities/checkReplicaSet";
 
 let session!: mongoose.ClientSession;
 
-export const connect = async (): Promise<void> => {
+export const connect = async (dbName?: string): Promise<void> => {
   try {
-    await mongoose.connect(MONGO_DB_URL as string);
+    await mongoose.connect(MONGO_DB_URL as string, {
+      dbName,
+    });
     const replicaSet = await checkReplicaSet();
     if (replicaSet) {
       logger.info("Session started --> Connected to a replica set!");

src/resolvers/Mutation/acceptMembershipRequest.ts

@@ -2,7 +2,12 @@ import type { MutationResolvers } from "../../types/generatedGraphQLTypes";
 import { errors, requestContext } from "../../libraries";
 import { adminCheck } from "../../utilities";
 import type { Types } from "mongoose";
-import { MembershipRequest, Organization, User } from "../../models";
+import {
+  AppUserProfile,
+  MembershipRequest,
+  Organization,
+  User,
+} from "../../models";
 import {
   MEMBERSHIP_REQUEST_NOT_FOUND_ERROR,
   USER_ALREADY_MEMBER_ERROR,
@@ -21,6 +26,7 @@ import { cacheOrganizations } from "../../services/OrganizationCache/cacheOrgani
  * 3. Whether the user exists
  * 4. whether currentUser with _id === context.userId is an admin of organization.
  * 5. Whether user is already a member of organization.
+ * 6. Whether the user is a new user or not
  */
 export const acceptMembershipRequest: MutationResolvers["acceptMembershipRequest"] =
   async (_parent, args, context) => {
@@ -102,22 +108,31 @@ export const acceptMembershipRequest: MutationResolvers["acceptMembershipRequest
 
     if (updatedOrganization !== null) {
       await cacheOrganizations([updatedOrganization]);
-    }
-
-    // Update the user
-    await User.updateOne(
-      {
-        _id: user._id,
-      },
-      {
-        $push: {
-          joinedOrganizations: organization._id,
+      await User.updateOne(
+        {
+          _id: user._id,
         },
-        $pull: {
-          membershipRequests: membershipRequest._id,
+        {
+          $push: {
+            joinedOrganizations: organization._id,
+          },
+          $pull: {
+            membershipRequests: membershipRequest._id,
+          },
         },
-      },
-    );
-
+      );
+      // Check if this request was made during signup
+      const appUserProfile = await AppUserProfile.findOne({
+        userId: user._id,
+      })
+        .select("adminApproved")
+        .lean();
+      // No need to check whether appUserProfile exists or not because if it doessn't exists, adminCheck will throw error.
+      if (appUserProfile?.adminApproved == false) {
+        await AppUserProfile.findByIdAndUpdate(appUserProfile._id, {
+          adminApproved: true,
+        });
+      }
+    }
     return membershipRequest;
   };