@timardex/cluemart-server-shared 1.0.158 → 1.0.160

package/dist/index.d.mts

@@ -694,16 +694,6 @@ declare function sendPushNotifications({ data, message, title, userIds, }: Schem
  */
 declare function updateAdStatuses(): Promise<void>;
 
-/**
- *
- * This function updates the vendor's features based on the user's license.
- * It checks the type of license and updates the vendor's associates and availability accordingly.
- * If the user has a Pro Vendor license, they can have multiple associates and access to all availability types.
- * If they have a Standard Vendor license, their associates are removed and availability is restricted.
- * @param userId
- * @param licenceType
- * @returns
- */
 declare function updateVendorBasedOnUserLicense(userId: ObjectId, licenceType: EnumUserLicence): Promise<void>;
 
 /**

package/dist/index.d.ts

@@ -694,16 +694,6 @@ declare function sendPushNotifications({ data, message, title, userIds, }: Schem
  */
 declare function updateAdStatuses(): Promise<void>;
 
-/**
- *
- * This function updates the vendor's features based on the user's license.
- * It checks the type of license and updates the vendor's associates and availability accordingly.
- * If the user has a Pro Vendor license, they can have multiple associates and access to all availability types.
- * If they have a Standard Vendor license, their associates are removed and availability is restricted.
- * @param userId
- * @param licenceType
- * @returns
- */
 declare function updateVendorBasedOnUserLicense(userId: ObjectId, licenceType: EnumUserLicence): Promise<void>;
 
 /**

package/dist/index.mjs

@@ -8491,6 +8491,21 @@ var EVENT_LIST_ITEM = gql`
   ${RESOURCE_IMAGE_FIELDS_FRAGMENT}
   ${RELATION_DATES_FRAGMENT}
 `;
+var UNREGISTERED_VENDOR_LIST_ITEM_FIELDS_FRAGMENT = gql`
+  fragment UnregisteredVendorListItemFields on UnregisteredVendorListItemType {
+    _id
+    categoryIds
+    email
+    invitations {
+      dateTime {
+        ...DateTimeFields
+      }
+      eventId
+    }
+    name
+  }
+  ${DATETIME_FIELDS_FRAGMENT}
+`;
 var EVENT_INFO = gql`
   fragment EventInfoFields on EventInfoType {
     _id
@@ -8579,10 +8594,11 @@ var EVENT = gql`
     }
     rating
     reviewCount
+    rainOrShine
+    unregisteredVendorIds
     socialMedia {
       ...SocialMediaFields
     }
-    rainOrShine
     tags
     termsAgreement {
       ...TermsAgreementFields
@@ -8813,23 +8829,19 @@ var VENDOR_INFO = gql`
 `;
 var UNREGISTERED_VENDOR_INVITATION_FRAGMENT = gql`
   fragment UnregisteredVendorInvitationFields on UnregisteredVendorInvitationType {
-    dateTime {
-      ...DateTimeFields
-    }
-    eventId
-    location {
-      ...LocationFields
+    invitations {
+      dateTime {
+        ...DateTimeFields
+      }
+      eventId
     }
   }
   ${DATETIME_FIELDS_FRAGMENT}
-  ${LOCATION_FIELDS_FRAGMENT}
 `;
 var UNREGISTERED_VENDOR = gql`
   fragment UnregisteredVendorFields on UnregisteredVendorType {
     _id
-    categories {
-      ...CategoryFields
-    }
+    categoryIds
     createdAt
     deletedAt
     email
@@ -8837,10 +8849,8 @@ var UNREGISTERED_VENDOR = gql`
       ...UnregisteredVendorInvitationFields
     }
     name
-    region
     updatedAt
   }
-  ${CATEGORY_FIELDS_FRAGMENT}
   ${UNREGISTERED_VENDOR_INVITATION_FRAGMENT}
 `;
 var GET_VENDORS = gql`
@@ -10306,10 +10316,20 @@ var SCHOOL_REGISTERED_USERS_FIELDS_FRAGMENT = gql`
   }
   ${RESOURCE_IMAGE_FIELDS_FRAGMENT}
 `;
+var SCHOOL_CAMPAIGN_FIELDS_FRAGMENT = gql`
+  fragment SchoolCampaignFields on SchoolCampaignType {
+    endDate
+    name
+    startDate
+  }
+`;
 var SCHOOL = gql`
   fragment SchoolFields on SchoolType {
     _id
     active
+    campaigns {
+      ...SchoolCampaignFields
+    }
     contactDetails {
       ...ContactDetailsFields
     }
@@ -10344,6 +10364,7 @@ var SCHOOL = gql`
   ${CONTACT_DETAILS_FIELDS_FRAGMENT}
   ${TERMS_AGREEMENT_FIELDS_FRAGMENT}
   ${SOCIAL_MEDIA_FIELDS_FRAGMENT}
+  ${SCHOOL_CAMPAIGN_FIELDS_FRAGMENT}
 `;
 var GET_SCHOOL = gql`
   query getSchool($_id: ID!) {
@@ -10686,17 +10707,9 @@ var vendorSchema = globalResourceSchema.shape({
   vendorType: create$8().oneOf(Object.values(EnumVendorType)).required("Please select a Vendor type")
 });
 var unregisteredVendorSchema = create$3().shape({
-  categories: categorySchema.min(1, "Category list must contain at least one item").required("Categories are required"),
-  email: emailRequiredSchema,
-  invitations: create$2().of(
-    create$3({
-      dateTime: create$2().of(dateTimeSchema).required("DateTime is required"),
-      eventId: create$6().required("Event ID is required"),
-      location: locationSchema
-    })
-  ).nullable().default(null),
-  name: create$6().label("Name").trim().min(3).max(40).required("Name is required"),
-  region: create$6().label("Region").required("Region is required")
+  categoryIds: create$2().of(create$6().defined()).min(1, "Category list must contain at least one item").required("Categories are required"),
+  email: emailOptionalSchema,
+  name: create$6().label("Stallholder Name").trim().min(3, "Name must be at least 3 characters").required("Name is required")
 });
 var vendorInfoSchema = create$3().shape({
   product: create$3().shape({
@@ -11035,7 +11048,12 @@ var posterIds = [
   "mini-market5",
   "poster1",
   "poster2",
-  "poster3"
+  "poster3",
+  // New
+  "poster4",
+  "poster5",
+  "poster6",
+  "poster7"
 ];
 var posterFiles = Object.fromEntries(
   posterIds.map((id) => [id, `${id}${IMAGE_EXTENSION}`])
@@ -12525,10 +12543,19 @@ var GameModel = mongoose22.models.Game || mongoose22.model("Game", schema14);
 // src/mongoose/School.ts
 import mongoose23 from "mongoose";
 var MongooseSchema23 = mongoose23.Schema;
+var campaignsSchema = new MongooseSchema23(
+  {
+    endDate: { required: true, type: Date },
+    name: { required: true, type: String },
+    startDate: { required: true, type: Date }
+  },
+  { _id: false }
+);
 var schema15 = new MongooseSchema23(
   {
     // New schools are active by default
     active: { default: true, required: true, type: Boolean },
+    campaigns: { required: false, type: [campaignsSchema] },
     contactDetails: { required: false, type: ContactDetailsSchema },
     deletedAt: { default: null, required: false, type: Date },
     location: {
@@ -12744,9 +12771,6 @@ async function updateAdStatuses() {
   );
 }
 
-// src/service/vendor.ts
-import mongoose26 from "mongoose";
-
 // src/service/associate.ts
 import mongoose25 from "mongoose";
 async function removeAssociateFromResource({
@@ -12754,11 +12778,9 @@ async function removeAssociateFromResource({
   resourceOwnerId,
   resourceType
 }) {
-  const normalizedResourceId = resourceId.toString();
-  const normalizedOwnerId = typeof resourceOwnerId === "string" ? new mongoose25.Types.ObjectId(resourceOwnerId) : resourceOwnerId;
-  const session = await mongoose25.startSession();
   try {
-    session.startTransaction();
+    const normalizedResourceId = resourceId.toString();
+    const normalizedOwnerId = typeof resourceOwnerId === "string" ? new mongoose25.Types.ObjectId(resourceOwnerId) : resourceOwnerId;
     const usersWithAssociates = await UserModel.find(
       {
         associates: {
@@ -12770,16 +12792,18 @@ async function removeAssociateFromResource({
       },
       {
         associates: 1
-        // Only fetch associates field for efficiency
       }
-    ).lean().session(session);
-    const associateEmails = usersWithAssociates.flatMap(
-      (user) => (user.associates ?? []).filter(
-        (assoc) => assoc.resourceId === normalizedResourceId && assoc.resourceType === resourceType
-      ).map((assoc) => assoc.email)
-    );
+    ).lean();
+    const associateEmails = [
+      ...new Set(
+        usersWithAssociates.flatMap(
+          (user) => (user.associates ?? []).filter(
+            (associate) => associate.resourceId === normalizedResourceId && associate.resourceType === resourceType
+          ).map((associate) => associate.email)
+        )
+      )
+    ];
     if (associateEmails.length === 0) {
-      await session.commitTransaction();
       return;
     }
     await UserModel.updateMany(
@@ -12798,8 +12822,7 @@ async function removeAssociateFromResource({
             resourceType
           }
         }
-      },
-      { session }
+      }
     );
     await ChatModel.updateMany(
       {
@@ -12814,103 +12837,83 @@ async function removeAssociateFromResource({
       },
       {
         $set: {
-          "participants.$[assoc].active": false
+          "participants.$[associate].active": false
         }
       },
       {
         arrayFilters: [
           {
-            "assoc.isAssociate": true,
-            "assoc.userEmail": { $in: associateEmails }
+            "associate.isAssociate": true,
+            "associate.userEmail": {
+              $in: associateEmails
+            }
           }
-        ],
-        session
+        ]
       }
     );
-    await session.commitTransaction();
   } catch (error) {
-    await session.abortTransaction();
     console.error(
-      `[removeAssociateFromResource] Failed for resourceId=${normalizedResourceId}, resourceType=${resourceType}`,
+      `[removeAssociateFromResource] Failed for resourceId=${resourceId}, resourceType=${resourceType}`,
       error
     );
-    throw error;
-  } finally {
-    session.endSession();
   }
 }
 
 // src/service/vendor.ts
 async function updateVendorBasedOnUserLicense(userId, licenceType) {
-  const session = await mongoose26.startSession();
   try {
-    session.startTransaction();
-    const user = await UserModel.findById(userId).select("vendor").lean().session(session);
+    const user = await UserModel.findById(userId).select("vendor").lean();
     if (!user?.vendor) {
-      console.warn(`[updateVendor] No vendor for userId=${userId}`);
-      await session.abortTransaction();
+      console.warn(`[updateVendor] No vendor found for userId=${userId}`);
       return;
     }
-    const vendor = await VendorModel.findById(user.vendor).lean().session(session);
+    const vendor = await VendorModel.findById(user.vendor).lean();
     if (!vendor) {
       console.warn(`[updateVendor] Vendor not found for id=${user.vendor}`);
-      await session.abortTransaction();
       return;
     }
-    const vendorUpdateData = {};
-    if (licenceType === EnumUserLicence.STANDARD_VENDOR) {
-      vendorUpdateData.associates = [];
-      vendorUpdateData.availability = {
+    const updateData = {};
+    const isStandardVendor = licenceType === EnumUserLicence.STANDARD_VENDOR;
+    if (isStandardVendor) {
+      updateData.associates = [];
+      updateData.availability = {
         corporate: false,
         private: false,
         school: false
       };
-      vendorUpdateData.products = {
+      updateData.products = {
         active: false,
         productsList: vendor.products?.productsList ?? []
       };
-      vendorUpdateData.calendar = {
+      updateData.calendar = {
         active: false,
         calendarData: vendor.calendar?.calendarData ?? []
       };
-      vendorUpdateData.images = (vendor.images ?? []).map((img, index) => ({
-        ...img,
-        active: index < 6
-      }));
-    } else {
-      vendorUpdateData.images = (vendor.images ?? []).map((img) => ({
-        ...img,
-        active: true
-      }));
     }
-    await VendorModel.updateOne(
-      { _id: vendor._id },
-      { $set: vendorUpdateData },
-      { session }
-    );
-    if (licenceType === EnumUserLicence.STANDARD_VENDOR) {
+    updateData.images = (vendor.images ?? []).map((image, index) => ({
+      ...image,
+      active: isStandardVendor ? index < 6 : true
+    }));
+    await VendorModel.updateOne({ _id: vendor._id }, { $set: updateData });
+    if (isStandardVendor) {
       await removeAssociateFromResource({
         resourceId: vendor._id,
         resourceOwnerId: vendor.owner.userId,
         resourceType: EnumResourceType.VENDOR
       });
     }
-    await session.commitTransaction();
   } catch (error) {
-    await session.abortTransaction();
     console.error("[updateVendorBasedOnUserLicense] Failed:", error);
-  } finally {
-    session.endSession();
   }
 }
 
 // src/service/objectIdToString.ts
-import mongoose27 from "mongoose";
+import mongoose26 from "mongoose";
 function convertObjectIdsToStrings(obj) {
   if (obj === null || obj === void 0) {
     return obj;
   }
-  if (obj instanceof mongoose27.Types.ObjectId) {
+  if (obj instanceof mongoose26.Types.ObjectId) {
     return obj.toString();
   }
   if (Array.isArray(obj)) {
@@ -12941,7 +12944,7 @@ async function findEventOrImportedMarketById(resourceId) {
 
 // src/types/index.ts
 import express from "express";
-import mongoose28 from "mongoose";
+import mongoose27 from "mongoose";
 var EnumPubSubEvents = /* @__PURE__ */ ((EnumPubSubEvents2) => {
   EnumPubSubEvents2["GET_CHAT_MESSAGE"] = "GET_CHAT_MESSAGE";
   EnumPubSubEvents2["GET_NOTIFICATIONS"] = "GET_NOTIFICATIONS";
@@ -12987,7 +12990,7 @@ export {
   findEventOrImportedMarketById,
   locationGeoSchema,
   locationsSchema,
-  mongoose28 as mongoose,
+  mongoose27 as mongoose,
   refundPolicySchema,
   relationDatesSchema,
   resourceRelationsSchema,