refactor getService

Author: odeimaiz

services/static-webserver/client/source/class/osparc/store/Services.js

@@ -108,59 +108,56 @@ qx.Class.define("osparc.store.Services", {
     },
 
     getService: function(key, version, useCache = true) {
+      if (!this.__servicesPromisesCached) {
+        this.__servicesPromisesCached = {};
+      }
+      if (!(key in this.__servicesPromisesCached)) {
+        this.__servicesPromisesCached[key] = {};
+      }
+
       // avoid request deduplication
-      if (key in this.__servicesPromisesCached && version in this.__servicesPromisesCached[key]) {
+      if (this.__servicesPromisesCached[key][version]) {
         return this.__servicesPromisesCached[key][version];
       }
 
-      // Create a new promise
-      const promise = new Promise((resolve, reject) => {
-        if (
-          useCache &&
-          this.__isInCache(key, version) &&
-          (
-            this.__servicesCached[key][version] === null ||
-            "history" in this.__servicesCached[key][version]
-          )
-        ) {
-          resolve(this.__servicesCached[key][version]);
-          return;
-        }
+      if (
+        useCache &&
+        this.__isInCache(key, version) &&
+        (
+          this.__servicesCached[key][version] === null ||
+          "history" in this.__servicesCached[key][version]
+        )
+      ) {
+        return Promise.resolve(this.__servicesCached[key][version]);
+      }
 
-        if (!(key in this.__servicesPromisesCached)) {
-          this.__servicesPromisesCached[key] = {};
-        }
-        const params = {
-          url: osparc.data.Resources.getServiceUrl(key, version)
-        };
-        this.__servicesPromisesCached[key][version] = osparc.data.Resources.fetch("services", "getOne", params)
-          .then(service => {
-            this.__addServiceToCache(service);
-            // Resolve the promise locally before deleting it
-            resolve(service);
-          })
-          .catch(err => {
-            // Store null in cache to avoid repeated failed requests
-            this.__addToCache(key, version, null);
-            console.error(err);
-            reject(err);
-          })
-          .finally(() => {
-            // Remove the promise from the cache
-            delete this.__servicesPromisesCached[key][version];
-          });
-      });
+      const params = {
+        url: osparc.data.Resources.getServiceUrl(key, version)
+      };
+      const fetchPromise = osparc.data.Resources.fetch("services", "getOne", params)
+        .then(service => {
+          this.__addServiceToCache(service);
+          // Resolve the promise locally before deleting it
+          return service;
+        })
+        .catch(err => {
+          // Store null in cache to avoid repeated failed requests
+          this.__addToCache(key, version, null);
+          console.error(err);
+          throw err;
+        })
+        .finally(() => {
+          // Remove the promise from the cache
+          delete this.__servicesPromisesCached[key][version];
+        });
 
       //  Store the promise in the cache
       //  The point of keeping this assignment outside of the main Promise block is to
       // ensure that the promise is immediately stored in the cache before any asynchronous
       // operations (like fetch) are executed. This prevents duplicate requests for the
       // same key and version when multiple consumers call getService concurrently.
-      if (!(key in this.__servicesPromisesCached)) {
-        this.__servicesPromisesCached[key] = {};
-      }
-      this.__servicesPromisesCached[key][version] = promise;
-      return promise;
+      this.__servicesPromisesCached[key][version] = fetchPromise;
+      return fetchPromise;
     },
 
     getStudyServices: function(studyId) {