@gudhub/core 1.1.58 → 1.1.60

package/GUDHUB/FieldProcessor/FieldProcessor.js

@@ -98,6 +98,17 @@ export class FieldProcessor {
     return null;
   }
 
+  async getFieldIdByNameSpace(app_id, name_space) {
+    const app = await this.appProcessor.getApp(app_id);
+    if(!app) return null;
+    for(let i = 0; i < app.field_list.length; i++) {
+      if(app.field_list[i].name_space == name_space) {
+        return app.field_list[i].field_id;
+      }
+    }
+    return null;
+  }
+
   //!!!!! Shou Be Renamed to  getFields() !!!!!!!
   async getFieldModels(app_id) {
     const app = await this.appProcessor.getApp(app_id);

package/GUDHUB/FieldProcessor/FieldProcessor.test.js

@@ -12,6 +12,11 @@ describe("FIELD PROCESSOR", async function() {
         (typeof fieldModel).should.equal('object');
     });
 
+    it("GET FIELD ID BY NAMESPACE / should return a field id", async function() {
+        const fieldId = await gudhub.getFieldIdByNameSpace(16259, 'name');
+        fieldId.should.equal(254056);
+    });
+
     it('GET FIELD VALUE / should return a field value', async () => {
         let value = await gudhub.getFieldValue(16259, 1064673, 254055);
         value.should.equal('Hall up');

package/GUDHUB/PipeService/PipeService.test.js

@@ -68,9 +68,8 @@ describe("PipeService", () => {
     gudhub
       .emit("test",  { app_id: 4, item_id: 3, field_id: 2 }, {"message" : "this is the data"})
       .on("test",  { app_id: 4, item_id: 3, field_id: 2 }, (event, data) => {
-        incomeData = data.message;
+        data.message.should.equal("this is the data");
       });
-      incomeData.should.equal("this is the data");
   });
   
 

package/GUDHUB/Utils/get_date/get_date.js

@@ -22,7 +22,15 @@ export function populateWithDate(items, model) {
         (sourceField) => sourceField.element_id == modelField.element_id
       );
       if (field) {
-        field.field_value = getDate(modelField.date_type);
+        if (modelField.data_range) {
+          if(modelField.date_type.includes('calendar')) {
+            field.field_value = `${getStartDate(modelField.date_type)}:${getDate(modelField.date_type)}`
+          } else {
+            field.field_value = `${getStartDate(modelField.date_type)}:${getDate(modelField.date_type)}`
+          }
+        } else {
+           field.field_value = getDate(modelField.date_type);
+        }      
       } else {
         //-- if we didn't find field in item then we add it
         item.fields.push({
@@ -33,13 +41,152 @@ export function populateWithDate(items, model) {
       }
     });
   });
-
   return items;
 }
 
+//******************* GET START DATE *********************//
+function getStartDate(dateType) {
+  let currentDate = new Date();
+
+  function weekTime(currentDate) {
+    var day = currentDate.getDay();
+    let numberOfDays;
+        if (dateType.includes("week_current,current")) {
+          numberOfDays = 0;
+        }
+        if (dateType.includes("week_next,future")) {
+          numberOfDays = 7;
+        }
+        if (dateType.includes("week_past,past")) {
+          numberOfDays = -7;
+        }
+      let diff = currentDate.getDate() - day + numberOfDays + (day == 0 ? -6:1); 
+    return new Date(currentDate.setDate(diff));
+  }
+
+  function quarterTime(currentDate) {
+        let numberMonths;
+        let numberDays;
+        let currentQuarter = Math.floor((currentDate.getMonth() / 3));
+        let year = currentDate.getFullYear();
+        if (dateType.includes("quarter_current,current")) {
+          numberMonths = 0;
+          numberDays = 0;
+        }
+        if (dateType.includes("quarter_next,future")) {
+          numberMonths = 3;
+          numberDays = 0;
+        }
+        if (dateType.includes("quarter_past,past")) {
+          numberMonths = -3;
+          numberDays = 0;
+        }
+      return new Date(year, currentQuarter * 3 + numberMonths, 1 + numberDays);
+  }
+
+  switch (dateType) {
+    case "week_current,current":           
+      return weekTime(new Date()).getTime();
+
+    case "month_current,current":
+      return new Date(currentDate.getFullYear(), currentDate.getMonth(), 1).getTime();
+
+    case "quarter_current,current":       
+      return quarterTime(new Date()).getTime();
+
+    case "year_current,current":
+      return add(new Date(currentDate.getFullYear(), 0, 1), {years: 0}).getTime();
+
+    case "week_next,future":                
+      return weekTime(new Date()).getTime();
+
+    case "month_next,future":
+      return new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 1).getTime();
+
+    case "quarter_next,future":
+      return quarterTime(new Date()).getTime();
+
+    case "year_next,future":
+      return add(currentDate, {days: 0}).getTime();
+
+    case "week_past,past":
+      return weekTime(new Date()).getTime();
+
+    case "month_past,past":
+      return new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, 1).getTime();
+
+    case "quarter_past,past":
+      return quarterTime(new Date()).getTime();
+    
+    case "year_past,past":
+      return add(currentDate, {years: -1}).getTime();
+
+    case "year_past,past,calendar":
+    return add(new Date(currentDate.getFullYear(), 0, 1), {years: -1}).getTime();
+
+    case "year_future,future,calendar":
+      return add(new Date(currentDate.getFullYear() + 1, 0, 1), {years: 0}).getTime();
+
+    case "today_current,current":
+      return add(currentDate, {days: 0}).getTime();
+    
+    case "tomorrow,future":
+      return add(currentDate, {days: 1}).getTime();
+    
+    case "7_days_future,future":
+      return add(currentDate, {days: 0}).getTime();
+
+    case "10_days_future,future":
+      return add(currentDate, {days: 0}).getTime();
+    
+    case "14_days_future,future":
+      return add(currentDate, {days: 0}).getTime();
+
+    case "30_days_future,future":
+      return add(currentDate, {days: 0}).getTime();
+  
+    case "yesterday,past":
+      return add(currentDate, {days: -1}).getTime();
+
+    case "7_days_past,past":
+      return add(currentDate, {days: -7}).getTime();
+
+    case "10_days_past,past":
+      return add(currentDate, {days: -10}).getTime();
+
+    case "14_days_past,past":
+      return add(currentDate, {days: -14}).getTime();
+
+    case "30_days_past,past":
+      return add(currentDate, {days: -30}).getTime();
+  }
+}
 //********************** GET DATE ************************//
 export function getDate(queryKey) {
-  const date = new Date();
+  var date = new Date();
+
+  function getMonday(d) {
+    d = new Date(d);
+    var day = d.getDay(),
+        diff = d.getDate() - day + 6 + (day == 0 ? +6:1); 
+    return new Date(d.setDate(diff));
+  }
+  function getNextWeek(d) {
+    d = new Date(d);
+    var day = d.getDay(),
+        diff = d.getDate() - day + 13 + (day == 0 ? -6:1);
+    return new Date(d.setDate(diff));
+  }  
+  function getPastWeek(d) {
+    d = new Date(d);
+    var day = d.getDay(),
+        diff = d.getDate() - day - 1 + (day == 0 ? -6:1); 
+    return new Date(d.setDate(diff));
+  } 
+
+  let currentQuarter = Math.floor((date.getMonth() / 3));
+  let year = date.getFullYear();
+
   switch (queryKey) {
     
     case "next_day":
@@ -84,9 +231,84 @@ export function getDate(queryKey) {
     case "this_saturday":
         return setDay(date, 6, {weekStartsOn: 1});
 
-    case "now":
-    default:
-      return date.getTime();
+    case "today_current,current":
+      return add(date, {days: 0}).getTime();
+    
+    case "tomorrow,future":
+      return add(date, {days: 1}).getTime();
+    
+    case "7_days_future,future":
+      return add(date, {days: 7}).getTime();
+
+    case "10_days_future,future":
+      return add(date, {days: 10}).getTime();
+    
+    case "14_days_future,future":
+      return add(date, {days: 14}).getTime();
+
+    case "30_days_future,future":
+      return add(date, {days: 30}).getTime();
+    
+    case "yesterday,past":
+      return add(date, {days: -1}).getTime();
+
+    case "7_days_past,past":
+      return add(date, {days: 0}).getTime();
+
+    case "10_days_past,past":
+      return add(date, {days: 0}).getTime();
+
+    case "14_days_past,past":
+      return add(date, {days: 0}).getTime();
+
+    case "30_days_past,past":
+      return add(date, {days: 0}).getTime();
+
+    case "year_future,future,calendar":
+      return add(new Date(date.getFullYear() + 1, 0, 0), {years: 1}).getTime();
+
+    case "year_past,past,calendar":
+      return add(new Date(date.getFullYear(), 0, 0), {years: 0}).getTime();
+      
+    case "week_current,current":
+      return getMonday(new Date()).getTime();
+
+    case "month_current,current":
+      return new Date(date.getFullYear(), date.getMonth() + 1, 0).getTime();
+
+    case "quarter_current,current":     
+      return new Date(year, (currentQuarter + 1) * 3, 0).getTime();
+
+    case "year_current,current":
+      return add(new Date(date.getFullYear() + 1, 0, 0), {years: 0}).getTime();
+
+    case "week_next,future":             
+      return getNextWeek(new Date()).getTime();
+
+    case "month_next,future":
+      return new Date(date.getFullYear(), date.getMonth() + 2, 0).getTime();
+
+    case "quarter_next,future":
+      return new Date(year, (currentQuarter + 1) * 3 +3, 0).getTime();
+
+    case "year_next,future":
+      return add(date, {years: 1}).getTime();
+
+    case "week_past,past": 
+    return getPastWeek(new Date()).getTime();
+
+    case "month_past,past":
+      return new Date(date.getFullYear(), date.getMonth(), 0, 0).getTime();
+
+    case "quarter_past,past":
+      return new Date(year, (currentQuarter + 1) * 3 -3, 0).getTime();
+
+    case "year_past,past":
+      return add(date, {days: 0}).getTime();
+
+      case "now":
+        default:
+          return date.getTime();
   }
 }
 
@@ -118,5 +340,5 @@ export function checkRecurringDate(date, option) {
     default:
       return true;
   }
-
+  
 }

package/GUDHUB/Utils/json_constructor/json_constructor.js

@@ -117,13 +117,16 @@ export function compiler(scheme, item, util, variables, appId) {
           let result = scheme.function(item, appId, util.gudhub, ...scheme.args);
           return result;
         } else {
-          const func = new Function('item, appId, gudhub', 'return (async ' + scheme.function + ')(item, appId, util.gudhub)');
+          const func = new Function('item, appId, gudhub', 'return (async ' + scheme.function + ')(item, appId, gudhub)');
           let result = await func(item, appId, util.gudhub);
           return result;
         }
 
       case "field_value":
       default:
+        if(!scheme.field_id && scheme.name_space) {
+          scheme.field_id = await util.gudhub.getFieldIdByNameSpace(appId, scheme.name_space);
+        }
         if (Boolean(Number(scheme.interpretation))) {
           let interpretatedValue = await util.gudhub.getInterpretationById(Number(appId), Number(item.item_id), Number(scheme.field_id), 'value');
           return interpretatedValue;

package/GUDHUB/Utils/json_constructor/json_constructor.test.js

@@ -20,13 +20,14 @@ describe("JSON CONSTRUCTOR", function () {
   gudhub.ghconstructor.initJsdomWindow(window);
 
   it("JSON FROM ONE APP : Here we construct simple json from one App", async function () {
-    this.timeout(4000);
+    this.timeout(5000);
     //-- checking if json was generated properly
     let json = await gudhub.jsonConstructor(fishtank_scheme);
     json.fishtank[0].should.have.property("name", "Big Fish Tank");
     json.fishtank[0].should.have.property("state", "Normal ");
   });
   it("CHECK INTERPRETATION VALUE FOR FILES: output: we should get url's", async function () {
+    this.timeout(5000);
     //-- checking interpretation mode
     let json = await gudhub.jsonConstructor(fishtank_scheme);
     json.fishtank[0].should.have.property("image","https://gudhub.com/userdata/16259/809199.jpg,https://gudhub.com/userdata/16259/811768.png");
@@ -34,6 +35,7 @@ describe("JSON CONSTRUCTOR", function () {
     json.fishtank[0].should.have.property("notes","https://gudhub.com/userdata/16259/811770.html?timestamp=0");
   });
   it("GET FILTERED ITEMS LENGTH WITH CURRENT ITEM FILTER", async function () {
+    this.timeout(5000);
     let json = await gudhub.jsonConstructor(currentItemScheme);
     let firstLength = json.scheme[0].array.length;
     let secondLength = json.scheme[1].array.length;
@@ -42,6 +44,11 @@ describe("JSON CONSTRUCTOR", function () {
     secondLength.should.equal(4);
    
   });
+  it("WORK WITH NAMESPACE INSTEAD OF FIELD ID", async function () {
+    this.timeout(5000);
+    let json = await gudhub.jsonConstructor(schemeWithNamespace);
+    json.scheme[0].name.should.equal("Big Fish Tank");
+  });
 });
 
 var fishtank_scheme = {
@@ -146,3 +153,20 @@ let currentItemScheme = {
   app_id: "16259",
   filter: [],
 };
+
+let schemeWithNamespace = {
+  type: "array",
+  id: 1,
+  childs: [
+    {
+      type: "property",
+      id: 2,
+      property_name: "name",
+      property_type: "field_value",
+      name_space: "name"
+    }
+  ],
+  property_name: "scheme",
+  app_id: "16259",
+  filter: []
+}

package/GUDHUB/config.js

@@ -3,7 +3,7 @@ export const server_url = "https://gudhub.com/GudHub_Test";
 //export const server_url = "https://integration.gudhub.com/GudHub_Test";
 //export const server_url = "http://localhost:9000";
 export const wss_url = "wss://gudhub.com/GudHub/ws/app/";
-export const async_modules_path = 'build/latest/async_modules/';
+export const async_modules_path = 'build/latest/async_modules_node/';
 export const automation_modules_path = 'build/latest/automation_modules/'
 export const file_server_url = 'https://gudhub.com'
 

package/GUDHUB/gudhub-https-service.js

@@ -75,6 +75,7 @@ export class GudHubHttpsService {
         this.root + request.url,
         qs.stringify(request.form),
         {
+          maxBodyLength: Infinity,
           headers: request.headers || {
             "Content-Type": "application/x-www-form-urlencoded",
           },

package/GUDHUB/gudhub.js

@@ -314,6 +314,10 @@ export class GudHub {
     return this.fieldProcessor.getField(app_id, field_id);
   }
 
+  getFieldIdByNameSpace(app_id, name_space) {
+    return this.fieldProcessor.getFieldIdByNameSpace(app_id, name_space);
+  }
+
   getFieldModels(app_id) {
     return this.fieldProcessor.getFieldModels(app_id);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.1.58",
+  "version": "1.1.60",
   "description": "",
   "main": "index.js",
   "scripts": {