@positivegrid/pg-mongoose-schema 27.1.3 → 27.2.2-beta.0

package/models/preset.js

@@ -213,7 +213,7 @@ module.exports = function (mongoose) {
     name: { type: String, index: true, required: true },
     creator_id: { type: ObjectId, ref: 'User', required: true },
     preset_for: { type: String, required: true },
-    status: { type: Number, default: 0, required: true }, // 0:alive, 1:delete, 2: offline, 3: special(limited)
+    status: { type: Number, default: 0, required: true }, // 0:alive, 1:delete, 2: offline, 3: special(limited), 4: processing (Spark: PVN)
     description: { type: String },
     tags: { type: [{ type: String }], default: () => null },
     is_featured: { type: Boolean, default: false },

package/models/promotion.js

@@ -42,6 +42,8 @@ module.exports = function (mongoose) {
     content: { type: String, required: true },
     country: [{ type: String }],
     image: { type: String, default: null },
+    image_type: { type: String },
+    message_type: { type: String },
     action_button: [{
       type: { type: String, required: true },
       text: { type: String, required: true },
@@ -58,6 +60,8 @@ module.exports = function (mongoose) {
     // This field use to filter by target audience device
     // e.g, desktop/ios/hardware
     target_audience_device: [{ type: String, required: true }],
+    device_os: { type: String },
+    device_list: [{ type: String }],
     // If accouncement would be filtered by specific license users
     // which would be the query condition to filter
     // e.g., demo/lite/std/pro/elite
@@ -91,7 +95,14 @@ module.exports = function (mongoose) {
 
         if (!_.isUndefined(params)) {
           debug('getAvailableAnnouncement:querystring %o', params)
-          const { pname, locale, ta_device, country } = params
+          const {
+            pname,
+            locale,
+            ta_device,
+            country,
+            device_list,
+            device_os
+          } = params
           if (!_.isUndefined(pname) && _.isString(pname)) {
             defaultQuery['$and'].push({
               announce_for: { '$in': _.concat([pname], 'all') }
@@ -126,6 +137,23 @@ module.exports = function (mongoose) {
               }]
             })
           }
+
+          if (!_.isUndefined(device_list) && _.isString(device_list)) {
+            const deviceList = device_list.split(',')
+            defaultQuery['$and'].push({
+              'device_list': { $in: deviceList }
+            })
+          }
+
+          if (!_.isUndefined(device_os) && _.isString(device_os)) {
+            defaultQuery['$and'].push({
+              '$or': [{
+                'device_os': 'all'
+              }, {
+                'device_os': device_os
+              }]
+            })
+          }
         }
 
         let ret

package/package.json

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