ntk-cms-api 1.2.239 → 1.2.241

package/fesm2020/ntk-cms-api.mjs

@@ -1275,6 +1275,15 @@ class ApiServerBase {
         localStorage.setItem(this.keyBaseUrl, url);
         this.configApiRetry = apiRetry;
     }
+    cashApiIsValid(serviceNameKay) {
+        if (!this.cachApiResult[serviceNameKay])
+            return false;
+        if (!this.cachApiResult[serviceNameKay].isSuccess)
+            return true;
+        if (this.cachApiResult[serviceNameKay].dateResult && (new Date().getTime() - this.cachApiResult[serviceNameKay].dateResult) < this.cashApiSeconds)
+            return true;
+        return false;
+    }
     childConstructor() {
         // test
     }
@@ -1679,16 +1688,8 @@ class ApiCmsServerBase extends ApiServerBase {
         const serviceName = 'ServiceGetOneById';
         const serviceNameKay = serviceName + '_' + id;
         if (this.getModuleCashService().includes(serviceName)) {
-            if (this.cachApiResult[serviceNameKay]?.isSuccess && this.cachApiCallDate[serviceNameKay]) {
-                if ((new Date().getTime() - this.cachApiCallDate[serviceNameKay].getTime()) < this.cashApiSeconds)
-                    return of(this.cachApiResult[serviceNameKay]);
-                this.cachApiResult[serviceNameKay] = null;
-            }
-            while (this.cachApiCallDate[serviceNameKay] && (new Date().getTime() - this.cachApiCallDate[serviceNameKay].getTime()) < this.cashApiSeconds) {
-                if (this.cachApiResult[serviceNameKay]?.isSuccess)
-                    return of(this.cachApiResult[serviceNameKay]);
-            }
-            this.cachApiCallDate[serviceNameKay] = new Date();
+            if (this.cashApiIsValid(serviceNameKay))
+                return of(this.cachApiResult[serviceNameKay]);
         }
         //! optimaze call api
         // this.loadingStatus=true;
@@ -1700,8 +1701,10 @@ class ApiCmsServerBase extends ApiServerBase {
         // catchError(this.handleError)
         map((ret) => {
             //! optimaze call api
-            if (this.getModuleCashService().includes(serviceName))
+            if (this.getModuleCashService().includes(serviceName)) {
                 this.cachApiResult[serviceNameKay] = ret;
+                this.cachApiResult[serviceNameKay].dateResult = new Date();
+            }
             //! optimaze call api
             return this.errorExceptionResultCheck(ret);
         }));
@@ -2153,13 +2156,8 @@ class CoreEnumService extends ApiServerBase {
         const serviceName = 'ServiceRecordStatusEnum';
         const serviceNameKay = serviceName;
         if (this.getModuleCashService().includes(serviceName)) {
-            if (this.cachApiResult[serviceNameKay]?.isSuccess)
+            if (this.cashApiIsValid(serviceNameKay))
                 return of(this.cachApiResult[serviceNameKay]);
-            while (this.cachApiCallDate[serviceNameKay] && (new Date().getTime() - this.cachApiCallDate[serviceNameKay].getTime()) < this.cashApiSeconds) {
-                if (this.cachApiResult[serviceNameKay]?.isSuccess)
-                    return of(this.cachApiResult[serviceNameKay]);
-            }
-            this.cachApiCallDate[serviceNameKay] = new Date();
         }
         //! optimaze call api
         return this.http
@@ -2170,7 +2168,10 @@ class CoreEnumService extends ApiServerBase {
         // catchError(this.handleError)
         map((ret) => {
             //! optimaze call api
-            this.cachApiResult[serviceName] = ret;
+            if (this.getModuleCashService().includes(serviceName)) {
+                this.cachApiResult[serviceNameKay] = ret;
+                this.cachApiResult[serviceNameKay].dateResult = new Date();
+            }
             //! optimaze call api
             return this.errorExceptionResultCheck(ret);
         }));