From b78c0c6beaf9d0deda6a9c4295bc7eb61a90549f Mon Sep 17 00:00:00 2001
From: Irene Edria <ireneedriadr@gmail.com>
Date: Tue, 21 Nov 2017 10:00:39 +0700
Subject: [PATCH] fix OrderHandler
---
.../com/adaapa/ojekservice/handlers/OrderHandler.java | 4 ++--
.../java/com/adaapa/ojekservice/models/UserModel.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java b/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
index 9d7215b..1b3c716 100644
--- a/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
+++ b/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
@@ -20,7 +20,7 @@ public class OrderHandler {
UserModel userModel = new UserModel();
UserBean validUser = TokenVerificationService.verifyToken(access_token);
if(validUser != null) {
- ArrayList<OrderBean> userHistoryArray = userModel.findPrevOrder(userModel.findOrderByUsername(validUser.getUsername()));
+ ArrayList<OrderBean> userHistoryArray = userModel.findPrevOrder(userModel.findUserByUsername(validUser.getUsername()));
response.setStatus(WebServiceBean.STATUS_VALID);
response.setBody(new Gson().toJson(userHistoryArray));
} else {
@@ -60,7 +60,7 @@ public class OrderHandler {
UserModel userModel = new UserModel();
UserBean validUser = TokenVerificationService.verifyToken(access_token);
if(validUser != null) {
- ArrayList<OrderBean> userHistoryArray = userModel.findPrevDriverOrder(userModel.findOrderByUsername(validUser.getUsername()));
+ ArrayList<OrderBean> userHistoryArray = userModel.findPrevDriverOrder(userModel.findUserByUsername(validUser.getUsername()));
response.setStatus(WebServiceBean.STATUS_VALID);
response.setBody(new Gson().toJson(userHistoryArray));
} else {
diff --git a/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/models/UserModel.java b/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/models/UserModel.java
index d90d8cf..940dea6 100644
--- a/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/models/UserModel.java
+++ b/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/models/UserModel.java
@@ -119,11 +119,11 @@ public class UserModel extends BaseModel{
}
}
- public ArrayList<OrderBean> findPrevOrder(OrderBean driver) {
+ public ArrayList<OrderBean> findPrevOrder(UserBean driver) {
ArrayList<OrderBean> res = new ArrayList<>();
try {
- ResultSet rs = query(String.format("SELECT * FROM orders JOIN users ON users.id = orders.driver_id WHERE user_id = '%s' and not user_hidden ORDER BY timestamp desc",driver.getDriverId()));
+ ResultSet rs = query(String.format("SELECT * FROM orders JOIN users ON users.id = orders.driver_id WHERE user_id = '%s' and not user_hidden ORDER BY timestamp desc",driver.getId()));
while (rs.next()) {
res.add(parseUserOrder(rs));
}
@@ -133,11 +133,11 @@ public class UserModel extends BaseModel{
return res;
}
- public ArrayList<OrderBean> findPrevDriverOrder(OrderBean driver) {
+ public ArrayList<OrderBean> findPrevDriverOrder(UserBean driver) {
ArrayList<OrderBean> res = new ArrayList<>();
try {
- ResultSet rs = query(String.format("SELECT * FROM orders JOIN users ON users.id = orders.user_id WHERE driver_id = '%s' and not driver_hidden ORDER BY timestamp desc",driver.getDriverId()));
+ ResultSet rs = query(String.format("SELECT * FROM orders JOIN users ON users.id = orders.user_id WHERE driver_id = '%s' and not driver_hidden ORDER BY timestamp desc",driver.getId()));
while (rs.next()) {
res.add(parseUserOrder(rs));
}
--
GitLab