fix double $or

Author: thanhson1085

daos/lending_trade.go

@@ -346,13 +346,19 @@ func (dao *LendingTradeDao) GetLendingTradesUserHistory(a common.Address, lendin
 		}
 		q["createdAt"] = dateFilter
 	}
-	q["$or"] = []bson.M{
-		{"investor": a.Hex()},
-		{"borrower": a.Hex()},
-	}
-	q["$or"] = []bson.M{
-		{"investingRelayer": lendingtradeSpec.RelayerAddress.Hex()},
-		{"borrowingRelayer": lendingtradeSpec.RelayerAddress.Hex()},
+	q["$and"] = []bson.M{
+		{
+			"$or": []bson.M{
+				{"investor": a.Hex()},
+				{"borrower": a.Hex()},
+			},
+		},
+		{
+			"$or": []bson.M{
+				{"investingRelayer": lendingtradeSpec.RelayerAddress.Hex()},
+				{"borrowingRelayer": lendingtradeSpec.RelayerAddress.Hex()},
+			},
+		},
 	}
 	if lendingtradeSpec.Term != "" {
 		q["term"] = lendingtradeSpec.Term

daos/trade.go

@@ -656,13 +656,19 @@ func (dao *TradeDao) GetTradesUserHistory(a common.Address, tradeSpec *types.Tra
 		}
 		q["createdAt"] = dateFilter
 	}
-	q["$or"] = []bson.M{
-		{"maker": a.Hex()},
-		{"taker": a.Hex()},
-	}
-	q["$or"] = []bson.M{
-		{"makerExchange": tradeSpec.RelayerAddress.Hex()},
-		{"takerExchange": tradeSpec.RelayerAddress.Hex()},
+	q["$and"] = []bson.M{
+		{
+			"$or": []bson.M{
+				{"maker": a.Hex()},
+				{"taker": a.Hex()},
+			},
+		},
+		{
+			"$or": []bson.M{
+				{"makerExchange": tradeSpec.RelayerAddress.Hex()},
+				{"takerExchange": tradeSpec.RelayerAddress.Hex()},
+			},
+		},
 	}
 	if tradeSpec.BaseToken != "" {
 		q["baseToken"] = tradeSpec.BaseToken