Updated location Param to Address Object param in Organizations (Updated).

sample_data/organizations.json

@@ -11,7 +11,16 @@
     "blockedUsers": [],
     "name": "The Unity Foundation",
     "description": "A foundation aimed at uniting the world and making it a better place for all.",
-    "location": "Delhi, India",
+    "address": {
+      "city": "Delhi",
+      "countryCode": "IN",
+      "dependentLocality": "Some Dependent Locality",
+      "line1": "123 Random Street",
+      "line2": "Apartment 456",
+      "postalCode": "110001",
+      "sortingCode": "ABC-123",
+      "state": "Delhi"
+    },
     "userRegistrationRequired": false,
     "visibleInSearch": true,
     "image": null,
@@ -36,12 +45,20 @@
     "blockedUsers": [],
     "name": "Angel Foundation",
     "description": "We are aimed at improving the education spaces for the under privileged girl child.",
-    "location": "Kolkata, West Bengal",
+    "address": {
+      "city": "Kolkata",
+      "countryCode": "IN",
+      "dependentLocality": "Some Dependent Locality",
+      "line1": "line1",
+      "line2": "line2",
+      "postalCode": "711205",
+      "sortingCode": "ABC-124",
+      "state": "West Bengal"
+    },
     "userRegistrationRequired": false,
     "visibleInSearch": true,
     "image": null,
     "creatorId": "64378abd85008f171cf2990d",
-    "updatedAt": "2023-04-13T05:16:52.827Z",
     "createdAt": "2023-04-13T05:16:52.827Z",
     "__v": 0
   },
@@ -57,12 +74,20 @@
     "blockedUsers": [],
     "name": "Hope Foundation",
     "description": "A place where money and power doesn't matter. Free legal aid to everyone.",
-    "location": "Mountain View, CA",
+    "address": {
+      "city": "Mountain View",
+      "countryCode": "US",
+      "dependentLocality": "Some Dependent Locality",
+      "line1": "123 Main Street",
+      "line2": "Apt 456",
+      "postalCode": "94040",
+      "sortingCode": "XYZ-789",
+      "state": "CA"
+    },
     "userRegistrationRequired": false,
     "visibleInSearch": true,
     "image": null,
     "creatorId": "64378abd85008f171cf2990d",
-    "updatedAt": "2023-04-13T05:16:52.827Z",
     "createdAt": "2023-04-13T05:16:52.827Z",
     "__v": 0
   },
@@ -78,12 +103,20 @@
     "blockedUsers": [],
     "name": "Dignity Foundation",
     "description": "A foundation aimed at improving the lives of old age citizens.",
-    "location": "Brooklyn, NYC",
+    "address": {
+      "city": "Brooklyn",
+      "countryCode": "US",
+      "dependentLocality": "Sample Dependent Locality",
+      "line1": "123 Main Street",
+      "line2": "Apt 456",
+      "postalCode": "11234",
+      "sortingCode": "ABC-789",
+      "state": "NY"
+    },
     "userRegistrationRequired": false,
     "visibleInSearch": true,
     "image": null,
     "creatorId": "64378abd85008f171cf2990d",
-    "updatedAt": "2023-04-13T05:16:52.827Z",
     "createdAt": "2023-04-13T05:16:52.827Z",
     "__v": 0
   }

schema.graphql

@@ -4,7 +4,7 @@ directive @role(requires: UserType) on FIELD_DEFINITION
 
 type Address {
   city: String
-  countryCode: CountryCode
+  countryCode: String
   dependentLocality: String
   line1: String
   line2: String
@@ -15,7 +15,7 @@ type Address {
 
 input AddressInput {
   city: String
-  countryCode: CountryCode
+  countryCode: String
   dependentLocality: String
   line1: String
   line2: String
@@ -570,6 +570,7 @@ input OTPInput {
 
 type Organization {
   _id: ID!
+  address: Address
   admins(adminId: ID): [User!]
   apiUrl: URL!
   blockedUsers: [User]
@@ -578,7 +579,6 @@ type Organization {
   customFields: [OrganizationCustomField!]!
   description: String!
   image: String
-  location: String
   members: [User]
   membershipRequests: [MembershipRequest]
   name: String!
@@ -608,11 +608,11 @@ type OrganizationInfoNode {
 }
 
 input OrganizationInput {
+  address: AddressInput!
   apiUrl: URL
   attendees: String
   description: String!
   image: String
-  location: String
   name: String!
   userRegistrationRequired: Boolean
   visibleInSearch: Boolean
@@ -921,8 +921,8 @@ input UpdateEventInput {
 }
 
 input UpdateOrganizationInput {
+  address: AddressInput
   description: String
-  location: String
   name: String
   userRegistrationRequired: Boolean
   visibleInSearch: Boolean

src/models/Organization.ts

@@ -14,7 +14,16 @@ export interface InterfaceOrganization {
   image: string | undefined;
   name: string;
   description: string;
-  location: string | undefined;
+  address: {
+    city: string;
+    countryCode: string;
+    dependentLocality: string;
+    line1: string;
+    line2: string;
+    postalCode: string;
+    sortingCode: string;
+    state: string;
+  };
   creatorId: PopulatedDoc<InterfaceUser & Document>;
   status: string;
   members: PopulatedDoc<InterfaceUser & Document>[];
@@ -36,7 +45,7 @@ export interface InterfaceOrganization {
  * @param image - Organization image URL.
  * @param name - Organization name.
  * @param description - Organization description.
- * @param location - Organization location.
+ * @param address - Organization address, stored as an object.
  * @param creatorId - Organization creator, referring to `User` model.
  * @param status - Status.
  * @param members - Collection of members, each object refer to `User` model.
@@ -49,7 +58,6 @@ export interface InterfaceOrganization {
  * @param createdAt - Time stamp of data creation.
  * @param updatedAt - Time stamp of data updation.
  */
-
 const organizationSchema = new Schema(
   {
     apiUrl: {
@@ -66,8 +74,31 @@ const organizationSchema = new Schema(
       type: String,
       required: true,
     },
-    location: {
-      type: String,
+    address: {
+      city: {
+        type: String,
+      },
+      countryCode: {
+        type: String,
+      },
+      dependentLocality: {
+        type: String,
+      },
+      line1: {
+        type: String,
+      },
+      line2: {
+        type: String,
+      },
+      postalCode: {
+        type: String,
+      },
+      sortingCode: {
+        type: String,
+      },
+      state: {
+        type: String,
+      },
     },
     userRegistrationRequired: {
       type: Boolean,

src/resolvers/Mutation/createOrganization.ts

@@ -1,5 +1,8 @@
 import "dotenv/config";
-import type { MutationResolvers } from "../../types/generatedGraphQLTypes";
+import type {
+  MutationResolvers,
+  Address,
+} from "../../types/generatedGraphQLTypes";
 import { User, Organization } from "../../models";
 import { errors, requestContext } from "../../libraries";
 import { LENGTH_VALIDATION_ERROR } from "../../constants";
@@ -39,14 +42,17 @@
     let validationResultDescription = {
       isLessThanMaxLength: false,
     };
-    let validationResultLocation = {
-      isLessThanMaxLength: false,
+    let validationResultAddress = {
+      isAddressValid: false,
     };
 
-    if (args.data?.name && args.data?.description && args.data?.location) {
+    if (args.data?.name && args.data?.description) {
       validationResultName = isValidString(args.data?.name, 256);
       validationResultDescription = isValidString(args.data?.description, 500);
-      validationResultLocation = isValidString(args.data?.location, 50);
+    }
+
+    if (args.data?.address) {
+      validationResultAddress = validateAddress(args.data?.address);
     }
 
     if (!validationResultName.isLessThanMaxLength) {
@@ -65,25 +71,21 @@
         LENGTH_VALIDATION_ERROR.CODE
       );
     }
-    if (!validationResultLocation.isLessThanMaxLength) {
-      throw new errors.InputValidationError(
-        requestContext.translate(
-          `${LENGTH_VALIDATION_ERROR.MESSAGE} 50 characters in location`
-        ),
-        LENGTH_VALIDATION_ERROR.CODE
-      );
+    if (!validationResultAddress.isAddressValid) {
+      throw new errors.InputValidationError("Not a Valid Address");
     }
 
     // Creates new organization.
     const createdOrganization = await Organization.create({
       ...args.data,
+      address: args.data?.address,
       image: uploadImageFileName ? uploadImageFileName : null,
       creatorId: context.userId,
       admins: [context.userId],
       members: [context.userId],
     });
 
-    await cacheOrganizations([createdOrganization.toObject()!]);
+    await cacheOrganizations([createdOrganization.toObject()]);
 
     /*
     Adds createdOrganization._id to joinedOrganizations, createdOrganizations
@@ -105,3 +107,71 @@
     // Returns createdOrganization.
     return createdOrganization.toObject();
   };
+/**
+ * Validates an address object to ensure its fields meet specified criteria.
+ * @param address - The address object to validate
+ * @returns An object containing the validation result: isAddressValid (true if the address is valid, false otherwise)
+ */
+function validateAddress(address: Address | undefined): {
+  isAddressValid: boolean;
+} {
+  if (!address) {
+    return { isAddressValid: false };
+  }
+
+  const {
+    city,
+    countryCode,
+    dependentLocality,
+    line1,
+    line2,
+    postalCode,
+    sortingCode,
+    state,
+  } = address;
+
+  // Mandatory: It should be a valid country code.
+  const isCountryCodeValid = !!countryCode && countryCode.length >= 2;
+
+  // Mandatory: It should exist and have a length greater than 0
+  const isCityValid = !!city && city.length > 0;
+
+  // Optional: It should exist and have a length greater than 0
+  const isDependentLocalityValid =
+    dependentLocality === undefined ||
+    (typeof dependentLocality === "string" && dependentLocality.length >= 0);
+
+  // Optional: Line 1 should exist and have a length greater than 0
+  const isLine1Valid =
+    line1 === undefined || (typeof line1 === "string" && line1.length >= 0);
+
+  // Optional: Line 2 should exist and have a length greater than 0, if provided
+  const isLine2Valid =
+    line2 === undefined || (typeof line2 === "string" && line2.length >= 0);
+
+  // Optional: It should exist and have a valid format.
+  const isPostalCodeValid =
+    postalCode === undefined ||
+    (typeof postalCode === "string" && /^\d*$/.test(postalCode));
+
+  // Optional: It should exist and have a length greater than 0, if provided
+  const isSortingCodeValid =
+    sortingCode === undefined ||
+    (typeof sortingCode === "string" && sortingCode.length >= 0);
+
+  // Optional: It should exist and have a length greater than 0, if provided
+  const isStateValid =
+    state === undefined || (typeof state === "string" && state.length >= 0);
+
+  const isAddressValid =
+    isCityValid &&
+    isCountryCodeValid &&
+    isDependentLocalityValid &&
+    isLine1Valid &&
+    isLine2Valid &&
+    isPostalCodeValid &&
+    isSortingCodeValid &&
+    isStateValid;
+
+  return { isAddressValid: isAddressValid };
+}

src/typeDefs/inputs.ts

@@ -138,7 +138,7 @@ export const inputs = gql`
   input OrganizationInput {
     name: String!
     description: String!
-    location: String
+    address: AddressInput!
     attendees: String
     apiUrl: URL
     image: String
@@ -280,7 +280,7 @@ export const inputs = gql`
   input UpdateOrganizationInput {
     name: String
     description: String
-    location: String
+    address: AddressInput
     userRegistrationRequired: Boolean
     visibleInSearch: Boolean
   }
@@ -292,7 +292,7 @@ export const inputs = gql`
 
   input AddressInput {
     city: String
-    countryCode: CountryCode
+    countryCode: String
     dependentLocality: String
     line1: String
     line2: String

src/typeDefs/types.ts

@@ -225,7 +225,7 @@ export const types = gql`
     _id: ID!
     name: String!
     description: String!
-    location: String
+    address: Address
     creator: User
     createdAt: DateTime!
     updatedAt: DateTime!
@@ -347,7 +347,7 @@ export const types = gql`
 
   type Address {
     city: String
-    countryCode: CountryCode
+    countryCode: String
     dependentLocality: String
     line1: String
     line2: String