From 2dd6fa41e918de192b814a991e61ebab10ea7af4 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 4 Jun 2020 10:01:11 -0400 Subject: [PATCH] ge: include both delta qty and qty --- .../java/net/runelite/http/api/ge/GrandExchangeTrade.java | 3 ++- .../runelite/http/service/ge/GrandExchangeController.java | 7 ++++--- .../net/runelite/http/service/ge/GrandExchangeService.java | 4 ++-- .../src/main/java/net/runelite/http/service/ge/Trade.java | 3 ++- .../client/plugins/grandexchange/GrandExchangePlugin.java | 6 +++--- .../plugins/grandexchange/GrandExchangePluginTest.java | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java index 3d123ecc2b..3e886b68cb 100644 --- a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java +++ b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java @@ -34,7 +34,8 @@ public class GrandExchangeTrade private boolean cancel; private boolean login; private int itemId; - private int quantity; + private int qty; + private int dqty; private int total; private int spent; private int offer; diff --git a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java index 77d82e08dd..ad03083739 100644 --- a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java +++ b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java @@ -80,8 +80,8 @@ public class GrandExchangeController // We don't keep track of pending trades in the web UI, so only add cancelled or completed trades if (userId != null && - grandExchangeTrade.getQuantity() > 0 && - (grandExchangeTrade.isCancel() || grandExchangeTrade.getQuantity() == grandExchangeTrade.getTotal())) + grandExchangeTrade.getQty() > 0 && + (grandExchangeTrade.isCancel() || grandExchangeTrade.getQty() == grandExchangeTrade.getTotal())) { grandExchangeService.add(userId, grandExchangeTrade); } @@ -91,7 +91,8 @@ public class GrandExchangeController trade.setCancel(grandExchangeTrade.isCancel()); trade.setLogin(grandExchangeTrade.isLogin()); trade.setItemId(grandExchangeTrade.getItemId()); - trade.setQuantity(grandExchangeTrade.getQuantity()); + trade.setQty(grandExchangeTrade.getQty()); + trade.setDqty(grandExchangeTrade.getDqty()); trade.setTotal(grandExchangeTrade.getTotal()); trade.setSpent(grandExchangeTrade.getSpent()); trade.setOffer(grandExchangeTrade.getOffer()); diff --git a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeService.java b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeService.java index e5acbc6aa7..227d5e1159 100644 --- a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeService.java +++ b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeService.java @@ -79,8 +79,8 @@ public class GrandExchangeService .addParameter("user", userId) .addParameter("action", grandExchangeTrade.isBuy() ? "BUY" : "SELL") .addParameter("item", grandExchangeTrade.getItemId()) - .addParameter("quantity", grandExchangeTrade.getQuantity()) - .addParameter("price", grandExchangeTrade.getSpent() / grandExchangeTrade.getQuantity()) + .addParameter("quantity", grandExchangeTrade.getQty()) + .addParameter("price", grandExchangeTrade.getSpent() / grandExchangeTrade.getQty()) .executeUpdate(); } } diff --git a/http-service/src/main/java/net/runelite/http/service/ge/Trade.java b/http-service/src/main/java/net/runelite/http/service/ge/Trade.java index 6fcb812ab7..3a6d64fb30 100644 --- a/http-service/src/main/java/net/runelite/http/service/ge/Trade.java +++ b/http-service/src/main/java/net/runelite/http/service/ge/Trade.java @@ -34,7 +34,8 @@ class Trade private boolean cancel; private boolean login; private int itemId; - private int quantity; + private int qty; + private int dqty; private int total; private int spent; private int offer; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index 3e67baa648..8e5e0793ce 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -412,7 +412,6 @@ public class GrandExchangePlugin extends Plugin GrandExchangeTrade grandExchangeTrade = new GrandExchangeTrade(); grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING); grandExchangeTrade.setItemId(offer.getItemId()); - grandExchangeTrade.setQuantity(0); grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setSpent(0); grandExchangeTrade.setOffer(offer.getPrice()); @@ -443,7 +442,7 @@ public class GrandExchangePlugin extends Plugin grandExchangeTrade.setBuy(state == GrandExchangeOfferState.CANCELLED_BUY); grandExchangeTrade.setCancel(true); grandExchangeTrade.setItemId(offer.getItemId()); - grandExchangeTrade.setQuantity(offer.getQuantitySold()); + grandExchangeTrade.setQty(offer.getQuantitySold()); grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setSpent(offer.getSpent()); grandExchangeTrade.setOffer(offer.getPrice()); @@ -466,7 +465,8 @@ public class GrandExchangePlugin extends Plugin GrandExchangeTrade grandExchangeTrade = new GrandExchangeTrade(); grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING); grandExchangeTrade.setItemId(offer.getItemId()); - grandExchangeTrade.setQuantity(qty); + grandExchangeTrade.setQty(offer.getQuantitySold()); + grandExchangeTrade.setDqty(qty); grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setSpent(dspent); grandExchangeTrade.setOffer(offer.getPrice()); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java index 9f638b837d..4b513f4fa2 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java @@ -157,7 +157,7 @@ public class GrandExchangePluginTest GrandExchangeTrade trade = captor.getValue(); assertTrue(trade.isBuy()); assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId()); - assertEquals(2, trade.getQuantity()); + assertEquals(2, trade.getDqty()); assertEquals(10, trade.getTotal()); assertEquals(20, trade.getSpent()); } @@ -214,7 +214,7 @@ public class GrandExchangePluginTest assertTrue(trade.isBuy()); assertTrue(trade.isCancel()); assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId()); - assertEquals(1, trade.getQuantity()); + assertEquals(1, trade.getQty()); assertEquals(10, trade.getTotal()); assertEquals(25, trade.getSpent()); }