@timardex/cluemart-server-shared 1.0.179 → 1.0.201

package/dist/index.d.mts

@@ -1,11 +1,10 @@
 import * as _timardex_cluemart_shared from '@timardex/cluemart-shared';
-import { AdType, CreateBulkNotificationInput, NotificationType, EnumUserRole, ChatMessageType, ParticipantType, ChatType, ReportChatUser, OwnerType, SocialMediaType, ResourceImageType, Category, UserLicenceType, AssociateType, ResourceContactDetailsType, TermsAgreement, RelationDate, DateTimeType, LocationGeoType, LocationType, PosterUsageType, GoogleImportedMarket, RelationType, ResourceActivityType, UserActivityEvent, UserType, VendorType, VendorInfoType, UnregisteredVendorInvitationType, UnregisteredVendorType, EventType, StallType, RefundPolicy, EventInfoType, PartnerType, PostType, PostContentType, AppSettingsType, GameType, GameDocType, SchoolType, EnumUserLicence, DateTimeWithPriceType } from '@timardex/cluemart-shared';
+import { AdType, CreateBulkNotificationInput, NotificationType, EnumUserRole, ChatMessageType, ParticipantType, ChatType, ReportChatUser, OwnerType, SocialMediaType, ResourceImageType, Category, UserLicenceType, AssociateType, ResourceContactDetailsType, TermsAgreement, RelationDate, DateTimeType, LocationGeoType, LocationType, PosterUsageType, GoogleImportedMarket, PushTokenType, RelationType, ResourceActivityType, UserActivityEvent, UserType, VendorType, VendorInfoType, UnregisteredVendorInvitationType, UnregisteredVendorType, EventType, StallType, RefundPolicy, EventInfoType, PartnerType, PostType, PostContentType, AppSettingsType, GameType, GameDocType, SchoolType, EnumUserLicence, EventListItemType, DateTimeWithPriceType } from '@timardex/cluemart-shared';
 import mongoose from 'mongoose';
 export { default as mongoose } from 'mongoose';
 import { NotificationCount, DateTimeType as DateTimeType$1 } from '@timardex/cluemart-shared/types';
 import express from 'express';
 export { default as express } from 'express';
-import { EnumOSPlatform } from '@timardex/cluemart-shared/enums';
 
 declare const AdModel: mongoose.Model<AdType, {}, {}, {}, mongoose.Document<unknown, {}, AdType, {}, {}> & AdType & Required<{
     _id: string;
@@ -62,13 +61,11 @@ interface GraphQLContext {
 type SchemaChatMessageReplyPreviewType = Omit<NonNullable<ChatMessageType["replyPreview"]>, "senderId"> & {
     senderId: ObjectId;
 };
-type SchemaChatMessageReactionType = Omit<NonNullable<ChatMessageType["likedBy"]>[number], "userId" | "createdAt"> & {
+type SchemaChatMessageReactionType = Omit<NonNullable<ChatMessageType["likedBy"]>[number], "userId"> & {
     userId: ObjectId;
-    createdAt: Date;
 };
-type SchemaChatMessageSeenType = Omit<NonNullable<ChatMessageType["seenBy"]>[number], "userId" | "seenAt"> & {
+type SchemaChatMessageSeenType = Omit<NonNullable<ChatMessageType["seenBy"]>[number], "userId"> & {
     userId: ObjectId;
-    seenAt: Date;
 };
 type SchemaChatMessageType = Omit<ChatMessageType, "senderId" | "replyToMessageId" | "replyPreview" | "likedBy" | "seenBy"> & {
     senderId: ObjectId;
@@ -411,14 +408,6 @@ declare const GoogleImportedMarketModel: mongoose.Model<SchemaGoogleImportedMark
     __v: number;
 }, any>;
 
-type PushTokenType = {
-    _id: string;
-    createdAt: Date;
-    platform: EnumOSPlatform;
-    token: string;
-    updatedAt: Date;
-    userId: string;
-};
 type SchemaPushTokenType = Omit<PushTokenType, "userId"> & {
     userId: ObjectId;
 };
@@ -722,10 +711,7 @@ declare function updateVendorBasedOnUserLicense(userId: ObjectId, licenceType: E
  */
 declare function convertObjectIdsToStrings(obj: any): any;
 
-type EventOrMarket = {
-    _id: ObjectId | string;
-    name: string;
-} | null;
+type EventOrMarket = Pick<EventListItemType, "_id" | "name"> | null;
 /**
  * This function attempts to find an Event or a Google Imported Market by the given resource ID.
  * It first normalizes the resource ID to a string format, then performs parallel queries to both collections.

package/dist/index.d.ts

@@ -1,11 +1,10 @@
 import * as _timardex_cluemart_shared from '@timardex/cluemart-shared';
-import { AdType, CreateBulkNotificationInput, NotificationType, EnumUserRole, ChatMessageType, ParticipantType, ChatType, ReportChatUser, OwnerType, SocialMediaType, ResourceImageType, Category, UserLicenceType, AssociateType, ResourceContactDetailsType, TermsAgreement, RelationDate, DateTimeType, LocationGeoType, LocationType, PosterUsageType, GoogleImportedMarket, RelationType, ResourceActivityType, UserActivityEvent, UserType, VendorType, VendorInfoType, UnregisteredVendorInvitationType, UnregisteredVendorType, EventType, StallType, RefundPolicy, EventInfoType, PartnerType, PostType, PostContentType, AppSettingsType, GameType, GameDocType, SchoolType, EnumUserLicence, DateTimeWithPriceType } from '@timardex/cluemart-shared';
+import { AdType, CreateBulkNotificationInput, NotificationType, EnumUserRole, ChatMessageType, ParticipantType, ChatType, ReportChatUser, OwnerType, SocialMediaType, ResourceImageType, Category, UserLicenceType, AssociateType, ResourceContactDetailsType, TermsAgreement, RelationDate, DateTimeType, LocationGeoType, LocationType, PosterUsageType, GoogleImportedMarket, PushTokenType, RelationType, ResourceActivityType, UserActivityEvent, UserType, VendorType, VendorInfoType, UnregisteredVendorInvitationType, UnregisteredVendorType, EventType, StallType, RefundPolicy, EventInfoType, PartnerType, PostType, PostContentType, AppSettingsType, GameType, GameDocType, SchoolType, EnumUserLicence, EventListItemType, DateTimeWithPriceType } from '@timardex/cluemart-shared';
 import mongoose from 'mongoose';
 export { default as mongoose } from 'mongoose';
 import { NotificationCount, DateTimeType as DateTimeType$1 } from '@timardex/cluemart-shared/types';
 import express from 'express';
 export { default as express } from 'express';
-import { EnumOSPlatform } from '@timardex/cluemart-shared/enums';
 
 declare const AdModel: mongoose.Model<AdType, {}, {}, {}, mongoose.Document<unknown, {}, AdType, {}, {}> & AdType & Required<{
     _id: string;
@@ -62,13 +61,11 @@ interface GraphQLContext {
 type SchemaChatMessageReplyPreviewType = Omit<NonNullable<ChatMessageType["replyPreview"]>, "senderId"> & {
     senderId: ObjectId;
 };
-type SchemaChatMessageReactionType = Omit<NonNullable<ChatMessageType["likedBy"]>[number], "userId" | "createdAt"> & {
+type SchemaChatMessageReactionType = Omit<NonNullable<ChatMessageType["likedBy"]>[number], "userId"> & {
     userId: ObjectId;
-    createdAt: Date;
 };
-type SchemaChatMessageSeenType = Omit<NonNullable<ChatMessageType["seenBy"]>[number], "userId" | "seenAt"> & {
+type SchemaChatMessageSeenType = Omit<NonNullable<ChatMessageType["seenBy"]>[number], "userId"> & {
     userId: ObjectId;
-    seenAt: Date;
 };
 type SchemaChatMessageType = Omit<ChatMessageType, "senderId" | "replyToMessageId" | "replyPreview" | "likedBy" | "seenBy"> & {
     senderId: ObjectId;
@@ -411,14 +408,6 @@ declare const GoogleImportedMarketModel: mongoose.Model<SchemaGoogleImportedMark
     __v: number;
 }, any>;
 
-type PushTokenType = {
-    _id: string;
-    createdAt: Date;
-    platform: EnumOSPlatform;
-    token: string;
-    updatedAt: Date;
-    userId: string;
-};
 type SchemaPushTokenType = Omit<PushTokenType, "userId"> & {
     userId: ObjectId;
 };
@@ -722,10 +711,7 @@ declare function updateVendorBasedOnUserLicense(userId: ObjectId, licenceType: E
  */
 declare function convertObjectIdsToStrings(obj: any): any;
 
-type EventOrMarket = {
-    _id: ObjectId | string;
-    name: string;
-} | null;
+type EventOrMarket = Pick<EventListItemType, "_id" | "name"> | null;
 /**
  * This function attempts to find an Event or a Google Imported Market by the given resource ID.
  * It first normalizes the resource ID to a string format, then performs parallel queries to both collections.

package/dist/index.mjs

@@ -7281,7 +7281,12 @@ var gameScreenIdentifierList = [
     match: "/events/events-near-me"
   },
   {
-    clue: "A collection of things worth attending.",
+    clue: "Where events appear as pins on a map.",
+    id: "events-map",
+    match: "/events/events-map"
+  },
+  {
+    clue: "A collection of events worth attending.",
     id: "events",
     match: "/events"
   },
@@ -7374,6 +7379,7 @@ function normalizeUrl(url) {
   }
   return url;
 }
+var CLUEMART_MAIN_DOMAIN_URL = "https://cluemart.co.nz";
 var SCHOOL_MIN_STUDENT_COUNT = 300;
 var packagingTypes = [
   "Biodegradable",
@@ -8779,7 +8785,6 @@ var USER_FIELDS_FRAGMENT = gql`
     platform
     preferredRegion
     promoCodes
-    refreshToken
     role
     school
     termsAgreement {
@@ -9029,7 +9034,10 @@ var GET_EVENT_BY_PLACE_ID = gql`
   ${EVENT_LIST_ITEM}
 `;
 var GET_EVENTS_BY_REGION = gql`
-  query getEventsByRegion($region: String!, $options: EventsByRegionOptions) {
+  query getEventsByRegion(
+    $region: String!
+    $options: ResourcesByRegionOptions
+  ) {
     eventsByRegion(region: $region, options: $options) {
       ...EventListItemFields
     }
@@ -9037,7 +9045,7 @@ var GET_EVENTS_BY_REGION = gql`
   ${EVENT_LIST_ITEM}
 `;
 var SEARCH_EVENTS = gql`
-  query searchEvents($region: String, $search: String,$tags: [String]) {
+  query searchEvents($region: String, $search: String, $tags: [String]) {
     eventsSearch(region: $region, search: $search, tags: $tags) {
       ...EventListItemFields
     }
@@ -9261,8 +9269,11 @@ var GET_VENDOR = gql`
   ${VENDOR}
 `;
 var GET_VENDORS_BY_REGION = gql`
-  query getVendorsByRegion($region: String!) {
-    vendorsByRegion(region: $region) {
+  query getVendorsByRegion(
+    $region: String!
+    $options: ResourcesByRegionOptions
+  ) {
+    vendorsByRegion(region: $region, options: $options) {
       ...VendorFields
     }
   }
@@ -9658,8 +9669,11 @@ var GET_PARTNER = gql`
   ${PARTNER}
 `;
 var GET_PARTNERS_BY_REGION = gql`
-  query getPartnersByRegion($region: String!) {
-    partnersByRegion(region: $region) {
+  query getPartnersByRegion(
+    $region: String!
+    $options: ResourcesByRegionOptions
+  ) {
+    partnersByRegion(region: $region, options: $options) {
       ...PartnerFields
     }
   }
@@ -9862,7 +9876,6 @@ var RELATION_FIELDS_FRAGMENT = gql`
   fragment RelationFields on RelationType {
     _id
     active
-    apiMessage
     chatId
     createdAt
     lastUpdateBy
@@ -10878,7 +10891,7 @@ var emailOptionalSchema = create$6().nullable().notRequired().transform(
   (value) => !value || create$6().email().isValidSync(value)
 ).label("Email");
 var mobileRegex = /^02\d{7,9}$/;
-var landlineRegex = /^(0(3|4|6|7|9)[0-9]{7})$/;
+var landlineRegex = /^0[34679]\d{7}$/;
 var mobilePhoneSchema = create$6().label("Mobile Phone").nullable().notRequired().test(
   "mobile-phone",
   "Mobile must start with 02 and be 9\u201311 digits",
@@ -11263,12 +11276,12 @@ var validateVerificationTokenSchema = create$3().shape({
   email: emailRequiredSchema,
   verificationToken: create$6().required("Verification code is required").matches(/^\d{6}$/, "Verification code must be exactly 6 digits")
 });
-var EnumAdShowOn = /* @__PURE__ */ ((EnumAdShowOn3) => {
-  EnumAdShowOn3["EVENTS_PAGE"] = "Events_page";
-  EnumAdShowOn3["FRONT_PAGE"] = "Front_page";
-  EnumAdShowOn3["PARTNERS_PAGE"] = "Partners_page";
-  EnumAdShowOn3["VENDORS_PAGE"] = "Vendors_page";
-  return EnumAdShowOn3;
+var EnumAdShowOn = /* @__PURE__ */ ((EnumAdShowOn2) => {
+  EnumAdShowOn2["EVENTS_PAGE"] = "Events_page";
+  EnumAdShowOn2["FRONT_PAGE"] = "Front_page";
+  EnumAdShowOn2["PARTNERS_PAGE"] = "Partners_page";
+  EnumAdShowOn2["VENDORS_PAGE"] = "Vendors_page";
+  return EnumAdShowOn2;
 })(EnumAdShowOn || {});
 var EnumAdStatus = /* @__PURE__ */ ((EnumAdStatus2) => {
   EnumAdStatus2["ACTIVE"] = "Active";
@@ -11287,15 +11300,15 @@ var EnumAdStyle = /* @__PURE__ */ ((EnumAdStyle2) => {
   return EnumAdStyle2;
 })(EnumAdStyle || {});
 var adResourceSchema = create$3({
-  adDescription: create$6().nullable().trim().required("Ad description is required").max(150, "Ad description must be at most 150 characters"),
-  adImage: create$6().nullable().required("Ad image is required"),
-  adStyle: create$8().nullable().oneOf(Object.values(EnumAdStyle), "Please select a valid ad style").required("Ad style is required"),
-  adTitle: create$6().nullable().trim().required("Ad title is required").max(30, "Ad title must be at most 30 characters"),
-  adType: create$8().nullable().oneOf(Object.values(EnumAdType), "Please select a valid ad type").required("Ad type is required"),
-  resourceId: create$6().nullable().required("Resource ID is required"),
-  resourceName: create$6().nullable().required("Resource name is required"),
-  resourceRegion: create$6().nullable().required("Resource region is required"),
-  resourceType: create$8().nullable().oneOf(Object.values(EnumResourceType), "Please select Event or Vendor").required("Resource type is required")
+  adDescription: create$6().trim().required("Ad description is required").max(150, "Ad description must be at most 150 characters"),
+  adImage: create$6().required("Ad image is required"),
+  adStyle: create$8().oneOf(Object.values(EnumAdStyle), "Please select a valid ad style").required("Ad style is required"),
+  adTitle: create$6().trim().required("Ad title is required").max(30, "Ad title must be at most 30 characters"),
+  adType: create$8().oneOf(Object.values(EnumAdType), "Please select a valid ad type").required("Ad type is required"),
+  resourceId: create$6().required("Resource ID is required"),
+  resourceName: create$6().required("Resource name is required"),
+  resourceRegion: create$6().required("Resource region is required"),
+  resourceType: create$8().oneOf(Object.values(EnumResourceType), "Please select Event or Vendor").required("Resource type is required")
 });
 var adSchema = create$3().shape({
   active: create$7().required("Active status is required"),
@@ -11325,7 +11338,8 @@ var adSchema = create$3().shape({
       if (!value) return false;
       return value > /* @__PURE__ */ new Date();
     }),
-    otherwise: () => create$4().nullable().notRequired()
+    // Keep `start` optional (not null) when ACTIVE to match TS type `start?: Date`.
+    otherwise: () => create$4().notRequired()
   }),
   targetRegion: create$2().of(create$6().required()).min(1, "At least one target region is required").required("Target region is required")
 });
@@ -11453,6 +11467,31 @@ var contactUsSchema = create$3().shape({
   lastName: create$6().label("Last Name").required("Last name is required"),
   message: create$6().label("Message").required("Message is required")
 });
+var defaultValues8 = {
+  active: true,
+  // Use a future default so yup "future date" rules pass on first submit.
+  end: new Date(Date.now() + 7 * 24 * 60 * 60 * 1e3),
+  resource: {
+    adDescription: "",
+    adImage: "",
+    adStyle: "Bloom",
+    adTitle: "",
+    adType: "Sponsored",
+    resourceId: "",
+    resourceName: "",
+    resourceRegion: "",
+    resourceType: "event"
+    /* EVENT */
+  },
+  showOn: [
+    "Front_page"
+    /* FRONT_PAGE */
+  ],
+  // `start` is only required (and must be future) when status !== ACTIVE.
+  start: void 0,
+  status: "Active",
+  targetRegion: []
+};
 var schoolSchema = create$3().shape({
   active: create$7().required("Active is required"),
   contactDetails: contactDetailsSchema,
@@ -11514,8 +11553,9 @@ var badgeFiles = Object.fromEntries(
 var logoIds = [
   "googleMaps-logo-dark",
   "googleMaps-logo-light",
-  "logo",
-  "logo-atr"
+  "logo-atr",
+  "logo-dark",
+  "logo"
 ];
 var logoFiles = Object.fromEntries(
   logoIds.map((id) => [id, `${id}${IMAGE_EXTENSION}`])
@@ -11523,6 +11563,7 @@ var logoFiles = Object.fromEntries(
 var otherImagesIds = [
   "banner-horizontal",
   "banner-vertical",
+  "gazebo-top",
   "qr-code",
   "store-android",
   "store-ios"
@@ -11550,7 +11591,7 @@ var otherImages = Object.fromEntries(
 );
 var RELATION_SHARE_INVITATION = "invitation";
 var RELATION_SHARE_APPLICATION = "application";
-var SHARE_SITE_URL = "https://cluemart.co.nz";
+var SHARE_SITE_URL = CLUEMART_MAIN_DOMAIN_URL;
 var SHARE_CALENDAR_ICON = "\u{1F4C5}";
 var SHARE_MARKET_DATES_SECTION_HEADING = `${SHARE_CALENDAR_ICON} Market dates:`;
 var SHARE_CHECKMARK_ICON = "\u2705";
@@ -11890,6 +11931,7 @@ var refundPolicySchema = new MongooseSchema4(
 );
 var schema2 = new MongooseSchema4(
   {
+    active: { default: true, type: Boolean },
     applicationDeadlineHours: { required: true, type: Number },
     dateTime: { required: true, type: [dateTimeSchema2] },
     eventId: {
@@ -12331,7 +12373,11 @@ var schema5 = new MongooseSchema9(
       type: String
     },
     token: { required: true, type: String },
-    userId: { required: true, type: mongoose9.Schema.Types.ObjectId }
+    userId: {
+      ref: "User",
+      required: true,
+      type: mongoose9.Schema.Types.ObjectId
+    }
   },
   { timestamps: true }
 );
@@ -12674,6 +12720,7 @@ var AttributesSchema = new MongooseSchema14(
 );
 var schema10 = new MongooseSchema14(
   {
+    active: { default: true, type: Boolean },
     compliance: {
       foodBeverageLicense: { default: false, required: false, type: Boolean },
       liabilityInsurance: { default: false, required: false, type: Boolean }
@@ -13405,12 +13452,12 @@ async function removeAssociateFromResource({
 // src/service/vendor.ts
 async function updateVendorBasedOnUserLicense(userId, licenceType) {
   try {
-    const user = await UserModel.findById(userId).select("vendor").lean();
+    const user = await UserModel.findById(userId).select("vendor").lean().exec();
     if (!user?.vendor) {
       console.warn(`[updateVendor] No vendor found for userId=${userId}`);
       return;
     }
-    const vendor = await VendorModel.findById(user.vendor).lean();
+    const vendor = await VendorModel.findById(user.vendor).lean().exec();
     if (!vendor) {
       console.warn(`[updateVendor] Vendor not found for id=${user.vendor}`);
       return;