system store - load from core - two steps publish - PR notes 3

Signed-off-by: Amit Prinz Setter <[email protected]>

Author: alphaprinz

src/api/server_inter_process_api.js

@@ -18,7 +18,7 @@ module.exports = {
                 type: 'object',
                 properties: {
                     since: { idate: true },
-                    load_from_core_step: {
+                    load_source: {
                         type: 'string',
                         enum: ['DB', 'CORE']
                     }

src/server/common_services/server_inter_process.js

@@ -19,7 +19,7 @@ const server_rpc = require('../server_rpc');
 async function load_system_store(req) {
     await system_store.load(
         req?.rpc_params?.since,
-        req?.rpc_params?.load_from_core_step.toUpperCase()
+        req?.rpc_params?.load_source.toUpperCase()
     );
 }
 

src/server/system_services/system_store.js

@@ -417,21 +417,21 @@ class SystemStore extends EventEmitter {
         }
     }
 
-    async load(since, load_from_core_step) {
+    async load(since, load_source) {
         //if endpoints load from core, and this load is for core
-        //(ie, the first load_system_store() out of two with load_from_core_step === 'CORE'),
+        //(ie, the first load_system_store() out of two with load_source === 'CORE'),
         //then endpoints skip it.
         //endpoints will be updated in the next load_system_store()
         //once core's in memory system store is updated.
-        if (load_from_core_step && (this.source !== load_from_core_step)) {
+        if (load_source && (this.source !== load_source)) {
             return;
         }
 
         // serializing load requests since we have to run a fresh load after the previous one will finish
         // because it might not see the latest changes if we don't reload right after make_changes.
         return this._load_serial.surround(async () => {
             try {
-                dbg.log3('SystemStore: loading ... this.last_update_time  =', this.last_update_time, ", since =", since, "load_from_core_step =", load_from_core_step);
+                dbg.log3('SystemStore: loading ... this.last_update_time  =', this.last_update_time, ", since =", since, "load_source =", load_source);
 
                 // If we get a load request with an timestamp older then our last update time
                 // we ensure we load everyting from that timestamp by updating our last_update_time.
@@ -687,7 +687,7 @@ class SystemStore extends EventEmitter {
                     method_api: 'server_inter_process_api',
                     method_name: 'load_system_store',
                     target: '',
-                    request_params: { since: last_update, load_from_core_step: SOURCE.DB }
+                    request_params: { since: last_update, load_source: SOURCE.DB }
                 });
 
                 //if endpoints are loading system store from core, we need to wait until
@@ -699,7 +699,7 @@ class SystemStore extends EventEmitter {
                     method_api: 'server_inter_process_api',
                     method_name: 'load_system_store',
                     target: '',
-                    request_params: { since: last_update, load_from_core_step: SOURCE.CORE }
+                    request_params: { since: last_update, load_source: SOURCE.CORE }
                 });
             }
         }

src/test/integration_tests/db/test_system_store.js

@@ -5,7 +5,7 @@ const mocha = require('mocha');
 const assert = require('assert');
 const coretest = require('../../utils/coretest/coretest');
 const db_client = require('../../../util/db_client');
-const { SystemStore } = require('../../../server/system_services/system_store');
+const { SystemStore, SOURCE } = require('../../../server/system_services/system_store');
 
 // setup coretest first to prepare the env
 coretest.setup();
@@ -142,12 +142,12 @@ mocha.describe('system_store', function() {
     mocha.it("Load from core", async function() {
 
         const system_store_from_core = new SystemStore({
-            source: 'CORE',
+            source: SOURCE.CORE,
             skip_define_for_tests: true
         });
 
         const from_db = await system_store.load();
-        const from_core = await system_store_from_core.load(undefined, 'CORE');
+        const from_core = await system_store_from_core.load(undefined, SOURCE.CORE);
 
         assert.deepStrictEqual(from_db.data, from_core.data);