Correct WinRate calculation across DB implementations

Author: npawlenko

miner/src/main/java/fr/rakambda/channelpointsminer/miner/database/MariaDBDatabase.java

@@ -55,7 +55,7 @@ protected void resolveUserPredictions(double returnRatioForWin, @NonNull String
 						SET
 						`PredictionCnt`=`PredictionCnt`+1,
 						`WinCnt`=`WinCnt`+?,
-						`WinRate`=`WinCnt`/`PredictionCnt`,
+						`WinRate`=(`WinCnt` + ?)/`PredictionCnt`,
 						`ReturnOnInvestment`=`ReturnOnInvestment`+?
 						WHERE `ID`=? AND `ChannelID`=?""")
 		){
@@ -65,20 +65,17 @@ protected void resolveUserPredictions(double returnRatioForWin, @NonNull String
 			try(var result = getOpenPredictionStmt.executeQuery()){
 				while(result.next()){
 					var userPrediction = Converters.convertUserPrediction(result);
-					if(badge.equals(userPrediction.getBadge())){
-						updatePredictionUserStmt.setInt(1, 1);
-						updatePredictionUserStmt.setDouble(2, returnOnInvestment);
-					}
-					else{
-						updatePredictionUserStmt.setInt(1, 0);
-						updatePredictionUserStmt.setDouble(2, -1);
-					}
-					updatePredictionUserStmt.setInt(3, userPrediction.getUserId());
-					updatePredictionUserStmt.setString(4, userPrediction.getChannelId());
+					boolean isWinner = badge.equals(userPrediction.getBadge());
+					
+					updatePredictionUserStmt.setInt(1, isWinner ? 1 : 0);
+					updatePredictionUserStmt.setInt(2, isWinner ? 1 : 0);
+					updatePredictionUserStmt.setDouble(3, isWinner ? returnOnInvestment : -1);
+					updatePredictionUserStmt.setInt(4, userPrediction.getUserId());
+					updatePredictionUserStmt.setString(5, userPrediction.getChannelId());
 					updatePredictionUserStmt.addBatch();
 				}
 				updatePredictionUserStmt.executeBatch();
 			}
 		}
 	}
-}
+}

miner/src/main/java/fr/rakambda/channelpointsminer/miner/database/PostgreSqlDatabase.java

@@ -54,9 +54,7 @@ protected void resolveUserPredictions(double returnRatioForWin, @NonNull String
                 SET
                     PredictionCnt = PredictionCnt + 1,
                     WinCnt = WinCnt + ?,
-                    WinRate = CASE WHEN PredictionCnt + 1 > 0
-                                     THEN (WinCnt + ?)::FLOAT / (PredictionCnt + 1)
-                                     ELSE 0 END,
+                    WinRate = (WinCnt + ?)::FLOAT / (PredictionCnt + 1),
                     ReturnOnInvestment = ReturnOnInvestment + ?
                 WHERE ID = ? AND ChannelID = ?;
                 """)) {

miner/src/main/java/fr/rakambda/channelpointsminer/miner/database/SQLiteDatabase.java

@@ -71,14 +71,10 @@ WITH wi AS (SELECT ? AS n)
 			try(var result = getOpenPredictionStmt.executeQuery()){
 				while(result.next()){
 					var userPrediction = Converters.convertUserPrediction(result);
-					if(badge.equals(userPrediction.getBadge())){
-						updatePredictionUserStmt.setInt(1, 1);
-						updatePredictionUserStmt.setDouble(2, returnOnInvestment);
-					}
-					else{
-						updatePredictionUserStmt.setInt(1, 0);
-						updatePredictionUserStmt.setDouble(2, -1);
-					}
+					boolean isWinner = badge.equals(userPrediction.getBadge());
+					
+					updatePredictionUserStmt.setInt(1, isWinner ? 1 : 0);
+					updatePredictionUserStmt.setDouble(2, isWinner ? returnOnInvestment : -1);
 					updatePredictionUserStmt.setInt(3, userPrediction.getUserId());
 					updatePredictionUserStmt.setString(4, userPrediction.getChannelId());
 					updatePredictionUserStmt.addBatch();