@positivegrid/pg-mongoose-schema 26.2.0 → 26.4.0

package/models/hardware.js

@@ -26,7 +26,6 @@ module.exports = function (mongoose) {
     user_id: { type: ObjectId, ref: 'User', required: true },
     hw_sn_id: { type: ObjectId, ref: 'HardwareSeriesNumber', required: true },
     hw_meta_id: { type: ObjectId, ref: 'HardwareActivationMeta', default: null },
-    hw_promo_id: { type: ObjectId, ref: 'HardwarePromo', default: null },
     hw_partner_id: { type: ObjectId, ref: 'PartnerCoupon', default: null },
     activate_license: [{ type: ObjectId, ref: 'License' }],
     status: { type: Number, required: true, default: 1 }, // 1:activate 2:deactivate

package/models/partner.js

@@ -25,7 +25,7 @@ module.exports = function (mongoose) {
     redeem_keycode: { type: String, required: true },
     buyer: { type: Schema.Types.Mixed, default: null },
     order_number: { type: String, default: null },
-    status: { type: Number, required: true, default: 1 }, // 1: active
+    status: { type: Number, required: true, default: 1 }, // 1: active 2: refund
     metadata: { type: Schema.Types.Mixed, default: null },
     created_on: { type: Date, default: Date.now },
     updated_on: { type: Date, default: Date.now }

package/models/payment.js

@@ -604,6 +604,15 @@ module.exports = function (mongoose) {
         }
       })
     },
+    hasLicensePromise: async function (userID, productID) {
+      const hasProduct = await this.findOne({
+        user_id: userID,
+        product_id: productID,
+        status: 1,
+        '$or': [{ 'due_date': null }, { 'due_date': { $gt: new Date() } }]
+      }).exec()
+      return (hasProduct)
+    },
     getLicenseByRedeem: function (redeem, cb) {
       this.find({ from_redeem: redeem }).sort({ created_on: -1 }).exec(cb)
     },

package/models/preset.js

@@ -366,6 +366,11 @@ module.exports = function (mongoose) {
         text: {
           path: 'name',
           query: req.query.keyword,
+          fuzzy: {
+            maxEdits: 1,
+            prefixLength: 1,
+            maxExpansions: 30
+          },
           score: {
             boost: {
               value: 3
@@ -375,7 +380,12 @@ module.exports = function (mongoose) {
       }, {
         text: {
           path: ['description', 'category'],
-          query: req.query.keyword
+          query: req.query.keyword,
+          fuzzy: {
+            maxEdits: 2,
+            prefixLength: 0,
+            maxExpansions: 50
+          }
         }
       })
 

package/models/redeem.js

@@ -17,7 +17,7 @@ module.exports = function (mongoose) {
     created_on: { type: Date, default: Date.now },
     updated_on: { type: Date, default: Date.now }
   }, { collection: 'pg_redeem_code' })
-  RedeemCodeSchema.index({ code: 1 }, { unique: true })
+  RedeemCodeSchema.index({ code: 1, status: 1 }, { unique: true })
   RedeemCodeSchema.index({ code: 1, product_id: 1, status: 1 })
   RedeemCodeSchema.index({ code: 1, bundle_id: 1, status: 1 })
   RedeemCodeSchema.index({ tracker: 1 })

package/package.json

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