biz9-logic 10.0.48 → 10.0.57

package/biz9_config

@@ -1,7 +1,7 @@
-VERSION='10.4.8'
+VERSION='10.5.8'
 TITLE='BiZ9-Logic';
 REPO='git@github.com:biz9framework/biz9-logic.git';
-BRANCH='10.4.6'
+BRANCH='main'
 APP_ID='test_app_id';
 URL="http://localhost";
 

package/index.js

@@ -5,7 +5,7 @@ License GNU General Public License v3.0
 Description: BiZ9 Framework: Logic-JS
 */
 const moment = require('moment');
-const {Str,Num,Obj} = require('biz9-utility');
+const {Str,Num,Obj,Log} = require('biz9-utility');
 class Message {
 	static SUCCESS="Success";
 	static CONFIRM="Are You Sure?";
@@ -93,7 +93,6 @@ class Type {
 	static FIELD_PARAM = 'param';
 	static FIELD_PARENT_DATA_TYPE='parent_data_type';
 	static FIELD_PARENT_ID='parent_id';
-	static FIELD_ROLE = 'role';
 	static FIELD_SOURCE='source';
 	static FIELD_SOURCE_DATA_TYPE='source_data_type';
 	static FIELD_SOURCE_KEY='source_key';
@@ -118,6 +117,7 @@ class Type {
 	static FIELD_USER_LAST_NAME = 'last_name';
 	static FIELD_USER_USERNAME = 'username';
 	static FIELD_USER_PASSWORD = 'password';
+	static FIELD_USER_ROLE = 'role';
 	static FIELD_USER_STATE = 'state';
 	static FIELD_VALUE = 'value';
 	static FIELD_WEBSITE = 'website';
@@ -1142,42 +1142,45 @@ class User_Logic {
 	};
 }
 class Data_Logic {
-	static get = (data_type,id,option) => {
-		return Data_Logic.get_new(data_type,id,option);
-	};
 	static get_new = (data_type,id,option) => {
-		let data = {data_type:data_type,id:id};
-		option = option ? option : {};
-		data = Field_Logic.get_base_option(data,option);
-		if(option.test){
+		return Data_Logic.get(data_type,id,option);
+	};
+	// --> options / test / test_blank / title / generate_title / count
+	static get = (data_type,id,option) => {
+		function get_test_data(data_type){
 			switch(data_type)
 			{
 				case Type.DATA_BLOG_POST:
-					data = Obj.merge(Blog_Post_Logic.get_test(),data);
+					return Blog_Post_Logic.get_test();
 					break;
 				case Type.DATA_SERVICE:
-					data = Obj.merge(Service_Logic.get_test(),data);
+					return Service_Logic.get_test();
 					break;
 				case Type.DATA_EVENT:
-					data = Obj.merge(Event_Logic.get_test(),data);
-					break;
+					return Event_Logic.get_test();
+					breaip
 				case Type.DATA_PRODUCT:
-					data = Obj.merge(Product_Logic.get_test(),data);
+					return Product_Logic.get_test();
 					break;
 				case Type.DATA_CONTENT:
 				case Type.DATA_CATEGORY:
 				case Type.DATA_BLANK:
-					data = Obj.merge(Blank_Logic.get_test(),data);
+					return Blank_Logic.get_test();
 					break;
 				case Type.DATA_USER:
-					data = Obj.merge(User_Logic.get_test(),data);
+					return User_Logic.get_test();
 					break;
 					default:
-					data = Obj.merge(Blank_Logic.get_test(),data);
-					data.data_type = data_type;
+					return Blank_Logic.get_test();
 					break;
 			}
 		}
+		let data = {data_type:data_type,id:id};
+		option = option ? option : {count:0};
+		data = Field_Logic.get_base_option(data,option);
+		if(option.test){
+			data = Obj.merge(get_test_data(data_type),data);
+		}
 		if(option.test_blank){
 			for(const field in data){
 				if(field != Type.FIELD_ID && field != Type.FIELD_DATA_TYPE){
@@ -1185,6 +1188,17 @@ class Data_Logic {
 				}
 			}
 		}
+		if(option.count>1){
+			let items = [];
+			for(let a = 0;a<option.count;a++){
+				let my_title = Type.get_data_type_by_type(data_type) + " " +Num.get_id(999);
+				let test_data = Obj.merge(data,get_test_data(data.data_type));
+				test_data[Type.FIELD_TITLE] = my_title;
+				test_data[Type.FIELD_TITLE_URL] = Str.get_title_url(my_title);
+				items.push(test_data);
+			}
+			data = items;
+		}
 		return data;
 	};
 	static get_search = (data_type,filter,sort_by,page_current,page_size) => {
@@ -1195,8 +1209,9 @@ class Data_Logic {
 		let type  = option.type ? option.type : Type.TITLE_ITEMS;
 		let field = option.field ? option.field : {};
 		let title = option.title ? option.title : {};
-		let image = option.image ? option.image : {count:0,sort_by:Type.TITLE_SORT_BY_ASC};
-		let page_current = option.page_current ? option.page_current : 0;
+		let image_show = option.image_show ? option.image_show : {};
+		let image = option.image ? option.image : {show:false};
+		let page_current = option.page_current ? option.page_current : 1;
 		let page_size = option.page_size ? option.page_size : 0;
 		return {type:type,field:field,title:title,image:image,page_current:page_current,page_size:page_size};
 	}
@@ -1208,7 +1223,7 @@ class Data_Logic {
 		parent_field = parent_field ? parent_field : parent_field;
 		let field = option.field ? option.field : {};
 		let title = option.title ? option.title : Str.get_title_url(Type.get_data_type_by_type(foreign_data_type,{plural:true}));
-		let page_current = option.page_current ? option.page_current : 0;
+		let page_current = option.page_current ? option.page_current : 1;
 		let page_size = option.page_size ? option.page_size : 0;
 		return {type:type,foreign_data_type:foreign_data_type,foreign_field:foreign_field,parent_field:parent_field,type:type,field:field,title:title,page_current:page_current,page_size:page_size};
 	}
@@ -1428,11 +1443,7 @@ class Url {
 	//cms
 	static CMS_DEMO_POST="cms/demo_post";
 	static CMS_GET="cms/get";
-	static CMS_POST="cms/post";
-	static CMS_ITEM_PARENT_TOP_TYPE_CATEGORY="cms/item_parent_top_type_category";
 	static CMS_SEARCH_ITEM_TYPE_CATEGORY="cms/search_item_type_category";
-	//content
-	static CONTENT="item/content";
 	//crud
 	static COPY="main/crud/copy";
 	static DELETE="main/crud/delete";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "10.0.48",
+  "version": "10.0.57",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/test.js

@@ -37,7 +37,7 @@ describe("connect", () => {
                 //let join = App_Logic.get_join({},'','',{});
                 // -->
                 //let data = Data_Logic.get(Type.DATA_BLANK,0,{test:true});
-                let data = Data_Logic.get(Type.DATA_PRODUCT,0,{test:true,parent:parent,data:{title:'cool',title_url:'cool'}});
+                let data = Data_Logic.get(Type.DATA_PRODUCT,0,{test:true,count:1,parent:parent,data:{title:'cool',title_url:'cool'}});
                 //let data = Data_Logic.get(Type.DATA_BLANK,0,{title:'cool bean',data:{field_1:'field_1',field_2:'field_2'}});
                 //let data = Data_Logic.get(Type.DATA_BLANK,0,{title:'cool bean'});
                 //let data = Data_Logic.get(Type.DATA_BLANK,0,{data:{field_1:'field_1',field_2:'field_2'}});