@dhyasama/totem-models 12.16.1 → 12.17.2

package/lib/Financials.js

@@ -826,6 +826,12 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       var now = new Date();
 
+      // Lean + projection re-applied here despite e513aab's broad lean removal.
+      // Eligibility is filtered at the mongo level on stored snapshot.status, and
+      // no caller reads pre('init') updateStatus output from this result:
+      // scheduleCompanyEmails re-fetches via findOne, summarizeFinancialsToSend
+      // reads only ObjectIds + snapshot.period/year. Hydrating the full doc
+      // (notably notifications.*.email bodies) was driving lambda OOMs.
       var query = this.find({
         'snapshots': {
           $elemMatch: {
@@ -835,7 +841,17 @@ module.exports = function(mongoose, config) {
             'status': { $nin: ['Pending', 'Completed', 'Archived'] }
           }
         }
-      });
+      }).select({
+        customer: 1,
+        organization: 1,
+        'snapshots._id': 1,
+        'snapshots.uuid': 1,
+        'snapshots.year': 1,
+        'snapshots.period': 1,
+        'snapshots.notifications.company.initial.sendTo': 1,
+        'snapshots.notifications.company.initial.sendOn': 1,
+        'snapshots.notifications.company.initial.sentOn': 1,
+      }).lean();
 
       const result = await query;
       var results = [];
@@ -881,6 +897,7 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       var now = new Date();
 
+      // see lean+projection note on getCompanyInitialToSend
       var query = this.find({
         'snapshots': {
           $elemMatch: {
@@ -890,7 +907,17 @@ module.exports = function(mongoose, config) {
             'status': { $nin: ['Pending', 'Completed', 'Archived'] }
           }
         }
-      });
+      }).select({
+        customer: 1,
+        organization: 1,
+        'snapshots._id': 1,
+        'snapshots.uuid': 1,
+        'snapshots.year': 1,
+        'snapshots.period': 1,
+        'snapshots.notifications.company.reminders.sendTo': 1,
+        'snapshots.notifications.company.reminders.sendOn': 1,
+        'snapshots.notifications.company.reminders.sentOn': 1,
+      }).lean();
 
       const result = await query;
       var results = [];
@@ -940,6 +967,7 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       var now = new Date();
 
+      // see lean+projection note on getCompanyInitialToSend
       var query = this.find({
         'snapshots': {
           $elemMatch: {
@@ -949,7 +977,17 @@ module.exports = function(mongoose, config) {
             'status': { $nin: ['Pending', 'Completed', 'Archived'] }
           }
         }
-      });
+      }).select({
+        customer: 1,
+        organization: 1,
+        'snapshots._id': 1,
+        'snapshots.uuid': 1,
+        'snapshots.year': 1,
+        'snapshots.period': 1,
+        'snapshots.notifications.company.rejections.sendTo': 1,
+        'snapshots.notifications.company.rejections.sendOn': 1,
+        'snapshots.notifications.company.rejections.sentOn': 1,
+      }).lean();
 
       const result = await query;
       var results = [];

package/lib/Rate.js

@@ -52,17 +52,28 @@ module.exports = function(mongoose, config) {
   Rate.statics.upsert = function (rate, cb) {
 
     const run = async () => {
-      if (typeof rate.save === 'function') {
-        return await rate.save();
+      if (!rate) { throw new Error('rate is required'); }
+
+      const data = typeof rate.toObject === 'function' ? rate.toObject() : rate;
+      if (!data.date || !data.currency) {
+        throw new Error('rate.date and rate.currency are required');
       }
-      const { _id, ...update } = rate;
-      return await this.findByIdAndUpdate(_id, update, { new: true });
+
+      const { _id, ...update } = data;
+      return await this.findOneAndUpdate(
+        { date: data.date, currency: data.currency },
+        { $set: update },
+        { upsert: true, new: true, setDefaultsOnInsert: true }
+      ).lean({ virtuals: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result), err => cb(err)); return; }
     else { return run(); }
 
   };
+
+  Rate.index({ currency: 1, date: 1 }, { unique: true });
+
   Rate.set('autoIndex', false);
   Rate.on('index', function(err) { console.log('error building rate indexes: ' + err); });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "12.16.1",
+  "version": "12.17.2",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",