update

Author: namchuai

engine/controllers/engines.cc

@@ -282,6 +282,7 @@ void Engines::SetDefaultEngineVariant(
     res["message"] = result.error();
     auto resp = cortex_utils::CreateCortexHttpJsonResponse(res);
     resp->setStatusCode(k400BadRequest);
+    callback(resp);
   } else {
     auto resp =
         cortex_utils::CreateCortexHttpJsonResponse(result.value().ToJson());
@@ -300,6 +301,7 @@ void Engines::GetDefaultEngineVariant(
     res["message"] = result.error();
     auto resp = cortex_utils::CreateCortexHttpJsonResponse(res);
     resp->setStatusCode(k400BadRequest);
+    callback(resp);
   } else {
     auto resp =
         cortex_utils::CreateCortexHttpJsonResponse(result.value().ToJson());

engine/controllers/engines.h

@@ -17,6 +17,7 @@ class Engines : public drogon::HttpController<Engines, false> {
   METHOD_ADD(Engines::UninstallEngine, "/{1}", Delete);
   METHOD_ADD(Engines::ListEngine, "", Get);
 
+  // TODO: might better use query param
   METHOD_ADD(Engines::GetEngineVersions, "/{1}/versions", Get);
   METHOD_ADD(Engines::GetEngineVariants, "/{1}/versions/{2}", Get);
   METHOD_ADD(Engines::InstallEngineVariant, "/{1}/versions/{2}/{3}", Post);

engine/services/engine_service.cc

@@ -598,8 +598,16 @@ EngineService::SetDefaultEngineVariant(const std::string& engine,
                                        const std::string& version,
                                        const std::string& variant) {
   auto ne = NormalizeEngine(engine);
+  auto is_installed = IsEngineVariantReady(engine, version, variant);
+  if (is_installed.has_error()) {
+    return cpp::fail(is_installed.error());
+  }
+
+  if (!is_installed.value()) {
+    return cpp::fail("Engine variant " + version + "-" + variant +
+                     " is not installed yet!");
+  }
 
-  // TODO: (namh) Handle case that the input is invalid, need to check if we have that version
   default_variants_[ne] = DefaultEngineVariant{
       .engine = engine,
       .version = version,
@@ -608,12 +616,33 @@ EngineService::SetDefaultEngineVariant(const std::string& engine,
   return default_variants_[ne];
 }
 
+cpp::result<bool, std::string> EngineService::IsEngineVariantReady(
+    const std::string& engine, const std::string& version,
+    const std::string& variant) {
+  auto ne = NormalizeEngine(engine);
+  auto normalized_version = string_utils::RemoveSubstring(version, "v");
+  auto installed_engines = GetInstalledEngineVariants(ne);
+  if (installed_engines.has_error()) {
+    return cpp::fail("Failed to get installed engines: " +
+                     installed_engines.error());
+  }
+
+  for (const auto& installed_engine : installed_engines.value()) {
+    if (installed_engine.name == variant &&
+        installed_engine.version == normalized_version) {
+      return true;
+    }
+  }
+  return false;
+}
+
 cpp::result<DefaultEngineVariant, std::string>
 EngineService::GetDefaultEngineVariant(const std::string& engine) {
   auto ne = NormalizeEngine(engine);
   if (default_variants_.find(ne) == default_variants_.end()) {
-    return cpp::fail("Variant for " + engine + " is not set yet!");
+    return cpp::fail("Engine variant for " + engine + " is not set yet!");
   }
+
   return default_variants_[ne];
 }
 

engine/services/engine_service.h

@@ -146,6 +146,10 @@ class EngineService {
   std::string GetMatchedVariant(const std::string& engine,
                                 const std::vector<std::string>& variants);
 
+  cpp::result<bool, std::string> IsEngineVariantReady(
+      const std::string& engine, const std::string& version,
+      const std::string& variant);
+
  private:
   std::shared_ptr<DownloadService> download_service_;