Upgrade lodash to v4 and lint more files (#8495)

* common: import lodash modules separately

* remove test/content from .eslintignore, fix with eslint --fix content/index

* lint test/content

* lint content/index except for lodash methods

* upgrade server/models

* upgrade server/middlewares and server/libs

* port server/controllers/top-level

* port server/controllers/api-v3

* port views and tests

* client old port lodash and _(, missing _.

* upgrade client-old

* port common/script (root level files only)

* port common/script/fns

* port common/libs

* port common/script/ops

* port common/script/content and common/script/libs/shops.js

* misc fixes

* misc fixes

* misc fixes

* more tests fixes

* fix payments test stubbing, down to 2 failing tests

* remove more instances of lodash wrapping

* fix bug where toObject does not clone object

* fix tests

* upgrade migration or add lodash 4 note

* update shrinkwrap

* fix linting

* upgrade eslint-config-habitrpg

* update shrinkwrap

* recompile shrinkwrap
This commit is contained in:
Matteo Pagliazzi
2017-03-01 17:10:48 +01:00
committed by GitHub
parent ef02e59590
commit 98c019a0b6
150 changed files with 4996 additions and 1533 deletions

View File

@@ -96,7 +96,7 @@ api.createSubscription = async function createSubscription (data) {
} else {
if (!plan.dateTerminated) plan.dateTerminated = today;
_(plan).merge({ // override with these values
Object.assign(plan, { // override plan with new values
planId: block.key,
customerId: data.customerId,
dateUpdated: today,
@@ -110,11 +110,12 @@ api.createSubscription = async function createSubscription (data) {
nextBillingDate: data.nextBillingDate,
additionalData: data.additionalData,
owner: data.user._id,
}).defaults({ // allow non-override if a plan was previously used
gemsBought: 0,
dateCreated: today,
mysteryItems: [],
}).value();
});
// allow non-override if a plan was previously used
if (!plan.gemsBought) plan.gemsBought = 0;
if (!plan.dateCreated) plan.dateCreated = today;
if (!plan.mysteryItems) plan.mysteryItems = [];
if (data.subscriptionId) {
plan.subscriptionId = data.subscriptionId;