From 5ed1dc4f6a6c922f00f916c579676c7f34149114 Mon Sep 17 00:00:00 2001
From: Sik Yoon <younxxxx@gmail.com>
Date: Fri, 17 May 2024 23:28:06 +0900
Subject: [PATCH] Make code simple

---
 src/strategy_team/strategy_008.rs | 50 +++++++++++++++++--------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/strategy_team/strategy_008.rs b/src/strategy_team/strategy_008.rs
index 5a1576d..4c9b745 100644
--- a/src/strategy_team/strategy_008.rs
+++ b/src/strategy_team/strategy_008.rs
@@ -58,6 +58,7 @@ pub async fn list_up_for_buy(
     let mut wprs50 = wiliams_percent_r(50, &alldata.rt_price_30m_vec, &filtered_data).await?;
     let server_epoch = get_server_epoch().await;
     for (symbol, values) in &mut filtered_data {
+        let mut do_buy = false;
         if let (Some(wpr200_vec), Some(wpr50_vec)) = (wprs200.get(symbol), wprs50.get(symbol)) {
             if wpr200_vec.len() > 15
                 && wpr50_vec.len() > 15
@@ -66,10 +67,11 @@ pub async fn list_up_for_buy(
                 && wpr50_vec.last().unwrap().close_time > server_epoch
                 && wpr50_vec.last().unwrap().r_value < -60.0
             {
-            } else {
-                keys_to_remove.insert(symbol.clone());
-            }
-        } else {
+                do_buy = true;
+            } 
+        }
+
+        if do_buy == false {
             keys_to_remove.insert(symbol.clone());
         }
     }
@@ -85,6 +87,7 @@ pub async fn list_up_for_buy(
     let tema_300 = tema(300, &alldata.rt_price_30m_vec, &filtered_data).await?;
     let server_epoch = get_server_epoch().await;
     for (symbol, values) in &mut filtered_data {
+        let mut do_buy = false;
         if let (Some(tema100_vec), Some(tema200_vec), Some(tema300_vec)) = (
             tema_100.get(symbol),
             tema_200.get(symbol),
@@ -113,13 +116,12 @@ pub async fn list_up_for_buy(
                     && tema200_vec[tema200_vec.len() - 3].tema_value
                         < tema100_vec[tema100_vec.len() - 3].tema_value
                 {
-                } else {
-                    keys_to_remove.insert(symbol.clone());
-                }
-            } else {
-                keys_to_remove.insert(symbol.clone());
+                    do_buy = true;
+                } 
             }
-        } else {
+        } 
+
+        if do_buy == false {
             keys_to_remove.insert(symbol.clone());
         }
     }
@@ -131,6 +133,7 @@ pub async fn list_up_for_buy(
     let supertrend_30m_map =
         supertrend(10, 3.0, true, &alldata.rt_price_30m_vec, &filtered_data).await?;
     for (symbol, values) in &mut filtered_data {
+        let mut do_buy = false;
         if let (Some(supertrend_vec), Some(rt_price_vec)) = (
             supertrend_30m_map.get(symbol),
             alldata.rt_price_30m_vec.get(symbol),
@@ -162,6 +165,7 @@ pub async fn list_up_for_buy(
                         decimal_mul(decimal_sub(current_price, values.stoploss), dec!(10.0)),
                         current_price,
                     );
+                    do_buy = true;
                 } else if supertrend_vec.last().unwrap().area == SuperTrendArea::DOWN
                     && band_value > current_price
                     && band_value > open_price
@@ -173,13 +177,12 @@ pub async fn list_up_for_buy(
                         decimal_mul(decimal_sub(open_price, values.stoploss), dec!(10.0)),
                         current_price,
                     );
-                } else {
-                    keys_to_remove.insert(symbol.clone());
+                    do_buy = true;
                 }
-            } else {
-                keys_to_remove.insert(symbol.clone());
             }
-        } else {
+        }
+
+        if do_buy == false {
             keys_to_remove.insert(symbol.clone());
         }
     }
@@ -291,6 +294,7 @@ pub async fn list_up_for_buy(
     let mut keys_to_remove: HashSet<String> = HashSet::new();
     let server_epoch = get_server_epoch().await;
     for (symbol, values) in &mut filtered_data {
+        let mut do_buy = false;
         if let Some(rt_price_vec) = alldata.rt_price_30m_vec.get(symbol) {
             if rt_price_vec.last().unwrap().close_time > server_epoch && rt_price_vec.len() >= 6 {
                 let mut opclo_vec: Vec<f64> = Vec::new();
@@ -316,20 +320,22 @@ pub async fn list_up_for_buy(
                 let difference = (mean - rt_price_vec.last().unwrap().open_price).abs();
 
                 if current_price < rt_price_vec.last().unwrap().open_price + (0.5 * difference) {
-                } else {
-                    keys_to_remove.insert(symbol.clone());
-                }
-            } else {
-                keys_to_remove.insert(symbol.clone());
+                    do_buy = true;
+                } 
             }
-        } else {
+        }
+
+        if do_buy == false {
             keys_to_remove.insert(symbol.clone());
         }
     }
     remove_keys(&mut filtered_data, keys_to_remove).await;
 
     let final_filtered_data = duplicate_filter(8, &filtered_data).await?;
-    insert_pre_suggested_coins(8, false, &final_filtered_data).await;
+
+    if !final_filtered_data.is_empty() {
+        insert_pre_suggested_coins(8, false, &final_filtered_data).await;
+    }
 
     Ok(())
 }