Merge pull request #72 from ZeusJunior/development

v2.1.0

Author: ZeusJunior

app/profit.js

@@ -6,11 +6,12 @@ const axios = require('axios');
 // TODO: Make this into class
 /**
  * @param {Number} start time to start plot
- * @param {Number} interval time interval to plot
- * @param {Number} end time to end plot
+ * @param {Number} interval time interval to plot, set to -1 or undefined to disable profit plot
+ * @param {Number} end time to end plot, set to -1 to disale profit timed and plot or undefined to disable just plot
+ * @param {Boolean} enableTrades enable return of profit data for each trade
  * @return {Object}
  */
-exports.get = async function get(start, interval, end) {
+exports.get = async function get(start, interval, end, enableTrades) {
 	const polldata = await fs.readJSON(paths.files.polldata);
 	const response = await axios(
 		{
@@ -44,12 +45,17 @@ exports.get = async function get(start, interval, end) {
 		return a - b;
 	});
 
+	const tradeProfits = {};
+
 	let iter = 0; // to keep track of how many trades are accepted
 	for (let i = 0; i < trades.length; i++) { // TODO: ADMIN TRADES
 		const trade = trades[i];
 		if (!(trade.handledByUs === true && trade.isAccepted === true)) {
 			continue;// trade was not accepted, go to next trade
 		}
+
+		let tradeProfit = 0;
+
 		iter++;
 		let isGift = false;
 		if (!Object.prototype.hasOwnProperty.call(trade, 'dict')) {
@@ -92,7 +98,7 @@ exports.get = async function get(start, interval, end) {
 					}
 					const prices = trade.prices[sku].buy;
 
-					tracker.boughtItem(itemCount, sku, prices, trade.value.rate, trade.time);
+					tradeProfit += tracker.boughtItem(itemCount, sku, prices, trade.value.rate, trade.time);
 				}
 			}
 		}
@@ -105,23 +111,27 @@ exports.get = async function get(start, interval, end) {
 						continue; // item is not in pricelist, so we will just skip it
 					}
 					const prices = trade.prices[sku].sell;
-					tracker.soldItem(itemCount, sku, prices, trade.value.rate, trade.time);
+					tradeProfit += tracker.soldItem(itemCount, sku, prices, trade.value.rate, trade.time);
 				}
 			}
 		}
 		if (!isGift) { // calculate overprice profit
+			tradeProfit += tracker.convert(trade.value.their, trade.value.rate) - tracker.convert(trade.value.our, trade.value.rate);
 			overpriceProfit += tracker.convert(trade.value.their, trade.value.rate) - tracker.convert(trade.value.our, trade.value.rate);
 			tracker.profitTrack.countProfit( tracker.convert(trade.value.their, trade.value.rate) - tracker.convert(trade.value.our, trade.value.rate), trade.time);
 		}
+		tradeProfits[trade.id] = tracker.profitTrack.getFormated(tradeProfit);
 	}
-	return {
+	const returnObj = {
 		profitTotal: tracker.profitTrack.getFormated(tracker.profitTrack.profit),
 		profitTimed: tracker.profitTrack.getFormated(tracker.profitTrack.profitTimed),
 		profitPlot: tracker.profitTrack.profitPlot,
 		numberOfTrades: iter,
 		overpriceProfit: tracker.profitTrack.getFormated(overpriceProfit),
 		keyValue: keyVal
 	};
+	if (enableTrades) returnObj['tradeProfits'] = tradeProfits;
+	return returnObj;
 };
 
 /**
@@ -200,7 +210,7 @@ class profitTracker {
 			metal: this.currentKey
 		}).toValue(this.currentKey); // get value in scrap 
 		const metal = Currency.toRefined(normalPrice % key);
-		const keys = Math.floor(normalPrice / key);
+		const keys = normalPrice>0 ? Math.floor(normalPrice / key) : Math.ceil(normalPrice / key);
 		return new Currency({keys, metal}).toString();
 	}
 }
@@ -229,18 +239,21 @@ class itemTracker {
 	 * @param {Object} prices prices for this item
 	 * @param {Number} rate key rate
 	 * @param {Number} time
+	 * @return {Number} profit made on this item
 	 */
 	boughtItem(itemCount, sku, prices, rate, time) {
+		let itemProfit = 0;
 		if (Object.prototype.hasOwnProperty.call(this.overItems, sku)) { // if record for this item exists in overItems check it
 			if (this.overItems[sku].count > 0) {
 				if (this.overItems[sku].count >= itemCount) {
 					this.overItems[sku].count -= itemCount;
 					this.profitTrack.countProfit( (this.overItems[sku].price - this.convert(prices, rate)) * itemCount, time);
-					return; // everything is already sold no need to add to stock
+					return (this.overItems[sku].price - this.convert(prices, rate)) * itemCount; // everything is already sold no need to add to stock
 				} else {
 					const itemsOverOverItems = itemCount - this.overItems[sku].count;
 					this.overItems[sku].count = 0;
 					this.profitTrack.countProfit( (this.overItems[sku].price - this.convert(prices, rate)) * (itemCount - itemsOverOverItems), time);
+					itemProfit += (this.overItems[sku].price - this.convert(prices, rate)) * (itemCount - itemsOverOverItems);
 					itemCount = itemsOverOverItems;
 				}
 			}
@@ -256,6 +269,7 @@ class itemTracker {
 				price: this.convert(prices, rate)
 			};
 		}
+		return itemProfit;
 	}
 
 	/**
@@ -265,14 +279,17 @@ class itemTracker {
 	 * @param {Object} prices prices for item sold
 	 * @param {Number} rate key rate
 	 * @param {Number} time time of trade
+	 * @return {Number} profit made on this item
 	 */
 	soldItem(itemCount, sku, prices, rate, time) {
+		let itemProfit = 0;
 		if (Object.prototype.hasOwnProperty.call(this.itemStock, sku)) { // have we bought this item already
 			if (this.itemStock[sku].count >= itemCount) {
 				this.itemStock[sku].count -= itemCount;
 				this.profitTrack.countProfit( (this.convert(prices, rate) - this.itemStock[sku].price) * itemCount, time);
-				return;
+				return (this.convert(prices, rate) - this.itemStock[sku].price) * itemCount;
 			} else {
+				itemProfit += (this.convert(prices, rate) - this.itemStock[sku].price) * this.itemStock[sku].count;
 				this.profitTrack.countProfit( (this.convert(prices, rate) - this.itemStock[sku].price) * this.itemStock[sku].count, time);
 				itemCount -= this.itemStock[sku].count;
 				this.itemStock[sku].count = 0;
@@ -289,6 +306,7 @@ class itemTracker {
 				price: this.convert(prices, rate)
 			};
 		}
+		return itemProfit;
 	}
 
 	/**

app/routes/trades.js

@@ -14,16 +14,9 @@ router.get('/', (req, res) => {
 			return;
 		}
 
-		trades.get()
-			.then((data) => {
-				res.render('trades', {
-					data: data,
-					polldata: true
-				});
-			})
-			.catch((err) => {
-				throw err;
-			});
+		res.render('trades', {
+			polldata: true
+		});
 	} else {
 		if (!fs.existsSync(paths.files.polldata)) {
 			res.json({
@@ -32,7 +25,7 @@ router.get('/', (req, res) => {
 			return;
 		}
 
-		trades.get()
+		trades.get(Number(req.query.first), Number(req.query.count), Number(req.query.dir)==1)
 			.then((data) => {
 				res.json({
 					success: 1,

app/trades.js

@@ -4,65 +4,101 @@ const getName = require('../utils/getName');
 const data = require('./data');
 const moment = require('moment');
 const getImage = require('../utils/getImage');
-const SKU = require('tf2-sku');
+const profit = require('./profit');
 
+/**
+ * 
+ * @param {Number} first index of first trade to be included in results
+ * @param {Number} count how many trades to include in results, set to -1 to return all
+ * @param {Boolean} descending sort
+ */
+exports.get = async function(first, count, descending) {
+	const polldata = await fs.readJSON(paths.files.polldata);
+	const profitData = (await profit.get(undefined, undefined, undefined, true)).tradeProfits;
+	let tradeList = Object.keys(polldata.offerData).map((key)=>{
+		const ret = polldata.offerData[key];
+		ret.id = key;
+		return ret;
+	});
+	const tradeCount = tradeList.length;
+	tradeList = tradeList.sort((a, b)=>{
+		a = a.finishTimestamp;
+		b = b.finishTimestamp;
 
-exports.get = function() {
-	return fs.readJSON(paths.files.polldata)
-		.then((polldata) => {
-			return Object.keys(polldata.offerData).map((key)=>{
-				const offer = polldata.offerData[key];
-				const ret = {
-					id: key,
-					lastChange: polldata.timestamps[key],
-					items: {
-						our: [],
-						their: []
-					},
-					action: offer.action,
-					partner: offer.partner,
-					accepted: offer.accepted,
-					time: offer.finishTimestamp,
-					datetime: moment.unix(Math.floor(offer.finishTimestamp/1000)).format('ddd D-M-YYYY HH:mm'),
-					value: offer.value,
-					prices: offer.prices,
-					accepted: offer.handledByUs === true && offer.isAccepted === true
-				};
+		// check for undefined time, sort those at the end
+		if ( (!a || isNaN(a)) && !(!b || isNaN(b))) return 1;
+		if ( !(!a || isNaN(a)) && (!b || isNaN(b))) return -1;
+		if ( (!a || isNaN(a)) && (!b || isNaN(b))) return 0;
 
-				if (typeof polldata.sent[key] != 'undefined') {
-					ret.lastState = data.ETradeOfferState[polldata.sent[key]];
-				} else if (typeof polldata.received[key] != 'undefined') {
-					ret.lastState = data.ETradeOfferState[polldata.received[key]];
-				}
-				if (Object.prototype.hasOwnProperty.call(offer, 'dict')) {
-					if (Object.keys(offer.dict.our).length > 0) {
-						Object.keys(offer.dict.our).forEach((k)=>{
-							ret.items.our.push(createTradeItem(k, offer.dict.our[k]));
-						});
+		if (descending) {
+			b = [a, a = b][0];
+		}
+
+		return a - b;
+	});
+	if (count != -1) tradeList = tradeList.slice(first, first + count);
+	const items = {};
+	const trades = tradeList.map((offer)=>{
+		const ret = {
+			id: offer.id,
+			items: {
+				our: [],
+				their: []
+			},
+			profit: Object.prototype.hasOwnProperty.call(profitData, offer.id)?profitData[offer.id]: '',
+			partner: offer.partner,
+			accepted: offer.accepted,
+			time: offer.finishTimestamp,
+			datetime: moment.unix(Math.floor(offer.finishTimestamp/1000)).format('ddd D-M-YYYY HH:mm'),
+			value: offer.value,
+			accepted: offer.handledByUs === true && offer.isAccepted === true
+		};
+		if (typeof polldata.sent[offer.id] != 'undefined') {
+			ret.lastState = data.ETradeOfferState[polldata.sent[offer.id]];
+		} else if (typeof polldata.received[offer.id] != 'undefined') {
+			ret.lastState = data.ETradeOfferState[polldata.received[offer.id]];
+		}
+		if (Object.prototype.hasOwnProperty.call(offer, 'dict')) {
+			if (Object.keys(offer.dict.our).length > 0) {
+				Object.keys(offer.dict.our).forEach((k)=>{
+					if (!Object.prototype.hasOwnProperty.call(items, k)) {
+						items[k] = createTradeItem(k);
 					}
-					if (Object.keys(offer.dict.their).length > 0) {
-						Object.keys(offer.dict.their).forEach((k)=>{
-							ret.items.their.push(createTradeItem(k, offer.dict.their[k]));
-						});
+					ret.items.our.push({
+						sku: k,
+						amount: offer.dict.our[k]
+					});
+				});
+			}
+			if (Object.keys(offer.dict.their).length > 0) {
+				Object.keys(offer.dict.their).forEach((k)=>{
+					if (!Object.prototype.hasOwnProperty.call(items, k)) {
+						items[k] = createTradeItem(k);
 					}
-				}
-
-				return ret;
-			});
-		});
+					ret.items.their.push({
+						sku: k,
+						amount: offer.dict.their[k]
+					});
+				});
+			}
+		}
+		return ret;
+	});
+	return {
+		trades,
+		items,
+		tradeCount
+	};
 };
 
 /**
  * Creates item object
  * @param {String} sku 
- * @param {number} amount 
  * @return {Object} item object created
  */
-function createTradeItem(sku, amount) {
-	const item = SKU.fromString(sku);
-	item.sku = sku;
-	item.name = getName(item.sku);
-	item.style = getImage.getImageStyle(item.sku);
-	item.amount = amount;
-	return item;
+function createTradeItem(sku) {
+	return {
+		name: getName(sku),
+		style: getImage.getImageStyle(sku)
+	};
 }

assets/js/index.js

@@ -316,6 +316,9 @@ const app = new Vue({
 				case 2: // buy price
 					return a.buy.total - b.buy.total;
 					break;
+				case 3: // buy price
+					return a.intent - b.intent;
+					break;
 				}
 			});
 		}

assets/js/profit.js

@@ -99,7 +99,7 @@ const app = new Vue({
 				metal: this.plotData.keyValue
 			}).toValue(this.plotData.keyValue); // get value in scrap 
 			const metal = Currencies.toRefined(scrapVal % key);
-			const keys = Math.floor(scrapVal / key);
+			const keys = scrapVal>0 ? Math.floor(scrapVal / key) : Math.ceil(scrapVal / key);
 			return new Currencies({keys, metal}).toString();
 		}
 	},