spice-js 2.6.19 → 2.6.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.6.19",
+  "version": "2.6.21",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -436,17 +436,18 @@ export default class SpiceModel {
         if (args.skip_hooks != true) {
           await this.run_hook(args, "get", "before");
         }
-        let key = `${this.type}::${args.id}`;
+        let key = `get::${this.type}::${args.id}`;
         let results = {};
         if (this.shouldUseCache(this.type)) {
           let cached_results = await this.getCacheProviderObject(this.type).get(
             key
           );
-          results = cached_results?.value;
 
+          results = cached_results?.value;
           if (
             cached_results?.value == undefined ||
-            (await this.shouldForceRefresh(cached_results))
+            (await this.shouldForceRefresh(cached_results)) ||
+            this.type == "workflow"
           ) {
             results = await this.database.get(args.id);
             await this.getCacheProviderObject(this.type).set(
@@ -511,7 +512,7 @@ export default class SpiceModel {
         await this.run_hook(this, "list", "before");
       }
       _.remove(args.ids, (o) => o == undefined);
-      let key = `${this.type}::${_.join(args.ids, "|")}`;
+      let key = `multi-get::${this.type}::${_.join(args.ids, "|")}`;
       let results = [];
       if (args.ids.length > 0) {
         if (this.shouldUseCache(this.type)) {
@@ -890,7 +891,7 @@ export default class SpiceModel {
         return str.replace(/[^a-zA-Z0-9]/g, "");
       }
       let key = removeSpaceAndSpecialCharacters(
-        `${this.type}::${args._join}::${query}::${args.limit}::${args.offset}::${args.sort}::${args.do_count}::${args.statement_consistent}::${args.columns}::${args.is_full_text}::${args.is_custom_query}`
+        `list::${this.type}::${args._join}::${query}::${args.limit}::${args.offset}::${args.sort}::${args.do_count}::${args.statement_consistent}::${args.columns}::${args.is_full_text}::${args.is_custom_query}`
       );
 
       let results;
@@ -1088,6 +1089,7 @@ export default class SpiceModel {
           ...this[_args],
           skip_cache: this[_skip_cache],
         }).getMulti({
+          skip_hooks: true,
           ids: ids,
         });
       })
@@ -1145,6 +1147,7 @@ export default class SpiceModel {
           ...this[_args],
           skip_cache: this[_skip_cache],
         }).getMulti({
+          skip_hooks: true,
           ids: ids,
         });
       })