biz9-logic 2.0.7 → 2.0.10

package/biz9_config

@@ -1,4 +1,4 @@
-VERSION='2.0.7'
+VERSION='2.1.0'
 TITLE='BiZ9-Logic';
 REPO='git@github.com:biz9framework/biz9-logic.git';
 BRANCH='main';

package/index.js

@@ -5,58 +5,48 @@ License GNU General Public License v3.0
 Description: BiZ9 Framework: Logic-JS
 */
 const { get_new_item_main,get_data_config_main,get_cloud_url_main,get_biz_item_main,get_cloud_filter_obj_main,get_title_url_main } = require('./main');
-const { get_biz9_config  }= require('biz9-scriptz');
-const biz9_config_file = get_biz9_config();
-class Item {
-    static get_new = (data_type,id) => {
+class Logic {
+    static get_new_item = (data_type,id) => {
         return get_new_item_main(data_type,id);
     };
-    static get_biz = (biz9_config,item,options)=>{
+    static get_biz_item = (biz9_config,item,options)=>{
         return get_biz_item_main(biz9_config,item,options);
     }
-}
-class Cloud {
-    static get_url = (action_url)=>{
-        return get_cloud_url_main(biz9_config_file.APP_TITLE_ID,biz9_config_file.CLOUD_URL,biz9_config_file.CLOUD_PORT_ID,action_url);
+    static get_url = (biz9_config,action_url,params)=>{
+        return get_cloud_url_main(biz9_config.APP_TITLE_ID,biz9_config.URL,action_url,params);
     }
-    static get_url_action_connect = () => {
+    static get_url_action_connect = (biz9_config) => {
         let action_url= "main/test/connect/";
-        return get_cloud_url_main(biz9_config_file.APP_TITLE_ID,biz9_config_file.CLOUD_URL,biz9_config_file.CLOUD_PORT_ID,action_url);
+        return get_cloud_url_main(biz9_config.APP_TITLE_ID,biz9_config.URL,action_url,null);
     };
-    static get_url_action_update_item = (data_type,id) => {
+    static get_url_action_update_item = (biz9_config,data_type,id) => {
         let action_url= "main/crud/update/"+data_type + "/" + id;
-        return get_cloud_url_main(biz9_config_file.APP_TITLE_ID,biz9_config_file.CLOUD_URL,biz9_config_file.CLOUD_PORT_ID,action_url);
+        return get_cloud_url_main(biz9_config.APP_TITLE_ID,biz9_config.URL,action_url,null);
     };
-    static get_url_action_get_item = (data_type,id) => {
+    static get_url_action_get_item = (biz9_config,data_type,id) => {
         let action_url= "main/crud/get/"+data_type + "/" + id;
-        return get_cloud_url_main(biz9_config_file.APP_TITLE_ID,biz9_config_file.CLOUD_URL,biz9_config_file.CLOUD_PORT_ID,action_url);
+        return get_cloud_url_main(biz9_config.APP_TITLE_ID,biz9_config.URL,action_url,null);
     };
-    static get_url_action_delete_item = (data_type,id) => {
+    static get_url_action_delete_item = (biz9_config,data_type,id) => {
         let action_url= "main/crud/delete/"+data_type + "/" + id;
-        return get_cloud_url_main(biz9_config_file.APP_TITLE_ID,biz9_config_file.CLOUD_URL,biz9_config_file.CLOUD_PORT_ID,action_url);
+        return get_cloud_url_main(biz9_config.APP_TITLE_ID,biz9_config.URL,action_url,null);
     };
-    static get_url_action_get_list = (data_type) => {
+    static get_url_action_get_list = (biz9_config,data_type) => {
         let action_url= "main/crud/get_list/"+data_type;
-        return get_cloud_url_main(biz9_config_file.APP_TITLE_ID,biz9_config_file.CLOUD_URL,biz9_config_file.CLOUD_PORT_ID,action_url);
+        return get_cloud_url_main(biz9_config.APP_TITLE_ID,biz9_config.URL,action_url,null);
     };
-    static get_url_action_delete_list = (data_type) => {
+    static get_url_action_delete_list = (biz9_config,data_type) => {
         let action_url= "main/crud/delete_list/"+data_type;
-        return get_cloud_url_main(biz9_config_file.APP_TITLE_ID,biz9_config_file.CLOUD_URL,biz9_config_file.CLOUD_PORT_ID,action_url);
+        return get_cloud_url_main(biz9_config.APP_TITLE_ID,biz9_config.URL,action_url,null);
     };
-    static get_url_action_update_list = (data_type) => {
+    static get_url_action_update_list = (biz9_config,data_type) => {
         let action_url= "main/crud/update_list/"+data_type;
-        return get_cloud_url_main(biz9_config_file.APP_TITLE_ID,biz9_config_file.CLOUD_URL,biz9_config_file.CLOUD_PORT_ID,action_url);
+        return get_cloud_url_main(biz9_config.APP_TITLE_ID,biz9_config.URL,action_url,null);
     };
-    static get_filter_obj = (data_type,filter,sort_by,page_current,page_size)=>{
+    static get_filter_obj = (biz9_config,data_type,filter,sort_by,page_current,page_size)=>{
         return get_cloud_filter_obj_main(data_type,filter,sort_by,page_current,page_size);
     }
-}
-const get_data_config = (biz9_config,query) => {
-        return get_data_config_main(biz9_config,query);
 };
 module.exports = {
-    biz9_config_file,
-    Cloud,
-    Item,
-    get_data_config,
+    Logic
 };

package/main.js

@@ -7,6 +7,8 @@ Description: BiZ9 Framework: Logic - Main
 
 const moment = require('moment');
 const { DateTime } = require('biz9-utility');
+const fs = require('fs');
+const biz9_config_local=__dirname+"/../../"+"biz9_config";
 
 const get_cloud_filter_obj_main = (data_type,filter,sort_by,page_current,page_size) => {
     return {data_type:data_type,filter:filter,sort_by:sort_by,page_current:page_current,page_size:page_size};
@@ -18,15 +20,12 @@ const get_new_item_main = (data_type,id) => {
     }
     return {data_type:data_type,id:id};
 }
-const get_cloud_url_main = (app_title_id,domain_url,port_id,action_url) =>{
-    var app_title_id_url='?app_title_id='+app_title_id;
-    return domain_url+":"+port_id+"/"+action_url+app_title_id_url;
-}
-const get_data_config_main = (biz9_config,query) =>{
-    if(biz9_config.SERVICE_HOST_TYPE == 'multiple'){
-        biz9_config.APP_TITLE_ID=query.app_title_id;
+const get_cloud_url_main = (app_title_id,domain_url,action_url,params) =>{
+    if(!params){
+        params='';
     }
-    return biz9_config;
+    var app_title_id_url='?app_title_id='+app_title_id;
+    return domain_url+"/"+action_url+app_title_id_url + params;
 }
 const get_biz_item_main=(biz9_config,item,options) =>{
     //option
@@ -120,7 +119,6 @@ module.exports = {
     get_new_item_main,
     get_cloud_url_main,
     get_cloud_filter_obj_main,
-    get_data_config_main,
     get_title_url_main,
     get_biz_item_main
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "2.0.7",
+  "version": "2.0.10",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -9,11 +9,9 @@
   "license": "MIT",
   "dependencies": {
     "async-series": "^0.0.1",
-    "biz9-scriptz": "^5.2.19",
-    "biz9-utility": "^2.0.14",
-    "i": "^0.3.7",
-    "jest": "^29.7.0",
-    "npm": "^11.1.0"
+    "biz9-scriptz": "^5.5.3",
+    "biz9-utility": "^2.0.24",
+    "jest": "^29.7.0"
   },
   "repository": {
     "type": "git",

package/test.js

@@ -1,7 +1,8 @@
+const path = require('path');
 const series = require('async-series');
+const {Logic} = require('./');
 const {Log,Test} = require('biz9-utility');
-const { Item, Cloud  }= require('./');
-const { get_biz9_config  }= require('biz9-scriptz');
+const { Scriptz  }= require('biz9-scriptz');
 
 /* --- TEST CONFIG START --- */
 //const ID='0';
@@ -9,7 +10,7 @@ const ID='f23c2372-df8e-4c09-a919-677fe32ba0bb';
 const APP_TITLE_ID='cool_bean';
 const DATA_TYPE='dt_blank';
 const PORT_ID="1901";
-const CLOUD_URL="http://localhost:"+PORT_ID;
+const URL="http://localhost:"+PORT_ID;
 const biz9_config ={
     SERVICE_HOST_TYPE:'multiple',
     APP_TITLE_ID:APP_TITLE_ID,
@@ -25,81 +26,93 @@ const biz9_config ={
 };
 /* --- TEST DATA CONFIG END --- */
 
-
 describe("connect", () => {
     it("_connect", () => {
         series([
             function(call) {
                 console.log('GET-BIZ9-CONFIG-FILE-START');
-                let biz9_config = get_biz9_config();
-                console.log(biz9_config);
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
+                Log.w('APP_TITLE_ID',biz9_config.APP_TITLE_ID);
+                Log.w('APP_TITLE',biz9_config.TITLE);
+                Log.w('URL',biz9_config.URL);
                 console.log('GET-BIZ9-CONFIG-FILE-SUCCESS');
                 call()
             },
+            function(call) {
+                console.log('GET-URL-START');
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
+                let action_url = 'test_get_url_action';
+                let params = '&myparam1=p1&myparam2=p2'
+                let cloud_url = Logic.get_url(biz9_config,action_url,params);
+                Log.w('connect_url',cloud_url);
+                console.log('GET-URL-SUCCESS');
+                call()
+            },
             function(call) {
                 console.log('CONNECT-START');
-                let cloud_url = Cloud.get_url_action_connect();
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
+                let cloud_url = Logic.get_url_action_connect(biz9_config);
                 Log.w('connect_url',cloud_url);
                 console.log('CONNECT-SUCCESS');
                 call()
             },
             function(call) {
                 console.log('GET_URL-ACTION-UPDATE-ITEM-START');
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
                 let data_type = 'dt_blank';
                 let id = 0;
-                let cloud_url = Cloud.get_url_action_update_item(data_type,id);
+                let cloud_url = Logic.get_url_action_update_item(biz9_config,data_type,id);
                 Log.w('get_url_action_update_item',cloud_url);
                 console.log('GET_URL-ACTION-UPDATE-ITEM-SUCCESS');
                 call()
             },
-
             function(call) {
                 console.log('GET_URL-ACTION-GET-ITEM-START');
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
                 let data_type = 'dt_blank';
                 let id = 0;
-                let cloud_url = Cloud.get_url_action_get_item(data_type,id);
+                let cloud_url = Logic.get_url_action_get_item(biz9_config,data_type,id);
                 Log.w('get_url_action_get_item',cloud_url);
                 console.log('GET_URL-ACTION-GET-ITEM-SUCCESS');
                 call()
             },
-
             function(call) {
                 console.log('GET_URL-ACTION-DELETE-ITEM-START');
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
                 let data_type = 'dt_blank';
                 let id = 0;
-                let cloud_url = Cloud.get_url_action_delete_item(data_type,id);
+                let cloud_url = Logic.get_url_action_delete_item(biz9_config,data_type,id);
                 Log.w('get_url_action_delete_item',cloud_url);
                 console.log('GET_URL-ACTION-DELETE-ITEM-SUCCESS');
                 call()
             },
-
             function(call) {
                 console.log('GET_URL-ACTION-GET-LIST-ITEM-START');
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
                 let data_type = 'dt_blank';
-                let cloud_url = Cloud.get_url_action_get_list(data_type);
+                let cloud_url = Logic.get_url_action_get_list(biz9_config,data_type);
                 Log.w('get_url_action_get_list_item',cloud_url);
                 console.log('GET_URL-ACTION-GET-LIST-ITEM-SUCCESS');
                 call()
             },
-
             function(call) {
                 console.log('GET_URL-ACTION-DELETE-LIST-ITEM-START');
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
                 let data_type = 'dt_blank';
-                let cloud_url = Cloud.get_url_action_delete_list(data_type);
+                let cloud_url = Logic.get_url_action_delete_list(biz9_config,data_type);
                 Log.w('get_url_action_delete_list_item',cloud_url);
                 console.log('GET_URL-ACTION-DELETE-LIST-ITEM-SUCCESS');
                 call()
             },
-
             function(call) {
                 console.log('GET_URL-ACTION-UPDATE-LIST-ITEM-START');
+                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
                 let data_type = 'dt_blank';
-                let cloud_url = Cloud.get_url_action_delete_list(data_type);
+                let cloud_url = Logic.get_url_action_delete_list(biz9_config,data_type);
                 Log.w('get_url_action_delete_list_item',cloud_url);
                 console.log('GET_URL-ACTION-UPDATE-LIST-ITEM-SUCCESS');
                 call()
             },
-
             function(call) {
                 console.log('GET_FILTER-OBJECT-START');
                 let data_type = 'dt_blank';
@@ -107,14 +120,14 @@ describe("connect", () => {
                 let sort_by = {title:-1};
                 let page_current = 0;
                 let page_size = 15;
-                let filter_obj = Cloud.get_filter_obj(data_type,filter,sort_by,page_current,page_size);
+                let filter_obj = Logic.get_filter_obj(data_type,filter,sort_by,page_current,page_size);
                 Log.w('get_url_action_filter_obj',filter_obj);
                 console.log('GET_FILTER-OBJECT-SUCCESS');
                 call()
             },
             function(call) {
                 console.log('GET-NEW-ITEM-START');
-                var new_item = Item.get_new(DATA_TYPE,0);
+                var new_item = Logic.get_new_item(DATA_TYPE,0);
                 console.log(new_item);
                 console.log('GET-NEW-ITEM-SUCCESS');
                 call()
@@ -129,7 +142,7 @@ describe("connect", () => {
                 item_test.value_2 = 'my_value_2';
                 item_test.field_3 = 'my_field_3';
                 item_test.value_3 = 'my_value_3';
-                let item_biz = Item.get_biz(biz9_config,item_test,{get_photo:true,get_date:true,get_count:true,get_biz_map:true});
+                let item_biz = Logic.get_biz_item(biz9_config,item_test,{get_photo:true,get_date:true,get_count:true,get_biz_map:true});
                 console.log(item_biz);
                 console.log('SET-ITEM-BIZ-SUCCESS');
                 call();