ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

http service: return item names in price lookup

Browse Source
This commit is contained in:
Adam
2018-10-07 12:00:55 -04:00
parent 84fe8d8f58
commit 7223d3436d
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http-service/src/main/java/net/runelite/http/service/item/ItemController.java
View File

@@ -72,6 +72,7 @@ public class ItemController
{
Item item = new Item();
item.setId(priceEntry.getItem()); // fake item
item.setName(priceEntry.getName());
ItemPrice itemPrice = new ItemPrice();
itemPrice.setItem(item);
@@ -211,6 +212,7 @@ public class ItemController
{
Item item = new Item();
item.setId(priceEntry.getItem()); // fake item
item.setName(priceEntry.getName());
ItemPrice itemPrice = new ItemPrice();
itemPrice.setItem(item);

11
http-service/src/main/java/net/runelite/http/service/item/ItemService.java
View File

@@ -124,14 +124,14 @@ public class ItemService
{
if (time != null)
{
return con.createQuery("select item, price, time, fetched_time from prices where item = :item and time <= :time order by time desc limit 1")
return con.createQuery("select item, name, price, time, fetched_time from prices t1 join items t2 on t1.item=t2.id where item = :item and time <= :time order by time desc limit 1")
.addParameter("item", itemId)
.addParameter("time", time.toString())
.executeAndFetchFirst(PriceEntry.class);
}
else
{
return con.createQuery("select item, price, time, fetched_time from prices where item = :item order by time desc limit 1")
return con.createQuery("select item, name, price, time, fetched_time from prices t1 join items t2 on t1.item=t2.id where item = :item order by time desc limit 1")
.addParameter("item", itemId)
.executeAndFetchFirst(PriceEntry.class);
}
@@ -295,9 +295,10 @@ public class ItemService
{
try (Connection con = sql2o.beginTransaction())
{
Query query = con.createQuery("select t2.item, t2.time, prices.price, prices.fetched_time from (select t1.item as item, max(t1.time) as time from prices t1 group by item) t2 join prices on t2.item=prices.item and t2.time=prices.time");
List<PriceEntry> entries = query.executeAndFetch(PriceEntry.class);
return entries;
Query query = con.createQuery("select t2.item, t3.name, t2.time, prices.price, prices.fetched_time from (select t1.item as item, max(t1.time) as time from prices t1 group by item) t2 " +
" join prices on t2.item=prices.item and t2.time=prices.time" +
" join items t3 on t2.item=t3.id");
return query.executeAndFetch(PriceEntry.class);
}
}

3
http-service/src/main/java/net/runelite/http/service/item/PriceEntry.java
View File

@@ -28,9 +28,10 @@ import java.time.Instant;
import lombok.Data;
@Data
public class PriceEntry
class PriceEntry
{
private int item;
private String name;
private int price;
private Instant time;
private Instant fetched_time;