Making sure to only update the status on deposits

dessalines · Sep 26, 2014 · 4c37803 · 4c37803
1 parent 953005c
commit 4c37803
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/com/bitpieces/dev/init/InitializeTables.java b/src/main/java/com/bitpieces/dev/init/InitializeTables.java
@@ -186,19 +186,19 @@ private static void user_deposit() {
 		User terry = User.findFirst("username like 'Terry%'");
 
 
-		DBActions.makeOrUpdateOrder("fake1", "ofake1");
+		DBActions.makeOrUpdateCoinbaseOrder("fake1", "ofake1");
 		DBActions.makeDepositFake(dick.getId().toString(), .15d, "fake1");
 
 		// an exact amount, or a straight up pieces buy
-		DBActions.makeOrUpdateOrder("fake2", "ofake2");
+		DBActions.makeOrUpdateCoinbaseOrder("fake2", "ofake2");
 		DBActions.makeDepositFake(john.getId().toString(), .17d, "fake2");
 
 
-		DBActions.makeOrUpdateOrder("fake3", "ofake3");
+		DBActions.makeOrUpdateCoinbaseOrder("fake3", "ofake3");
 		DBActions.makeDepositFake(bill.getId().toString(), .015d, "fake3");
 
 
-		DBActions.makeOrUpdateOrder("fake4", "ofake4");
+		DBActions.makeOrUpdateCoinbaseOrder("fake4", "ofake4");
 		DBActions.makeDepositFake(terry.getId().toString(), .3d, "fake4");
 
 

diff --git a/src/main/java/com/bitpieces/shared/tools/DBActions.java b/src/main/java/com/bitpieces/shared/tools/DBActions.java
@@ -430,7 +430,7 @@ public static Users_deposits makeDepositFake(String usersId, Double btc_amount,
 	}
 
 
-	public static Users_deposits makeOrUpdateDeposit(String userId, Double btc_amount, String cb_tid, String status) {
+	public static Users_deposits makeOrUpdateCoinbaseDeposit(String userId, Double btc_amount, String cb_tid, String status) {
 
 		String timeStr = SDF.format(new Date());
 
@@ -446,10 +446,7 @@ public static Users_deposits makeOrUpdateDeposit(String userId, Double btc_amoun
 						"status", status);
 
 			} else {
-				dep.set("users_id", userId,
-						"cb_tid", cb_tid, 
-						"time_", timeStr, 
-						"btc_amount", btc_amount, 
+				dep.set(
 						"status", status).saveIt();
 				return dep;
 			}
@@ -461,7 +458,7 @@ public static Users_deposits makeOrUpdateDeposit(String userId, Double btc_amoun
 
 
 
-	public static Orders makeOrUpdateOrder(String cb_tid, String order_number) {
+	public static Orders makeOrUpdateCoinbaseOrder(String cb_tid, String order_number) {
 
 		Orders order = Orders.findFirst("cb_tid=?", cb_tid);
 

diff --git a/src/main/java/com/bitpieces/shared/tools/WebTools.java b/src/main/java/com/bitpieces/shared/tools/WebTools.java
@@ -407,7 +407,7 @@ public static String makeDepositFake(UID uid, String body, UnitConverter sf) {
 
 		String timeStr = Tools.SDF.get().format(new Date());
 
-		DBActions.makeOrUpdateOrder("fakeCbTid" + timeStr, "ofake1"+ timeStr);
+		DBActions.makeOrUpdateCoinbaseOrder("fakeCbTid" + timeStr, "ofake1"+ timeStr);
 		DBActions.makeDepositFake(uid.getId(),btcAmount, "fakeCbTid" + timeStr);
 
 		return message;
@@ -458,10 +458,10 @@ public static void makeDepositFromCoinbaseCallback(String userId, String body) {
 
 			System.out.println(bitcents + "|" + btcAmount + "|" + "cb_tid");
 
-			DBActions.makeOrUpdateOrder(cb_tid, orderNumber);
+			DBActions.makeOrUpdateCoinbaseOrder(cb_tid, orderNumber);
 
 
-			DBActions.makeOrUpdateDeposit(userId,btcAmount,cb_tid, status);
+			DBActions.makeOrUpdateCoinbaseDeposit(userId,btcAmount,cb_tid, status);