Bulk purchasing (#9196)

* Moved buy tests * Added mystery buy to buy.js * Added quest purchasing to buy * Added buy special * Moved integration tests to buy folder * Removed buyGear dependency * Removed buyArmoire dependency * Removed buyHealthPotion dependency * Removed myster, quest and special dependency * Replaced functions with factory * Added bulk purchasing to common * Added bulk purchasing to the api * Added bulk purchasing to client * Refactored purchasing function to reduce long method * Added bulk purchase to gem purchases * Added bulk purchasing to api * Added bulk purchasing to gem items on client * Removed bulk from equipment * Removed recentlyPurchased * Fixed style issues and prevented puchasing more gems than are left * Fixed lint * Fixed missing keys * Fixed gem amount notice * Added quest modal to pinned item * Added bulk purchase to gem modal * Fixed styles * Fixed bulk purchase for spells * Fixed modal size * Hid autofill
2017-10-23 16:05:35 -05:00
parent b74cee3d21
commit 7fe2504906
32 changed files with 578 additions and 265 deletions
@@ -6,18 +6,45 @@ import {
 import buyHealthPotion from './buyHealthPotion';
 import buyArmoire from './buyArmoire';
 import buyGear from './buyGear';
+import buyMysterySet from './buyMysterySet';
+import buyQuest from './buyQuest';
+import buySpecialSpell from './buySpecialSpell';
+
+// @TODO: remove the req option style. Dependency on express structure is an anti-pattern
+// We should either have more parms or a set structure validated by a Type checker
+
+// @TODO: when we are sure buy is the only function used, let's move the buy files to a folder

 module.exports = function buy (user, req = {}, analytics) {
  let key = get(req, 'params.key');
  if (!key) throw new BadRequest(i18n.t('missingKeyParam', req.language));

+  // @TODO: Slowly remove the need for key and use type instead
+  // This should evenutally be the 'factory' function with vendor classes
+  let type = get(req, 'type');
+  if (!type) type = key;
+
+  // @TODO: For now, builk purchasing is here, but we should probably have a parent vendor
+  // class that calls the factory and handles larger operations. If there is more than just bulk
+  let quantity = 1;
+  if (req.quantity) quantity = req.quantity;
+
  let buyRes;
-  if (key === 'potion') {
-    buyRes = buyHealthPotion(user, req, analytics);
-  } else if (key === 'armoire') {
-    buyRes = buyArmoire(user, req, analytics);
-  } else {
-    buyRes = buyGear(user, req, analytics);
+
+  for (let i = 0; i < quantity; i += 1) {
+    if (type === 'potion') {
+      buyRes = buyHealthPotion(user, req, analytics);
+    } else if (type === 'armoire') {
+      buyRes = buyArmoire(user, req, analytics);
+    } else if (type === 'mystery') {
+      buyRes = buyMysterySet(user, req, analytics);
+    } else if (type === 'quest') {
+      buyRes = buyQuest(user, req, analytics);
+    } else if (type === 'special') {
+      buyRes = buySpecialSpell(user, req, analytics);
+    } else {
+      buyRes = buyGear(user, req, analytics);
+    }
  }

  return buyRes;
@@ -14,68 +14,52 @@ import {
 import { removeItemByPath } from './pinnedGearUtils';
 import getItemInfo from '../libs/getItemInfo';

-module.exports = function purchase (user, req = {}, analytics) {
-  let type = get(req.params, 'type');
-  let key = get(req.params, 'key');
+function buyGems (user, analytics, req, key) {
+  let convRate = planGemLimits.convRate;
+  let convCap = planGemLimits.convCap;
+  convCap += user.purchased.plan.consecutive.gemCapExtra;
+
+  // Some groups limit their members ability to obtain gems
+  // The check is async so it's done on the server (in server/controllers/api-v3/user#purchase)
+  // only and not on the client,
+  // resulting in a purchase that will seem successful until the request hit the server.
+  if (!user.purchased || !user.purchased.plan || !user.purchased.plan.customerId) {
+    throw new NotAuthorized(i18n.t('mustSubscribeToPurchaseGems', req.language));
+  }
+
+  if (user.stats.gp < convRate) {
+    throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language));
+  }
+
+  if (user.purchased.plan.gemsBought >= convCap) {
+    throw new NotAuthorized(i18n.t('reachedGoldToGemCap', {convCap}, req.language));
+  }
+
+  user.balance += 0.25;
+  user.purchased.plan.gemsBought++;
+  user.stats.gp -= convRate;
+
+  if (analytics) {
+    analytics.track('purchase gems', {
+      uuid: user._id,
+      itemKey: key,
+      acquireMethod: 'Gold',
+      goldCost: convRate,
+      category: 'behavior',
+      headers: req.headers,
+    });
+  }
+
+  return [
+    pick(user, splitWhitespace('stats balance')),
+    i18n.t('plusOneGem', req.language),
+  ];
+}
+
+function getItemAndPrice (user, type, key, req) {
  let item;
  let price;

-  if (!type) {
-    throw new BadRequest(i18n.t('typeRequired', req.language));
-  }
-
-  if (!key) {
-    throw new BadRequest(i18n.t('keyRequired', req.language));
-  }
-
-  if (type === 'gems' && key === 'gem') {
-    let convRate = planGemLimits.convRate;
-    let convCap = planGemLimits.convCap;
-    convCap += user.purchased.plan.consecutive.gemCapExtra;
-
-    // Some groups limit their members ability to obtain gems
-    // The check is async so it's done on the server (in server/controllers/api-v3/user#purchase)
-    // only and not on the client,
-    // resulting in a purchase that will seem successful until the request hit the server.
-
-    if (!user.purchased || !user.purchased.plan || !user.purchased.plan.customerId) {
-      throw new NotAuthorized(i18n.t('mustSubscribeToPurchaseGems', req.language));
-    }
-
-    if (user.stats.gp < convRate) {
-      throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language));
-    }
-
-    if (user.purchased.plan.gemsBought >= convCap) {
-      throw new NotAuthorized(i18n.t('reachedGoldToGemCap', {convCap}, req.language));
-    }
-
-    user.balance += 0.25;
-    user.purchased.plan.gemsBought++;
-    user.stats.gp -= convRate;
-
-    if (analytics) {
-      analytics.track('purchase gems', {
-        uuid: user._id,
-        itemKey: key,
-        acquireMethod: 'Gold',
-        goldCost: convRate,
-        category: 'behavior',
-        headers: req.headers,
-      });
-    }
-
-    return [
-      pick(user, splitWhitespace('stats balance')),
-      i18n.t('plusOneGem', req.language),
-    ];
-  }
-
-  let acceptedTypes = ['eggs', 'hatchingPotions', 'food', 'quests', 'gear', 'bundles'];
-  if (acceptedTypes.indexOf(type) === -1) {
-    throw new NotFound(i18n.t('notAccteptedType', req.language));
-  }
-
  if (type === 'gear') {
    item = content.gear.flat[key];

@@ -98,17 +82,10 @@ module.exports = function purchase (user, req = {}, analytics) {
    price = item.value / 4;
  }

-  if (!item.canBuy(user)) {
-    throw new NotAuthorized(i18n.t('messageNotAvailable', req.language));
-  }
-
-  if (!user.balance || user.balance < price) {
-    throw new NotAuthorized(i18n.t('notEnoughGems', req.language));
-  }
-
-  let itemInfo = getItemInfo(user, type, item);
-  removeItemByPath(user, itemInfo.path);
+  return {item, price};
+}

+function purchaseItem (user, item, price, type, key) {
  user.balance -= price;

  if (type === 'gear') {
@@ -127,6 +104,50 @@ module.exports = function purchase (user, req = {}, analytics) {
    }
    user.items[type][key]++;
  }
+}
+
+module.exports = function purchase (user, req = {}, analytics) {
+  let type = get(req.params, 'type');
+  let key = get(req.params, 'key');
+  let quantity = req.quantity || 1;
+
+  if (!type) {
+    throw new BadRequest(i18n.t('typeRequired', req.language));
+  }
+
+  if (!key) {
+    throw new BadRequest(i18n.t('keyRequired', req.language));
+  }
+
+  if (type === 'gems' && key === 'gem') {
+    let gemResponse;
+    for (let i = 0; i < quantity; i += 1) {
+      gemResponse = buyGems(user, analytics, req, key);
+    }
+    return gemResponse;
+  }
+
+  let acceptedTypes = ['eggs', 'hatchingPotions', 'food', 'quests', 'gear', 'bundles'];
+  if (acceptedTypes.indexOf(type) === -1) {
+    throw new NotFound(i18n.t('notAccteptedType', req.language));
+  }
+
+  let {price, item} = getItemAndPrice(user, type, key, req);
+
+  if (!item.canBuy(user)) {
+    throw new NotAuthorized(i18n.t('messageNotAvailable', req.language));
+  }
+
+  if (!user.balance || user.balance < price) {
+    throw new NotAuthorized(i18n.t('notEnoughGems', req.language));
+  }
+
+  let itemInfo = getItemInfo(user, type, item);
+  removeItemByPath(user, itemInfo.path);
+
+  for (let i = 0; i < quantity; i += 1) {
+    purchaseItem(user, item, price, type, key);
+  }

  if (analytics) {
    analytics.track('acquire item', {
@@ -1,9 +1,12 @@
-import buySpecialSpellOp from './buySpecialSpell';
+import buy from './buy';
 import purchaseOp from './purchase';
 import get from 'lodash/get';

 module.exports = function purchaseWithSpell (user, req = {}, analytics) {
  const type = get(req.params, 'type');

-  return type === 'spells' ? buySpecialSpellOp(user, req) : purchaseOp(user, req, analytics);
+  // Set up type for buy function - different than the above type.
+  req.type = 'special';
+
+  return type === 'spells' ? buy(user, req, analytics) : purchaseOp(user, req, analytics);
 };