@timardex/cluemart-server-shared 1.0.208 → 1.0.210

package/dist/index.d.mts

@@ -711,6 +711,11 @@ declare function updateVendorBasedOnUserLicense(userId: ObjectId, licenceType: E
  */
 declare function convertObjectIdsToStrings(obj: any): any;
 
+/**
+ * Recomputes dateStatus for every dateTime slot on events and google imported markets.
+ */
+declare function updateAllEventDateTimeStatuses(): Promise<void>;
+
 type EventOrMarket = Pick<EventListItemType, "_id" | "name"> | null;
 /**
  * This function attempts to find an Event or a Google Imported Market by the given resource ID.
@@ -721,12 +726,6 @@ type EventOrMarket = Pick<EventListItemType, "_id" | "name"> | null;
  * @returns A promise that resolves to either an Event or a Google Imported Market object containing _id and name, or null if not found.
  */
 declare function findEventOrImportedMarketById(resourceId: ObjectId | string | null | undefined): Promise<EventOrMarket>;
-/**
- * Updates the dateStatus field for a single DateTimeType object based on the current date/time
- * @param dateTime The date-time object to update
- * @returns A new object with updated dateStatus value
- */
-declare function updateSingleDateTimeStatus<T extends DateTimeType>(dateTime: T): T;
 
 type EventDateSlot = Pick<DateTimeType$1, "startDate" | "startTime">;
 /**
@@ -740,4 +739,4 @@ declare function didRemoveAnyEventDates(previousDateTime: EventDateSlot[] | unde
  */
 declare function updateRelationDatesToUnavailable(relationDates: SchemaRelationType["relationDates"], eventDateTime: DateTimeWithPriceType[] | undefined): SchemaRelationType["relationDates"];
 
-export { APP_SETTINGS_ID, AdModel, AppSettingModel, type AuthUser, CategorySchema, ChatModel, ChatReportModel, ContactDetailsSchema, EnumPubSubEvents, EventInfoModel, EventModel, GameModel, GoogleImportedMarketModel, type GraphQLContext, NotificationModel, type ObjectId, OwnerTypeSchema, PartnerModel, PostModel, PushTokenModel, RelationModel, RelationTypeSchema, ResourceActivityModel, ResourceImageTypeSchema, type SchemaChatMessageReactionType, type SchemaChatMessageReplyPreviewType, type SchemaChatMessageSeenType, type SchemaChatMessageType, type SchemaChatReportType, type SchemaChatType, type SchemaCreateBulkNotificationInput, type SchemaEventInfoType, type SchemaEventType, type SchemaGameType, type SchemaGoogleImportedMarket, type SchemaNotificationType, type SchemaOwnerType, type SchemaParticipantType, type SchemaPartnerType, type SchemaPostType, type SchemaPushTokenType, type SchemaRelationType, type SchemaUnregisteredVendorInvitationType, type SchemaUnregisteredVendorType, type SchemaUserActivityEvent, type SchemaUserType, type SchemaVendorInfoType, type SchemaVendorType, SchoolModel, SocialMediaTypeSchema, StallTypeSchema, type SubscriptionPayload, UnregisteredVendorModel, UserModel, VendorInfoModel, VendorModel, VerificationTokenModel, type VerificationTokenType, associatesSchema, baseResourceFields, connectToDatabase, convertObjectIdsToStrings, dateTimeSchema, didRemoveAnyEventDates, findEventOrImportedMarketById, locationGeoSchema, locationsSchema, refundPolicySchema, relationDatesSchema, resourceRelationsSchema, saveNotificationsInDb, sendPushNotifications, termsAgreementSchema, updateAdStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense, userLicenseSchema };
+export { APP_SETTINGS_ID, AdModel, AppSettingModel, type AuthUser, CategorySchema, ChatModel, ChatReportModel, ContactDetailsSchema, EnumPubSubEvents, EventInfoModel, EventModel, GameModel, GoogleImportedMarketModel, type GraphQLContext, NotificationModel, type ObjectId, OwnerTypeSchema, PartnerModel, PostModel, PushTokenModel, RelationModel, RelationTypeSchema, ResourceActivityModel, ResourceImageTypeSchema, type SchemaChatMessageReactionType, type SchemaChatMessageReplyPreviewType, type SchemaChatMessageSeenType, type SchemaChatMessageType, type SchemaChatReportType, type SchemaChatType, type SchemaCreateBulkNotificationInput, type SchemaEventInfoType, type SchemaEventType, type SchemaGameType, type SchemaGoogleImportedMarket, type SchemaNotificationType, type SchemaOwnerType, type SchemaParticipantType, type SchemaPartnerType, type SchemaPostType, type SchemaPushTokenType, type SchemaRelationType, type SchemaUnregisteredVendorInvitationType, type SchemaUnregisteredVendorType, type SchemaUserActivityEvent, type SchemaUserType, type SchemaVendorInfoType, type SchemaVendorType, SchoolModel, SocialMediaTypeSchema, StallTypeSchema, type SubscriptionPayload, UnregisteredVendorModel, UserModel, VendorInfoModel, VendorModel, VerificationTokenModel, type VerificationTokenType, associatesSchema, baseResourceFields, connectToDatabase, convertObjectIdsToStrings, dateTimeSchema, didRemoveAnyEventDates, findEventOrImportedMarketById, locationGeoSchema, locationsSchema, refundPolicySchema, relationDatesSchema, resourceRelationsSchema, saveNotificationsInDb, sendPushNotifications, termsAgreementSchema, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateVendorBasedOnUserLicense, userLicenseSchema };

package/dist/index.d.ts

@@ -711,6 +711,11 @@ declare function updateVendorBasedOnUserLicense(userId: ObjectId, licenceType: E
  */
 declare function convertObjectIdsToStrings(obj: any): any;
 
+/**
+ * Recomputes dateStatus for every dateTime slot on events and google imported markets.
+ */
+declare function updateAllEventDateTimeStatuses(): Promise<void>;
+
 type EventOrMarket = Pick<EventListItemType, "_id" | "name"> | null;
 /**
  * This function attempts to find an Event or a Google Imported Market by the given resource ID.
@@ -721,12 +726,6 @@ type EventOrMarket = Pick<EventListItemType, "_id" | "name"> | null;
  * @returns A promise that resolves to either an Event or a Google Imported Market object containing _id and name, or null if not found.
  */
 declare function findEventOrImportedMarketById(resourceId: ObjectId | string | null | undefined): Promise<EventOrMarket>;
-/**
- * Updates the dateStatus field for a single DateTimeType object based on the current date/time
- * @param dateTime The date-time object to update
- * @returns A new object with updated dateStatus value
- */
-declare function updateSingleDateTimeStatus<T extends DateTimeType>(dateTime: T): T;
 
 type EventDateSlot = Pick<DateTimeType$1, "startDate" | "startTime">;
 /**
@@ -740,4 +739,4 @@ declare function didRemoveAnyEventDates(previousDateTime: EventDateSlot[] | unde
  */
 declare function updateRelationDatesToUnavailable(relationDates: SchemaRelationType["relationDates"], eventDateTime: DateTimeWithPriceType[] | undefined): SchemaRelationType["relationDates"];
 
-export { APP_SETTINGS_ID, AdModel, AppSettingModel, type AuthUser, CategorySchema, ChatModel, ChatReportModel, ContactDetailsSchema, EnumPubSubEvents, EventInfoModel, EventModel, GameModel, GoogleImportedMarketModel, type GraphQLContext, NotificationModel, type ObjectId, OwnerTypeSchema, PartnerModel, PostModel, PushTokenModel, RelationModel, RelationTypeSchema, ResourceActivityModel, ResourceImageTypeSchema, type SchemaChatMessageReactionType, type SchemaChatMessageReplyPreviewType, type SchemaChatMessageSeenType, type SchemaChatMessageType, type SchemaChatReportType, type SchemaChatType, type SchemaCreateBulkNotificationInput, type SchemaEventInfoType, type SchemaEventType, type SchemaGameType, type SchemaGoogleImportedMarket, type SchemaNotificationType, type SchemaOwnerType, type SchemaParticipantType, type SchemaPartnerType, type SchemaPostType, type SchemaPushTokenType, type SchemaRelationType, type SchemaUnregisteredVendorInvitationType, type SchemaUnregisteredVendorType, type SchemaUserActivityEvent, type SchemaUserType, type SchemaVendorInfoType, type SchemaVendorType, SchoolModel, SocialMediaTypeSchema, StallTypeSchema, type SubscriptionPayload, UnregisteredVendorModel, UserModel, VendorInfoModel, VendorModel, VerificationTokenModel, type VerificationTokenType, associatesSchema, baseResourceFields, connectToDatabase, convertObjectIdsToStrings, dateTimeSchema, didRemoveAnyEventDates, findEventOrImportedMarketById, locationGeoSchema, locationsSchema, refundPolicySchema, relationDatesSchema, resourceRelationsSchema, saveNotificationsInDb, sendPushNotifications, termsAgreementSchema, updateAdStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense, userLicenseSchema };
+export { APP_SETTINGS_ID, AdModel, AppSettingModel, type AuthUser, CategorySchema, ChatModel, ChatReportModel, ContactDetailsSchema, EnumPubSubEvents, EventInfoModel, EventModel, GameModel, GoogleImportedMarketModel, type GraphQLContext, NotificationModel, type ObjectId, OwnerTypeSchema, PartnerModel, PostModel, PushTokenModel, RelationModel, RelationTypeSchema, ResourceActivityModel, ResourceImageTypeSchema, type SchemaChatMessageReactionType, type SchemaChatMessageReplyPreviewType, type SchemaChatMessageSeenType, type SchemaChatMessageType, type SchemaChatReportType, type SchemaChatType, type SchemaCreateBulkNotificationInput, type SchemaEventInfoType, type SchemaEventType, type SchemaGameType, type SchemaGoogleImportedMarket, type SchemaNotificationType, type SchemaOwnerType, type SchemaParticipantType, type SchemaPartnerType, type SchemaPostType, type SchemaPushTokenType, type SchemaRelationType, type SchemaUnregisteredVendorInvitationType, type SchemaUnregisteredVendorType, type SchemaUserActivityEvent, type SchemaUserType, type SchemaVendorInfoType, type SchemaVendorType, SchoolModel, SocialMediaTypeSchema, StallTypeSchema, type SubscriptionPayload, UnregisteredVendorModel, UserModel, VendorInfoModel, VendorModel, VerificationTokenModel, type VerificationTokenType, associatesSchema, baseResourceFields, connectToDatabase, convertObjectIdsToStrings, dateTimeSchema, didRemoveAnyEventDates, findEventOrImportedMarketById, locationGeoSchema, locationsSchema, refundPolicySchema, relationDatesSchema, resourceRelationsSchema, saveNotificationsInDb, sendPushNotifications, termsAgreementSchema, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateVendorBasedOnUserLicense, userLicenseSchema };

package/dist/index.mjs

@@ -3361,6 +3361,7 @@ var EnumEventDateStatus = /* @__PURE__ */ ((EnumEventDateStatus22) => {
   EnumEventDateStatus22["ENDED"] = "Ended";
   EnumEventDateStatus22["RE_SCHEDULED"] = "Rescheduled";
   EnumEventDateStatus22["CANCELED"] = "Canceled";
+  EnumEventDateStatus22["INVALID"] = "Invalid";
   return EnumEventDateStatus22;
 })(EnumEventDateStatus || {});
 var EnumSubscriptionStatus = /* @__PURE__ */ ((EnumSubscriptionStatus22) => {
@@ -5144,8 +5145,8 @@ var EVENT = gql`
   ${RELATION_DATES_FRAGMENT}
 `;
 var GET_EVENTS = gql`
-  query getEvents {
-    events {
+  query getEvents($dateStatus: EnumEventDateStatus) {
+    events(dateStatus: $dateStatus) {
       ...EventListItemFields
     }
   }
@@ -5171,24 +5172,49 @@ var GET_EVENTS_BY_REGION = gql`
   query getEventsByRegion(
     $region: String!
     $options: ResourcesByRegionOptions
+    $dateStatus: EnumEventDateStatus
   ) {
-    eventsByRegion(region: $region, options: $options) {
+    eventsByRegion(
+      region: $region
+      options: $options
+      dateStatus: $dateStatus
+    ) {
       ...EventListItemFields
     }
   }
   ${EVENT_LIST_ITEM}
 `;
 var SEARCH_EVENTS = gql`
-  query searchEvents($region: String, $search: String, $tags: [String]) {
-    eventsSearch(region: $region, search: $search, tags: $tags) {
+  query searchEvents(
+    $region: String
+    $search: String
+    $tags: [String]
+    $dateStatus: EnumEventDateStatus
+  ) {
+    eventsSearch(
+      region: $region
+      search: $search
+      tags: $tags
+      dateStatus: $dateStatus
+    ) {
       ...EventListItemFields
     }
   }
   ${EVENT_LIST_ITEM}
 `;
 var GET_EVENTS_NEAR_ME = gql`
-  query getEventsNearMe($latitude: Float!, $longitude: Float!, $radius: Int) {
-    eventsNearMe(latitude: $latitude, longitude: $longitude, radius: $radius) {
+  query getEventsNearMe(
+    $latitude: Float!
+    $longitude: Float!
+    $radius: Int
+    $dateStatus: EnumEventDateStatus
+  ) {
+    eventsNearMe(
+      latitude: $latitude
+      longitude: $longitude
+      radius: $radius
+      dateStatus: $dateStatus
+    ) {
       ...EventListItemFields
     }
   }
@@ -7861,6 +7887,8 @@ var schema3 = new MongooseSchema7(
 schema3.index({ "location.geo": "2dsphere" });
 schema3.index({ name: 1 });
 schema3.index({ region: 1 });
+schema3.index({ deletedAt: 1 });
+schema3.index({ "dateTime.dateStatus": 1 });
 var GoogleImportedMarketModel = mongoose7.models.GoogleImportedMarket || mongoose7.model("GoogleImportedMarket", schema3);
 
 // src/mongoose/Notification.ts
@@ -7898,7 +7926,7 @@ schema4.index({ isRead: 1, userId: 1 });
 schema4.index({ createdAt: -1, userId: 1 });
 var NotificationModel = mongoose8.models.Notification || mongoose8.model("Notification", schema4);
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-6B75Q67V.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-4SNW63TJ.mjs
 var EnumOSPlatform2 = /* @__PURE__ */ ((EnumOSPlatform22) => {
   EnumOSPlatform22["ANDROID"] = "android";
   EnumOSPlatform22["IOS"] = "ios";
@@ -8407,6 +8435,8 @@ schema12.index({ region: 1 });
 schema12.index({ "location.geo": "2dsphere" });
 schema12.index({ tags: 1 });
 schema12.index({ "associates.email": 1 });
+schema12.index({ deletedAt: 1 });
+schema12.index({ "dateTime.dateStatus": 1 });
 var EventModel = mongoose16.models.Event || mongoose16.model("Event", schema12);
 
 // src/mongoose/Partner.ts
@@ -9087,32 +9117,21 @@ function convertObjectIdsToStrings(obj) {
   return obj;
 }
 
-// src/service/event.ts
+// src/service/event/updateAllEventDateTimeStatuses.ts
 import dayjs2 from "dayjs";
 import customParseFormat2 from "dayjs/plugin/customParseFormat";
 import isoWeek from "dayjs/plugin/isoWeek";
-import isToday from "dayjs/plugin/isToday";
-import isTomorrow from "dayjs/plugin/isTomorrow";
 dayjs2.extend(customParseFormat2);
-dayjs2.extend(isToday);
-dayjs2.extend(isTomorrow);
 dayjs2.extend(isoWeek);
-async function findEventOrImportedMarketById(resourceId) {
-  if (!resourceId) {
-    return null;
-  }
-  const normalizedId = convertObjectIdsToStrings(resourceId);
-  const [eventDoc, googleImportedDoc] = await Promise.all([
-    EventModel.findById(normalizedId).select("_id name").lean().exec(),
-    GoogleImportedMarketModel.findById(normalizedId).select("_id name").lean().exec()
-  ]);
-  return eventDoc ?? googleImportedDoc;
-}
 function getFutureEventStatus(startDateTime, now) {
-  if (startDateTime.isToday()) {
+  const hoursUntilStart = startDateTime.diff(now, "hour", true);
+  if (hoursUntilStart > 0 && hoursUntilStart <= 4) {
+    return EnumEventDateStatus.STARTING_SOON;
+  }
+  if (startDateTime.isSame(now, "day")) {
     return EnumEventDateStatus.TODAY;
   }
-  if (startDateTime.isTomorrow()) {
+  if (startDateTime.isSame(now.add(1, "day"), "day")) {
     return EnumEventDateStatus.TOMORROW;
   }
   if (startDateTime.isSame(now, "isoWeek")) {
@@ -9121,41 +9140,122 @@ function getFutureEventStatus(startDateTime, now) {
   if (startDateTime.isSame(now.add(1, "week"), "isoWeek")) {
     return EnumEventDateStatus.NEXT_WEEK;
   }
-  const hoursUntilStart = startDateTime.diff(now, "hour", true);
-  if (hoursUntilStart > 0 && hoursUntilStart <= 4) {
-    return EnumEventDateStatus.STARTING_SOON;
-  }
   return EnumEventDateStatus.UPCOMING;
 }
-function updateSingleDateTimeStatus(dateTime) {
-  const now = dayjs2();
+function updateSingleDateTimeStatus(dateTime, now = dayjs2()) {
+  const dateTimeFormat = `${dateFormat} ${timeFormat}`;
   const startDateTime = dayjs2(
     `${dateTime.startDate} ${dateTime.startTime}`,
-    `${dateFormat} ${timeFormat}`
+    dateTimeFormat,
+    true
   );
   const endDateTime = dayjs2(
     `${dateTime.endDate} ${dateTime.endTime}`,
-    `${dateFormat} ${timeFormat}`
+    dateTimeFormat,
+    true
   );
   if (!startDateTime.isValid() || !endDateTime.isValid()) {
     return {
       ...dateTime,
-      dateStatus: null
+      dateStatus: EnumEventDateStatus.INVALID
     };
   }
-  let dateStatus = null;
-  if (endDateTime.isBefore(now)) {
-    dateStatus = EnumEventDateStatus.ENDED;
-  } else if (startDateTime.isBefore(now) && endDateTime.isAfter(now)) {
-    dateStatus = EnumEventDateStatus.STARTED;
+  if (endDateTime.isBefore(startDateTime)) {
+    return {
+      ...dateTime,
+      dateStatus: EnumEventDateStatus.INVALID
+    };
+  }
+  let dateStatus;
+  if (endDateTime.isAfter(now)) {
+    if (startDateTime.isAfter(now)) {
+      dateStatus = getFutureEventStatus(startDateTime, now);
+    } else {
+      dateStatus = EnumEventDateStatus.STARTED;
+    }
   } else {
-    dateStatus = getFutureEventStatus(startDateTime, now);
+    dateStatus = EnumEventDateStatus.ENDED;
   }
   return {
     ...dateTime,
     dateStatus
   };
 }
+var dateTimeStatusFilter = {
+  dateTime: { $ne: [], $type: "array" },
+  deletedAt: null
+};
+var CURSOR_BATCH_SIZE = 50;
+function hasDateTimeStatusChanges(stored, updated) {
+  if (stored.length !== updated.length) {
+    return true;
+  }
+  return stored.some(
+    (slot, index) => slot.dateStatus !== updated[index].dateStatus
+  );
+}
+async function updateModelDateTimeStatuses(model, now) {
+  let updated = 0;
+  const cursor = model.find(dateTimeStatusFilter).select({ _id: 1, dateTime: 1 }).lean().cursor({ batchSize: CURSOR_BATCH_SIZE });
+  let bulkOps = [];
+  const flushBulkWrites = async () => {
+    if (!bulkOps.length) {
+      return;
+    }
+    await model.bulkWrite(bulkOps);
+    updated += bulkOps.length;
+    bulkOps = [];
+  };
+  try {
+    for await (const doc of cursor) {
+      const dateTime = doc.dateTime.map(
+        (slot) => updateSingleDateTimeStatus(slot, now)
+      );
+      if (!hasDateTimeStatusChanges(doc.dateTime, dateTime)) {
+        continue;
+      }
+      bulkOps.push({
+        updateOne: {
+          filter: { _id: doc._id },
+          update: { $set: { dateTime } }
+        }
+      });
+      if (bulkOps.length >= CURSOR_BATCH_SIZE) {
+        await flushBulkWrites();
+      }
+    }
+    await flushBulkWrites();
+  } finally {
+    await cursor.close().catch(() => void 0);
+  }
+  return updated;
+}
+async function updateAllEventDateTimeStatuses() {
+  const now = dayjs2();
+  const [eventCount, marketCount] = await Promise.all([
+    updateModelDateTimeStatuses(EventModel, now),
+    updateModelDateTimeStatuses(
+      GoogleImportedMarketModel,
+      now
+    )
+  ]);
+  console.log(
+    `\u2705 Event dateTime statuses updated: events=${eventCount} changed, google imported markets=${marketCount} changed`
+  );
+}
+
+// src/service/event/findEventOrImportedMarketById.ts
+async function findEventOrImportedMarketById(resourceId) {
+  if (!resourceId) {
+    return null;
+  }
+  const normalizedId = convertObjectIdsToStrings(resourceId);
+  const [eventDoc, googleImportedDoc] = await Promise.all([
+    EventModel.findById(normalizedId).select("_id name").lean().exec(),
+    GoogleImportedMarketModel.findById(normalizedId).select("_id name").lean().exec()
+  ]);
+  return eventDoc ?? googleImportedDoc;
+}
 
 // src/service/relations.ts
 function didRemoveAnyEventDates(previousDateTime, nextDateTime) {
@@ -9238,8 +9338,8 @@ export {
   sendPushNotifications,
   termsAgreementSchema,
   updateAdStatuses,
+  updateAllEventDateTimeStatuses,
   updateRelationDatesToUnavailable,
-  updateSingleDateTimeStatus,
   updateVendorBasedOnUserLicense,
   userLicenseSchema
 };