biz9-logic 4.8.32 → 4.8.41

package/biz9_config

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

package/index.js

@@ -6,7 +6,7 @@ Description: BiZ9 Framework: Logic-JS
 */
 const moment = require('moment');
 const { get_new_item_main,get_data_config_main,get_cloud_url_main,get_biz_item_main,get_cloud_filter_obj_main,get_new_full_item_main } = require('./main');
-const { Log,Str,DateTime,Number } = require('biz9-utility');
+const { Log,Str,DateTime,Number,Obj } = require('/home/think2/www/doqbox/biz9-framework/biz9-utility/code');
 class Message {
 	static SUCCESS="Update Success";
 	static LOGIN_GOOD="Login Success";
@@ -21,12 +21,8 @@ class TemplateType {
 }
 class Item_Logic {
 	static get_test = (title,data_type,id,option)=>{
-		if(!data_type){
-			data_type=DataType.BLANK;
-		}
-		if(!id){
-			id=0;
-		}
+		data_type = data_type ? data_type : DataType.BLANK;
+		id = id ? id : 0;
 		option = Field_Logic.get_option(data_type,option?option:{});
 		let item = DataItem.get_new_full_item(
 			DataItem.get_new(data_type,0),
@@ -47,6 +43,9 @@ class Item_Logic {
 		}
 		return item_list;
 	}
+	static get_search = (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};
+	}
 }
 class Template_Logic {
 	static get_test = (title,option) =>{
@@ -141,11 +140,21 @@ class Product_Logic {
 			DataItem.get_new(DataType.PRODUCT,0),
 			DataItem.get_new(DataType.PRODUCT,0),
 			Field_Logic.get_test(title,option));
-		product.cost = String(Number.get_id()) + "." + String(Number.get_id());
-		product.old_cost = String(Number.get_id()) + "." + String(Number.get_id());
-		product.type = "Type "+String(Number.get_id());
-		product.sub_type = "Sub Type "+String(Number.get_id());
-		product.stock = String(Number.get_id(3-1));
+
+		if(option.get_blank ==false){
+			product.cost = String(Number.get_id(999)) + "." + String(Number.get_id(99));
+			product.old_cost = String(Number.get_id(999)) + "." + String(Number.get_id(99));
+			product.type = "Type "+String(Number.get_id());
+			product.sub_type = "Sub Type "+String(Number.get_id());
+			product.stock = String(Number.get_id(3-1));
+		}else{
+			product.cost = "";
+			product.old_cost = "";
+			product.type = "";
+			product.sub_type = "";
+			product.stock = "";
+		}
+
 		if(option.get_item){
 			product.items = Sub_Item_Logic.get_test_item_list(product,product,option);
 		}
@@ -183,8 +192,8 @@ class Service_Logic {
 			DataItem.get_new(DataType.SERVICE,0),
 			DataItem.get_new(DataType.SERVICE,0),
 			Field_Logic.get_test(title,option));
-		service.cost = String(Number.get_id()) + "." + String(Number.get_id());
-		service.old_cost = String(Number.get_id()) + "." + String(Number.get_id());
+		service.cost = String(Number.get_id(999)) + "." + String(Number.get_id(99));
+		service.old_cost = String(Number.get_id(999)) + "." + String(Number.get_id(99));
 		service.type = "Type "+String(Number.get_id());
 		service.sub_type = "Sub Type "+String(Number.get_id());
 		service.stock = String(Number.get_id(3-1));
@@ -274,7 +283,7 @@ class Blog_Post_Logic {
 		option = Field_Logic.get_option(DataType.BLOG_POST,option?option:{});
 		let item_list = [];
 		for(let a=0;a<option.blog_post_count;a++){
-			item_list.push(Blog_Post_Logic.get_test("Blog_Post " +String(parseInt(a+1)),option));
+			item_list.push(Blog_Post_Logic.get_test("Blog Post " +String(parseInt(a+1)),option));
 		}
 		return item_list;
 	}
@@ -286,7 +295,7 @@ class Blog_Post_Logic {
 		for(let a=0;a<category_list.length;a++){
 			for(let b=0;b<option.blog_post_count;b++){
 				item_count++;
-				let blog_post = Blog_Post_Logic.get_test("Blog_Post "+String(parseInt(b+1)),option);
+				let blog_post = Blog_Post_Logic.get_test("Blog Post "+String(parseInt(b+1)),option);
 				blog_post.category = category_list[Number.get_id(category_list.length+1)].title;
 				blog_post_list.push(blog_post);
 			}
@@ -302,8 +311,8 @@ class Event_Logic {
 			DataItem.get_new(DataType.EVENT,0),
 			DataItem.get_new(DataType.EVENT,0),
 			Field_Logic.get_test(title,option));
-		event.cost = String(Number.get_id()) + "." + String(Number.get_id());
-		event.old_cost = String(Number.get_id()) + "." + String(Number.get_id());
+		event.cost = String(Number.get_id(999)) + "." + String(Number.get_id(99));
+		event.old_cost = String(Number.get_id(999)) + "." + String(Number.get_id(99));
 		event.date = String(String(Number.get_id(2030)) + "-" + String(Number.get_id(13)) + "-" + String(Number.get_id(30))).trim();
 		event.time = String(Number.get_id(24)) + ":" + String(Number.get_id(59));
 		event.website = "Website "+String(Number.get_id());
@@ -344,12 +353,8 @@ class Field_Logic {
 	static get_test = (title,option) =>{
 		let sub_note = "Sub Note "+String(Number.get_id());
 		let note = "Note "+String(Number.get_id());
-		if(!option){
-			option= {};
-		}
-		if(!option.category_title){
-			option.category_title = 'Category '+String(Number.get_id());
-		}
+		option = option ? option : {};
+		option.category_title = !Str.check_is_null(option.category_title) ? option.category_title : 'Category '+String(Number.get_id());
 		if(option.get_blank == true){
 			title = "";
 			sub_note = "";
@@ -384,113 +389,83 @@ class Field_Logic {
 		return item;
 	};
 	static get_option_admin(req){
-    	let option = {};
-		option.category_product_count = req.query.category_product_count?parseInt(req.query.category_product_count): 9;
-    option.product_count = req.query.product_count?parseInt(req.query.product_count): 19;
-    option.category_blog_post_count = req.query.category_blog_post_count?parseInt(req.query.category_blog_post_count): 9;
-    option.blog_post_count = req.query.blog_post_count?parseInt(req.query.blog_post_count): 19;
-    option.category_service_count = req.query.category_service_count?parseInt(req.query.category_service_count): 9;
-    option.service_count = req.query.service_count?parseInt(req.query.service_count): 19;
-    option.category_event_count = req.query.category_event_count?parseInt(req.query.category_event_count): 9;
-    option.event_count = req.query.event_count?parseInt(req.query.event_count): 19;
+		let option = {};
+		option.value_count = req.query.value_count ? req.query.value_count : 19;
+		option.section_count = req.query.section_count ? req.query.section_count : 19;
+		option.question_count = req.query.question_count ? req.query.question_count : 19;
+
+		option.get_blog_post = req.query.get_blog_post ? req.query.get_blog_post : false;
+		option.get_category_blog_post = req.query.get_category_blog_post ? req.query.get_category_blog_post : false;
+		option.category_blog_post_count = req.query.category_blog_post_count ? req.query.category_blog_post_count : 9;
+		option.blog_post_count = req.query.blog_post_count ? req.query.blog_post_count : 9;
+
+
+		option.get_product = req.query.get_product ? req.query.get_product : false;
+		option.get_category_product = req.query.get_category_product ? req.query.get_category_product : false;
+		option.category_product_count = req.query.category_product_count ? req.query.category_product_count : 9;
+		option.product_count = req.query.product_count ? req.query.product_count : 19;
+
+		option.get_service = req.query.get_service ? req.query.get_service : false;
+		option.get_category_service = req.query.get_category_service ? req.query.get_category_service : false;
+		option.category_service_count = req.query.category_service_count ? req.query.category_service_count : 9;
+		option.service_count = req.query.service_count ? req.query.service_count : 19;
+
+		option.get_event = req.query.get_event ? req.query.get_event : false;
+		option.get_category_event = req.query.get_category_event ? req.query.get_category_event : false;
+		option.category_event_count = req.query.category_event_count ? req.query.category_event_count : 9;
+		option.event_count = req.query.event_count ? req.query.event_count : 19;
+
+			option.get_admin = req.query.get_admin ? req.query.get_admin : false;
+		option.get_business = req.query.get_business ? req.query.get_business : false;
+		option.get_faq = req.query.get_faq ? req.query.get_faq : false;
+		option.get_template = req.query.get_template ? req.query.get_template : false;
+		option.get_page = req.query.get_page ? req.query.get_page : false;
+		option.get_team = req.query.get_team ? req.query.get_team : false;
 
-    option.get_admin = req.query.get_admin?String(req.query.get_admin)=='true': false;
-    option.get_business = req.query.get_business?String(req.query.get_business)=='true': false;
-    option.get_blog_post = req.query.get_blog_post?String(req.query.get_blog_post)=='true': false;
-    option.get_event = req.query.get_event?String(req.query.get_event)=='true': false;
-    option.get_faq = req.query.get_faq?String(req.query.get_faq)=='true': false;
-    option.get_template = req.query.get_template?String(req.query.get_template)=='true': false;
-    option.get_page = req.query.get_page?String(req.query.get_page)=='true': false;
-    option.get_product = req.query.get_product?String(req.query.get_product)=='true': false;
-    option.get_service = req.query.get_service?String(req.query.get_service)=='true': false;
-    option.get_team = req.query.get_team?String(req.query.get_team)=='true': false;
 		return option;
 	}
 	static get_option(data_type,option){
-		if(!data_type){
-			data_type = DataType.BLANK;
-		}
-		if(!option){
-			option = {get_value:false,get_item:false,get_photo:false,item_count:9,value_count:9};
-		}
-		if(!option.get_photo){
-			option.get_photo=false;
-		}
-		if(!option.get_value){
-			option.get_value=false;
-		}
-		if(!option.value_count){
-			option.value_count=9;
-		}
-		if(!option.section_count){
-			option.section_count=9;
-		}
-		if(!option.get_item){
-			option.get_item=false;
-		}
-		if(!option.item_count){
-			option.item_count=9;
-		}
-		if(!option.category_count){
-			option.category_count=9;
-		}
-		if(!option.category_title){
-			option.category_title=null;
-		}
-		if(!option.get_blank){
-			option.get_blank=false;
-		}
+		data_type = data_type ? data_type : DataType.BLANK;
+		option = !Obj.check_is_empty(option) ? option : {get_value:false,get_item:false,get_photo:false,item_count:9,value_count:9};
+		option.get_photo = option.get_photo ? true : false;
+		option.get_value = option.get_value ? true : false;
+		option.get_item = option.get_item ? true : false;
+		option.get_blank = option.get_blank ? true : false;
+		option.value_count = option.value_count ? option.value_count : 19;
+		option.section_count = option.section_count ? option.section_count : 19;
+		option.item_count = option.item_count ? option.item_count : 9;
+		option.category_count = option.category_count ? option.category_count : 9;
+		option.category_title = option.category_title ? option.category_title : "";
 		if(option.data_type==DataType.PAGE){
-			if(!option.page_count){
-				option.page_count=9;
-			}
-			if(!option.section_count){
-				option.section_count=9;
-			}
-			if(!option.get_section){
-				option.get_section=false;
-			}
+			option.page_count = option.page_count ? option.page_count : 9;
+			option.section_count = option.section_count ? option.section_count : 9;
+			option.get_section = option.get_section ? true : false;
 		}
 		if(option.data_type==DataType.PRODUCT){
-			if(!option.product_count){
-				option.product_count=9;
-			}
+			option.product_count = option.product_count ? option.product_count : 9;
 		}
 		if(data_type==DataType.SERVICE){
-			if(!option.service_count){
-				option.service_count=9;
-			}
+			option.service_count = option.service_count ? option.service_count : 9;
 		}
 		if(data_type==DataType.BLOG_POST){
-			if(!option.blog_post_count){
-				option.blog_post_count=9;
-			}
+			option.blog_post_count = option.blog_post_count ? option.blog_post_count : 9;
 		}
 		if(data_type==DataType.EVENT){
-			if(!option.event_count){
-				option.event_count=9;
-			}
+			option.event_count = option.event_count ? option.event_count : 9;
 		}
 		if(data_type==DataType.TEAM){
-			if(!option.get_member){
-				option.get_member=false;
-			}
-			if(!option.member_count){
-				option.member_count=9;
-			}
+			option.get_member = option.get_member ? true : false;
+			option.member_count = option.member_count ? option.member_count : 9;
 		}
 		if(data_type==DataType.FAQ){
-			if(!option.get_question){
-				option.get_question=false;
-			}
-			if(!option.question_count){
-				option.question_count=9;
-			}
+			option.get_question = option.get_question ? true : false;
+			option.question_count = option.question_count ? option.question_count : 9;
 		}
 		if(data_type==DataType.CONTENT){
-			if(!option.content_count){
-				option.content_count=9;
-			}
+			option.content_count = option.content_count ? option.content_count : 9;
+		}
+		if(data_type==DataType.SUB_ITEM){
+			option.item_count = option.item_count ? option.item_count : 9;
 		}
 		return option;
 	}
@@ -618,11 +593,7 @@ class PageType {
 }
 class DataType {
 	static get_title = (data_type) => {
-		if(!data_type){
-			return "";
-		}else{
-			return String(Str.get_title(data_type.replaceAll('_',' ').replaceAll('dt','').replace('biz',''))).trim();
-		}
+		return (!data_type) ? "" : String(Str.get_title(data_type.replaceAll('_',' ').replaceAll('dt','').replace('biz',''))).trim();
 	}
 	static get_item_list = () =>{
 		return [
@@ -744,9 +715,7 @@ class Review_Logic {
 		return review;
 	};
 	static get_test_list=(option)=>{
-		if(!option){
-			option = {review_count:19};
-		}
+		option = !Obj.check_is_empty(option) ? option : {review_count:19};
 		let item_list = [];
 		for(let a=0;a<option.review_count;a++){
 			item_list.push(Review_Logic.get_test());
@@ -756,9 +725,7 @@ class Review_Logic {
 }
 class Business_Logic {
 	static get_new = (title) =>{
-		if(!title){
-			title="Business "+Number.get_id();
-		}
+		title=(title) ? title : "Business "+Number.get_id();
 		return DataItem.get_new_full_item(
 			DataItem.get_new(DataType.BUSINESS,0),
 			DataItem.get_new(DataType.BUSINESS,0),
@@ -780,7 +747,6 @@ class Business_Logic {
 	};
 	static get_test = (title,option) =>{
 		option = Field_Logic.get_option(DataType.BUSINESS,option?option:{});
-		Log.w('option',option);
 		let item = DataItem.get_new(DataType.BUSINESS,0);
 		let city_list = ["Miami","Atlanta","Chicago","Seattle","New York City"];
 		let state_list = ["Georgia","New York","Illinois","Washington","Flordia"];
@@ -804,18 +770,11 @@ class Business_Logic {
 		return item;
 	};
 	static get_full_address(business){
-		if(!business.address_1){
-			business.address_1 = "";
-		}
-		if(!business.address_2){
-			business.address_2 = "";
-		}
-		if(!business.city){
-			business.city = "";
-		}
-		if(!business.state){
-			business.state = "";
-		}
+		business.address_1 = (business.address_1) ? business.address_1 : "";
+		business.address_2 = (business.address_2) ? business.address_2 : "";
+		business.city = (business.city) ? business.city : "";
+		business.state = (business.state) ? business.state : "";
+		business.zip = (business.zip) ? business.zip : "";
 		return business.address_1 + " "+ business.address_2 + " " + business.city + " " + business.state + " " + business.zip;
 	}
 }
@@ -1058,17 +1017,9 @@ class Url{
 		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,null);
 	};
 }
-class Obj {
-	static get_search = (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};
-	}
-};
 class Category_Logic {
 	static get_test = (title,option) =>{
-		if(!title){
-			title="Category 1";
-			option={};
-		}
+		title = (title) ? title : "Category 1";
 		option = Field_Logic.get_option(DataType.CATEGORY,option?option:{});
 		let category = DataItem.get_new_full_item(
 			DataItem.get_new(DataType.CATEGORY,0),
@@ -1353,12 +1304,8 @@ class Stock {
 }
 class Schedule {
 	static get_start_date_time = (item) => {
-		if(!item.date){
-			item.date = new Date();
-		}
-		if(!item.time){
-			item.time = new Date();
-		}
+		item.date = (item.date)  ? item.date : new Date();
+		item.time = (item.time)  ? item.time : new Date();
 		item.start_date = DateTime.get_full_date_by_date_time(item.date,item.time);
 		item.start_time = DateTime.get_full_time_by_date_time(item.date,item.time);
 		item.start_date_time = DateTime.get_full_date_time_by_date_time(item.date,item.time);
@@ -1366,12 +1313,8 @@ class Schedule {
 	}
 	static get_start_date_time_by_list = (list) => {
 		for(let a=0;a<list.length;a++){
-			if(!list[a].date){
-				list[a].date = new Date();
-			}
-			if(!list[a].time){
-				list[a].time = new Date();
-			}
+			list[a].date = (list[a].date) ? list[a].date : new Date();
+			list[a].time = (list[a].time) ? list[a].time : new Date();
 			list[a].start_date = DateTime.get_full_date_by_date_time(list[a].date,list[a].time);
 			list[a].start_time = DateTime.get_full_time_by_date_time(list[a].date,list[a].time);
 			list[a].start_date_time = DateTime.get_full_date_time_by_date_time(list[a].date,list[a].time);
@@ -1400,18 +1343,7 @@ class Storage {
 }
 class Sub_Item_Logic {
 	static get_test(title,parent_item,top_item,option){
-		if(option==null){
-			option={get_value:true,value_count:9};
-		}
-		if(option.item_count==null){
-			option.item_count = 9;
-		}
-		if(option.get_value==null){
-			option.get_value = true;
-		}
-		if(option.value_count==null){
-			option.value_count = 9;
-		}
+		option = Field_Logic.get_option(DataType.ITEM,option?option:{});
 		let item_title =title;
 		let item = DataItem.get_new(
 			DataType.ITEM,0, {
@@ -1430,7 +1362,8 @@ class Sub_Item_Logic {
 		}
 		return item;
 	}
-	static get_test_item_list(parent_item,top_item,option){
+	static get_test_list(parent_item,top_item,option){
+		option = Field_Logic.get_option(DataType.SUB_ITEM,option?option:{});
 		let new_list = [];
 		for(let a=0;a<option.item_count;a++){
 			let item_title ="Item " + String(parseInt(a+1));
@@ -1484,7 +1417,6 @@ module.exports = {
 	Item_Logic,
 	Event_Logic,
 	Message,
-	Obj,
 	Page_Logic,
 	Page_Url,
 	Product_Url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "4.8.32",
+  "version": "4.8.41",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -10,7 +10,7 @@
   "dependencies": {
     "async-series": "^0.0.1",
     "biz9-scriptz": "^5.8.1",
-    "biz9-utility": "^3.8.1",
+    "biz9-utility": "^3.8.5",
     "jest": "^29.7.0",
     "moment": "^2.30.1"
   },

package/test.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const series = require('async-series');
-const {DataItem,DataType,Url,Obj,BiZ_Url,Cat,Stock,Schedule,Storage,Business,Product,Service,Event,Template,Page,Category,Review,Blog_Post,Faq_Logic,Category_Url,Blank_Url,Blank_Logic,Item_Logic,Service_Logic,Template_Logic,Page_Logic,Product_Logic,Event_Logic,Blog_Post_Logic,Content_Logic,Category_Logic,Team_Logic,Business_Logic,PageType,Page_Url} = require('./index');
+const {DataItem,DataType,Url,Obj,BiZ_Url,Cat,Stock,Schedule,Storage,Business,Product,Service,Event,Template,Page,Category,Review,Blog_Post,Faq_Logic,Category_Url,Blank_Url,Blank_Logic,Item_Logic,Service_Logic,Template_Logic,Page_Logic,Product_Logic,Event_Logic,Blog_Post_Logic,Content_Logic,Category_Logic,Team_Logic,Business_Logic,PageType,Sub_Item_Logic,Page_Url} = require('./index');
 const {Log,Number} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
@@ -50,8 +50,8 @@ describe("connect", () => {
                 /* --PAGE--START */
                 //let page = Page_Logic.get_test()
                 //let page = Page_Logic.get_test("Page "+Number.get_id())
-                let page = Page_Logic.get_test("Page "+Number.get_id(),{get_value:true,value_count:5,get_section:false,section_count:2})
-                Log.w("page",page);
+                //let page = Page_Logic.get_test("Page "+Number.get_id(),{get_value:true,value_count:5,get_section:false,section_count:2,get_photo:true,get_blank:true})
+                //Log.w("page",page);
                 //Log.w("page_section_1",page.section_1);
                 //Log.w("page_section_6",page.section_6.items);
                 //Log.w("page_section_1_section_1",page.section_1.section_1);
@@ -91,9 +91,23 @@ describe("connect", () => {
                 //Log.w('category_list',category_list);
                 /* --CATEGORY--END */
 
+                /* --SUB_ITEM--START */
+                console.log('TEST-SUB_ITEM-START');
+                let item = DataItem.get_new(DataType.BLANK,0);
+                let parent_item = DataItem.get_new(DataType.BLANK,0);
+                let top_item = DataItem.get_new(DataType.BLANK,0);
+                let sub_item = Sub_Item_Logic.get_test("cool 1",item,top_item);
+                //Log.w('sub_item',sub_item);
+                let sub_item_list = Sub_Item_Logic.get_test_list(item,top_item,{get_value:true});
+               // Log.w('sub_item',sub_item);
+                Log.w('sub_item_list',sub_item_list);
+                Log.w('sub_item_list_len',sub_item_list.length);
+                console.log('TEST-SUB_ITEM-END');
+                /* --SUB_ITEM--END */
+
 
                 /* --CONTENT--START */
-                //let content = Content_Logic.get_test()
+                //let content = Content_Logic.get_test("cool 1");
                 //let content = Content_Logic.get_test("Content 1",{get_value:true,get_item:true})
                 //Log.w("content",content);
                 //let content_list = Content_Logic.get_test_list();
@@ -150,7 +164,7 @@ describe("connect", () => {
 
                 //let product = Product_Logic.get_test("Product 1",{get_value:true,get_item:true})
                 //Log.w("product",product);
-                //let product_list = Product_Logic.get_test_list({product_count:10});
+                //let product_list = Product_Logic.get_test_list({product_count:10,get_blank:true});
                 //let product_list = Product_Logic.get_test_list();
                 //Log.w('product_list',product_list);
                 //let [category_list,product_list]=Product.get_test_list_by_category({category_count:5,product_count:9});