biz9-logic 4.9.43 → 4.9.49

package/biz9_config

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

package/index.js

@@ -117,6 +117,8 @@ class Title {
 	static SOCIAL_URL_INSTAGRAM="https://instagram.com/";
 	static SOCIAL_URL_YOUTUBE="https://youtube.com/";
 	static SOCIAL_URL_LINKEDIN="https://linkedin.com/";
+	//stat
+	static STAT_NUMBER="ST-";
 	//str
 	static CATEGORY='Category';
 	static DESCRIPTION='Description';
@@ -182,19 +184,16 @@ class Demo_Logic {
 	};
 }
 class Type {
-	static get_stat_type_list = () =>{
-		return [
-			{title:Type.get_title(Type.STAT_VIEW),type:Type.STAT_VIEW,label:Type.get_title(Type.STAT_VIEW),value:Type.STAT_VIEW},
-			{title:Type.get_title(Type.STAT_LOGIN),type:Type.STAT_LOGIN,label:Type.get_title(Type.STAT_LOGIN),value:Type.STAT_LOGIN},
-			{title:Type.get_title(Type.STAT_REGISTER),type:Type.STAT_REGISTER,label:Type.get_title(Type.STAT_REGISTER),value:Type.STAT_REGISTER},
-			{title:Type.get_title(Type.STAT_LIKE),type:Type.STAT_LIKE,label:Type.get_title(Type.STAT_LIKE),value:Type.STAT_LIKE},
-			{title:Type.get_title(Type.STAT_FAVORITE),type:Type.STAT_FAVORITE,label:Type.get_title(Type.STAT_FAVORITE),value:Type.STAT_FAVORITE},
-			{title:Type.get_title(Type.STAT_CART),type:Type.STAT_CART,label:Type.get_title(Type.STAT_CART),value:Type.STAT_CART},
-			{title:Type.get_title(Type.STAT_ORDER),type:Type.STAT_ORDER,label:Type.get_title(Type.STAT_ORDER),value:Type.STAT_ORDER},
-			{title:Type.get_title(Type.STAT_ORDER_PAYMENT),type:Type.STAT_ORDER_PAYMENT,label:Type.get_title(Type.STAT_ORDER_PAYMENT),value:Type.STAT_ORDER_PAYMENT},
-			{title:Type.get_title(Type.STAT_REVIEW),type:Type.STAT_REVIEW,label:Type.get_title(Type.STAT_REVIEW),value:Type.STAT_REVIEW},
-		]
-	};
+//field
+	static ID='id';
+	static DATA_TYPE='data_type';
+	static DATE_CREATE='date_create';
+	static DATE_SAVE='date_save';
+	static PARENT_ID='parent_id';
+	static PARENT_DATA_TYPE='parent_data_type';
+	static SETTING_VISIBLE='setting_visible';
+	static SOURCE='source';
+
 	//page
 	static PAGE_ABOUT='about';
 	static PAGE_CONTACT='contact';
@@ -264,6 +263,21 @@ class Type {
 	static IMAGE_RESIZE_NORMAL="normal";
 	static IMAGE_RESIZE_SQUARE="squre";
 	static IMAGE_RESIZE_NONE="none";
+	//
+	static get_stat_type_list = () =>{
+		return [
+			{title:Type.get_title(Type.STAT_VIEW),type:Type.STAT_VIEW,label:Type.get_title(Type.STAT_VIEW),value:Type.STAT_VIEW},
+			{title:Type.get_title(Type.STAT_LOGIN),type:Type.STAT_LOGIN,label:Type.get_title(Type.STAT_LOGIN),value:Type.STAT_LOGIN},
+			{title:Type.get_title(Type.STAT_REGISTER),type:Type.STAT_REGISTER,label:Type.get_title(Type.STAT_REGISTER),value:Type.STAT_REGISTER},
+			{title:Type.get_title(Type.STAT_LIKE),type:Type.STAT_LIKE,label:Type.get_title(Type.STAT_LIKE),value:Type.STAT_LIKE},
+			{title:Type.get_title(Type.STAT_FAVORITE),type:Type.STAT_FAVORITE,label:Type.get_title(Type.STAT_FAVORITE),value:Type.STAT_FAVORITE},
+			{title:Type.get_title(Type.STAT_CART),type:Type.STAT_CART,label:Type.get_title(Type.STAT_CART),value:Type.STAT_CART},
+			{title:Type.get_title(Type.STAT_ORDER),type:Type.STAT_ORDER,label:Type.get_title(Type.STAT_ORDER),value:Type.STAT_ORDER},
+			{title:Type.get_title(Type.STAT_ORDER_PAYMENT),type:Type.STAT_ORDER_PAYMENT,label:Type.get_title(Type.STAT_ORDER_PAYMENT),value:Type.STAT_ORDER_PAYMENT},
+			{title:Type.get_title(Type.STAT_REVIEW),type:Type.STAT_REVIEW,label:Type.get_title(Type.STAT_REVIEW),value:Type.STAT_REVIEW},
+		]
+	};
+
 	static get_data_type_list = () =>{
 		return [
 			{title:Type.get_title(DataType.BLOG_POST),type:DataType.BLOG_POST,label:Type.get_title(DataType.BLOG_POST),value:DataType.BLOG_POST},
@@ -396,69 +410,30 @@ class Type {
 	}
 }
 class Stat_Logic {
-	static get_user_activity_filter = (user_id_filter) =>{
-		return {
-			   $and: [
-        { $or: [ { type: Type.STAT_LOGIN }, { type: Type.STAT_REGISTER } ] },
-        user_id_filter
-    			]
-		}
-	}
-	static url_search_activity = (app_id,url,param) => {
-		let action_url="item/search_activity";
-		return get_cloud_url_main(app_id,url,action_url,param);
-	};
-	static get_new_user = (user_id,stat_type,data)=>{
-		return {
-			user_id:user_id,
-			type:stat_type,
-			data:data,
-		}
-	};
-	static get_new = (user_id,stat_type,parent_item_list,data)=>{
-		let stat_list = [];
-		for(const item of parent_item_list){
-			let stat = DataItem.get_new(DataType.STAT,0);
-			stat.user_id=user_id;
-			stat.type=stat_type;
-			if(item.parent_id){
-				stat.parent_id=item.parent_id;
-				stat.parent_data_type=item.parent_data_type;
-			}else{
-				stat.parent_id=item.id;
-				stat.parent_data_type=item.data_type;
-			}
-			if(item.cost){
-				stat.parent_cost = item.cost;
-			}
-			if(item.quanity){
-				stat.parent_quanity = item.quanity;
-			}
-			if(item.data_type==DataType.CART_ITEM){
-				stat.parent_cart_id = item.cart_id;
-				stat.parent_cart_number = item.cart_number;
-			}
-			if(item.data_type==DataType.ORDER_ITEM){
-				stat.parent_order_id = item.order_id;
-				stat.parent_order_number = item.order_number;
-			}
-			if(item.data_type==DataType.ORDER_PAYMENT){
-				stat.parent_order_number = item.order_number;
-				stat.parent_payment_method_type = item.payment_method_type;
-				stat.parent_payment_amount = item.payment_amount;
-				stat.parent_transaction_id = item.transaction_id;
-			}
-			stat_list.push(stat);
-		};
-		return stat_list;
-	};
-	static get_new_activity = (user_id,stat_type,activity_data)=>{
-		return {
-			user_id:user_id,
-			type:stat_type,
-			activity:data,
+	static get_new = (parent_data_type,parent_id,stat_type,user_id,post_data) => {
+		let new_stat = DataItem.get_new(DataType.STAT,0,
+			{
+				user_id:user_id,
+				stat_number:Title.STAT_NUMBER + Num.get_id(99999),
+				stat_type:stat_type,
+				parent_data_type:parent_data_type,
+				parent_id:parent_id
+			});
+		if(!Obj.check_is_empty(post_data)){
+			new_stat = Obj.merge(new_stat,Stat_Logic.filter_stat(post_data));
 		}
+		return new_stat;
 	};
+	static filter_stat = (post_data) =>{
+		let filter_stat = {};
+		for(const prop in post_data) {
+    		const value = post_data[prop];
+			if (!Array.isArray(value)  && prop != Type.SOURCE && prop != Type.DATE_CREATE && prop != Type.DATE_SAVE  && prop != Type.DATA_TYPE && prop != Type.ID) {
+			 		filter_stat[prop] = post_data[prop];
+    			}
+  		}
+		return filter_stat;
+	}
 }
 class Page_Logic {
 	static get_page_list(){
@@ -1256,7 +1231,6 @@ static APP='app_biz';
 	static TYPE='type_biz';
 	static USER='user_biz';
 	static VIDEO='video_biz';
-
 }
 class Favorite_Logic {
 	static get_new = (parent_data_type,parent_id,user_id) =>{
@@ -1266,13 +1240,18 @@ class Favorite_Logic {
 			user_id:user_id
 		});
 	}
-	static get_favorite_by_list = (favorite_list,item_list) =>{
+	static old_get_favorite_by_list = (favorite_list,item_list) =>{
+		if(!item_list){
+			item_list = [];
+		}
+		if(item_list.length>0){
 		favorite_list.forEach(item => {
 			const item_match = item_list.find(item_find => item_find.id === item.parent_id);
 			if (item_match) {
 				item_match.is_favorite = true;
 			}
 		});
+		}
 		return item_list;
 	}
 	static get_user_search_filter = (item_data_type,user_id) =>{

package/package.json

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

package/test.js

@@ -1,5 +1,5 @@
 const series = require('async-series');
-const {DataItem,DataType,Page_Logic,Product_Logic,Type,Title,Stat_Logic,Service_Logic,Blog_Post_Logic,Event_Logic,Demo_Logic,Cart_Logic,Order_Logic} = require('./index');
+const {DataItem,DataType,Item_Logic,Page_Logic,Product_Logic,Type,Title,Stat_Logic,Service_Logic,Blog_Post_Logic,Event_Logic,Demo_Logic,Cart_Logic,Order_Logic} = require('./index');
 const {Log,Num,Str} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
@@ -30,45 +30,49 @@ describe("connect", () => {
     it("_connect", () => {
         series([
 
- /* --- TEST LOGIC - CONNECT - START --- */
-            function(call) {
+   function(call) {
+       console.log('CONNECT-BASE-START');
+       let data_type = DataType.PRODUCT;
+       let id = 0;
+       let parent_data_type = DataType.PRODUCT;
+       let parent_id = 3334;
+       let user_id = 0;
+       let item = Product_Logic.get_test();
+       item.id = 333;
+       item.items = ['a','b'];
+       console.log('here');
+       let stat = Stat_Logic.get_new(parent_data_type,parent_id,Type.STAT_VIEW,user_id,item);
+       Log.w('stat',stat);
+         console.log('CONNECT-BASE-END');
+    }
+        /*
+        function(call) {
             console.log('CONNECT-CMS-DEMO-START');
-        let category_type = DataType.PRODUCT;
-        let category_count = 12;
-        let item_count = 500;
-
-        //let category_type_title_list = ['Add On','Admin Panel','Hosting','Landing Page','Mobile','Website'];
-        //let category_title_list = ['Beauty','Church','Fashion','Food Trucks','Health Care','Music','Pets','Services','Service Repair','Sports','Trucking'];
+            let category_type = DataType.PRODUCT;
+            let category_count = 12;
+            let item_count = 500;
 
-        let category_type_title_list = '';
-        let category_title_list = '';
+            //let category_type_title_list = ['Add On','Admin Panel','Hosting','Landing Page','Mobile','Website'];
+            //let category_title_list = ['Beauty','Church','Fashion','Food Trucks','Health Care','Music','Pets','Services','Service Repair','Sports','Trucking'];
 
+            let category_type_title_list = '';
+            let category_title_list = '';
 
-        let item_title_list = [];
-		let post_type_list = [];
-        let val_category_title = '';
-        let cat_max = 0;
-        let option = {get_category:true,category_count:category_count,category_data_type:category_type,categorys:val_category_title?val_category_title:null,
+            let item_title_list = [];
+		    let post_type_list = [];
+            let val_category_title = '';
+            let cat_max = 0;
+            let option = {get_category:true,category_count:category_count,category_data_type:category_type,categorys:val_category_title?val_category_title:null,
                    get_item:true,item_count:item_count,item_data_type:category_type,items:null}
 
-        console.log(Demo_Logic.get_new_type('',option));
-                /*
-       for(const item of category_type_title_list){
-            post_type_list.push(
-            Demo_Logic.get_new_type(item,option));
-        }
-
-        Log.w('44-post_type_list',post_type_list);
-        Log.w('55-post_type_list-a',post_type_list.length);
-        Log.w('55-post_type_list-b',post_type_list[0].categorys[0].items.length);
-        Log.w('55-post_type_list-b',post_type_list[0].categorys[1].items.length);
-        Log.w('55-post_type_list-b',post_type_list[0].categorys[2].items.length);
-        Log.w('55-post_type_list-b',post_type_list[0].categorys[3].items.length);
-        Log.w('55-post_type_list-b',post_type_list[0].categorys[4].items.length);
-        console.log('CONNECT-CMS-DEMO-SUCCESS');
-        */
-
+            console.log(Demo_Logic.get_new_type('',option));
+            for(const item of category_type_title_list){
+                post_type_list.push(
+                    Demo_Logic.get_new_type(item,option));
+            }
+            console.log('CONNECT-CMS-DEMO-SUCCESS');
             },
+        */
             /*
             function(call) {
                 //console.log('CONNECT-START');