@positivegrid/pg-mongoose-schema 27.6.1 → 27.7.0

package/models/payment.js

@@ -82,7 +82,7 @@ module.exports = (mongoose) => {
   }, { collection: 'jamup_product', toJSON: { virtuals: true }, toObject: { virtuals: true } })
   ProductSchema.index({ sku: 1 }, { unique: true })
 
-  let LicenseSchema = new Schema({
+  const LicenseSchema = new Schema({
     user_id: { type: ObjectId, ref: 'User', required: true },
     product_id: { type: ObjectId, ref: 'Product', required: true },
     bc_order_id: { type: Number, default: null },
@@ -106,10 +106,40 @@ module.exports = (mongoose) => {
     status: { type: Number, default: 1 }, // 1:normal/2:delete/3:refund/4:trial
     created_on: { type: Date, default: Date.now },
     updated_on: { type: Date, default: Date.now }
-  }, { collection: 'jamup_license', toJSON: { virtuals: true }, toObject: { virtuals: true } })
+  }, { collection: 'jamup_license' })
   LicenseSchema.index({ iap_device_id: 1, user_id: 1, product_id: 1, status: 1 })
   LicenseSchema.index({ user_id: 1, product_id: 1, status: 1, iap_source: 1 })
   LicenseSchema.index({ from_redeem: 1, user_id: 1 })
+  LicenseSchema.set('toJSON', {
+    virtuals: true,
+    transform(_doc, ret) {
+      if (ret.from_free_trial && ret.from_free_trial !== null) {
+        ret.free_trial_meta = {
+          is_free_trial: true,
+          start_date: ret.created_on,
+          end_date: ret.due_date,
+        }
+      } else {
+        ret.free_trial_meta = null;
+      }
+      return ret
+    }
+  })
+  LicenseSchema.set('toObject', {
+    virtuals: true,
+    transform(_doc, ret) {
+      if (ret.from_free_trial && ret.from_free_trial !== null) {
+        ret.free_trial_meta = {
+          is_free_trial: true,
+          start_date: ret.created_on,
+          end_date: ret.due_date,
+        }
+      } else {
+        ret.free_trial_meta = null;
+      }
+      return ret;
+    }
+  })
 
   const LicenseUpgradeMetaSchema = new Schema({
     bc_cart_id: { type: String, required: true },
@@ -725,11 +755,16 @@ module.exports = (mongoose) => {
           ? 'id name sku product_type display_name extra_payment_fields created_on'
           : 'id name sku product_type display_name addition created_on'
 
+        const freeTrialQuery = (productType === 'free_trial')
+          ? { $and: [{ from_free_trial: { $ne: null } }, { from_free_trial: { $exists: true } }] }
+          : { $or: [{ from_free_trial: null }, { from_free_trial: { $exists: false } }] }
+
         // Always check license status & due_date
         const queryObj = _.assign({}, {
           status: { '$in': [1, 4] },
           '$or': [{ 'due_date': null }, { 'due_date': { $gt: new Date() } }]
-        }, query)
+        }, freeTrialQuery, query)
+        debug('getUserPurchasePromise %o', queryObj)
 
         const result = (_.has(opts, 'isLean') && opts.isLean === true)
           ? await this.find(queryObj)

package/package.json

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