Try to correct status bug with get_instances all

Author: EliXorZz

src/epsilon/server/instances/instance_provider.rs

@@ -57,42 +57,29 @@ impl InstanceProvider {
         template_option: Option<&str>,
         state_option: Option<&EpsilonState>,
     ) -> Result<Vec<Arc<EpsilonInstance>>, EpsilonError> {
-        let mut instances = self.epsilon_controller.get_epsilon_instance_store().state();
+        let instances = self.epsilon_controller.get_epsilon_instance_store().state();
 
         for instance in &instances {
-            let name = instance.get_name();
+            instance.status.as_ref().ok_or(EpsilonError::RetrieveInstanceError)?;
+        }
 
-            let condition = await_condition(
-                self.epsilon_controller.get_epsilon_instance_api(),
-                &name,
-                move |object: Option<&EpsilonInstance>| {
-                    object.map_or(false, |instance| instance.status.is_some())
-                },
-            );
+        Ok(instances.into_iter()
+            .filter(|instance| {
+                let status = instance.status.as_ref().unwrap();
 
-            let _ = tokio::time::timeout(std::time::Duration::from_secs(5), condition).await?;
-        }
+                let condition1 = status.t == *instance_type;
+
+                let condition2 = if let Some(template_name) = template_option {
+                    instance.spec.template == template_name
+                } else { true };
+
+                let condition3 = if let Some(state) = state_option {
+                    status.state == *state
+                }else { true };
 
-        instances = instances
-            .into_iter()
-            .filter(|instance| instance.status.as_ref().unwrap().t == *instance_type)
-            .collect();
-
-        if let Some(template_name) = template_option {
-            instances = instances
-                .into_iter()
-                .filter(|instance| instance.spec.template == template_name)
-                .collect();
-        };
-
-        if let Some(state) = state_option {
-            instances = instances
-                .into_iter()
-                .filter(|instance| instance.status.as_ref().unwrap().state == *state)
-                .collect();
-        };
-
-        Ok(instances)
+                condition1 && condition2 && condition3
+            })
+            .collect())
     }
 
     pub async fn enable_in_game_instance(&self, name: &str) -> Result<(), EpsilonError> {