@positivegrid/pg-mongoose-schema 27.3.3 → 27.4.0

package/models/promotion.js

@@ -143,22 +143,28 @@ module.exports = function (mongoose) {
               const tmpDeviceList = device_list.split(',')
               let deviceList = []
               const allTypeSet = new Set()
+              const uniqueProductLineSet = new Set()
               tmpDeviceList.forEach(deviceItem => {
                 const optionItem = deviceItem.split('_')
+                uniqueProductLineSet.add(optionItem[0])
                 if (optionItem.length === 2 && optionItem[1] === 'all') {
                   allTypeSet.add(optionItem[0])
                 } else {
                   deviceList.push(deviceItem)
                 }
               })
-              let allTypeRegex = []
               if (allTypeSet.size > 0) {
                 allTypeSet.forEach(item => {
-                  allTypeRegex.push(new RegExp(`^${item}_`))
+                  deviceList.push(new RegExp(`^${item}_`))
+                })
+              }
+              if (uniqueProductLineSet.size > 0) {
+                uniqueProductLineSet.forEach(item => {
+                  deviceList.push(`${item}_all`)
                 })
               }
               defaultQuery['$and'].push({
-                'device_list': { $in: deviceList.concat(allTypeRegex) }
+                'device_list': { $in: deviceList }
               })
             } else {
               defaultQuery['$and'].push({
@@ -505,6 +511,28 @@ module.exports = function (mongoose) {
   GearTrialRecordSchema.index({ gear_trial_id: 1, user_id: 1 })
   GearTrialRecordSchema.index({ user_id: 1, expire_on: 1 })
 
+  const YotpoLoyaltySchema = new Schema({
+    user_id: { type: ObjectId, ref: 'auth_user', required: true },
+    main_region: { type: String, required: true },
+    active_regions: [{
+      code: { type: String, required: true },
+      points_balance: { type: Number, default: 0, required: true },
+      points_earned: { type: Number, default: 0, required: true },
+    }],
+    created_on: { type: Date, default: Date.now, required: true },
+    updated_on: { type: Date, default: Date.now, required: true }
+  }, { collection: 'auth_yotpo_loyalty' })
+  YotpoLoyaltySchema.index({ user_id: 1 }, { unique: true })
+  YotpoLoyaltySchema.index({ user_id: 1, main_region: 1, 'active_regions.code': 1 })
+
+  const YotpoLoyaltyBackupSchema = new Schema({
+    email: { type: String, required: true },
+    store_code: { type: String, required: true },
+    status: { type: Number, default: 1, required: true }, // 1:wait for apply/2:applied/3:deleted
+    created_on: { type: Date, default: Date.now, required: true },
+  })
+  YotpoLoyaltyBackupSchema.index({ email: 1, store_code: 1 }, { unique: true })
+
   mongoose.model('LicenseCampaignMeta', LicenseCampaignMetaSchema)
   mongoose.model('LicenseCampaignRecord', LicenseCampaignRecordSchema)
   mongoose.model('PublicAnnouncement', PublicAnnouncementSchema)
@@ -522,4 +550,6 @@ module.exports = function (mongoose) {
 	mongoose.model('TierSalesRules', TierSalesRulesSchema)
   mongoose.model('GearTrialMeta', GearTrialMetaSchema)
   mongoose.model('GearTrialRecord', GearTrialRecordSchema)
+  mongoose.model('YotpoLoyalty', YotpoLoyaltySchema)
+  mongoose.model('YotpoLoyaltyBackup', YotpoLoyaltyBackupSchema)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@positivegrid/pg-mongoose-schema",
-  "version": "27.3.3",
+  "version": "27.4.0",
   "description": "Positive Grid mongoose schema",
   "author": "Ferrari Lee <shiyung@positivegrid.com>",
   "homepage": "https://git.positivegrid.com:8443/backend/pg-mongoose-schema",