@dhyasama/totem-models 6.30.3 → 6.32.0

package/lib/Financials.js

@@ -83,8 +83,13 @@ module.exports = function(mongoose, config) {
         }]
       },
 
-      // Catch-all for customer specific key-value pairs from sheet that aren't supported by our schema
-      details: [{
+      metrics: [{
+        key: { type: String, trim: true },
+        value: { type: Number },
+        _id: false
+      }],
+
+      questions: [{
         key: { type: String, trim: true },
         value: { type: String, trim: true },
         _id: false
@@ -112,26 +117,26 @@ module.exports = function(mongoose, config) {
   // Statics operate on the entire collection
   //////////////////////////////////////////////////////
 
-  Financials.statics.getByOrg = function getByOrg(orgId, cb) {
+  Financials.statics.getByOrg = function getByOrg(customerId, orgId, cb) {
 
     var self = this;
 
     var query = self.find({
-      'organization': orgId,
-      'customer': config.CUSTOMER_ID
+      'customer': customerId,
+      'organization': orgId
     });
 
     query.exec(cb);
 
   };
 
-  Financials.statics.getByUUID = function getByUUID(uuid, cb) {
+  Financials.statics.getByUUID = function getByUUID(customerId, uuid, cb) {
 
     var self = this;
 
     var query = self.find({
-      'snapshots.uuid': uuid,
-      'customer': config.CUSTOMER_ID
+      'customer': customerId,
+      'snapshots.uuid': uuid
     });
 
     query.populate('organization', 'name logoUrl')

package/lib/Organization.js

@@ -210,6 +210,11 @@ module.exports = function(mongoose, config) {
           active: { type: Boolean, default: false }
         },
 
+        financials : {
+          questions: [{ type: String, trim: true }],
+          metrics: [{ type: String, trim: true }],
+        },
+
         deals: {
 
           active: { type: Boolean, default: false },

package/package.json

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

package/test/Financials.js

@@ -89,9 +89,7 @@ describe.skip('Financials', function() {
 
   it('gets financials for an org', function(done) {
 
-    config.CUSTOMER_ID = customerA;
-
-    Financials.getByOrg(orgA, function(err, result) {
+    Financials.getByOrg(customerA, orgA, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.length.should.equal(1);
@@ -103,9 +101,7 @@ describe.skip('Financials', function() {
 
   it('gets financials for the same org but different customer', function(done) {
 
-    config.CUSTOMER_ID = customerB;
-
-    Financials.getByOrg(orgA, function(err, result) {
+    Financials.getByOrg(customerA, orgA, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.length.should.equal(1);