@gudhub/core 1.0.46 → 1.0.49

package/GUDHUB/Managers/FileManager/FileManager.js

@@ -107,19 +107,23 @@ export class FileManager {
     }
   }
 
-  addFileToStorage(app_id, file) {
+  addFileToStorage(app_id, element_id, file) {
     const app = this.storage.getApp(app_id);
     if (app) {
       app.file_list.push(file);
       this.storage.updateApp(app);
+      this.pipeService.emit("gh_file_upload", { app_id, item_id: file.item_id, element_id }, file);
     }
   }
 
-  addFilesToStorage(app_id, files) {
+  addFilesToStorage(app_id, element_id, files) {
     const app = this.storage.getApp(app_id);
     if (app) {
       app.file_list.push(...files);
       this.storage.updateApp(app);
+      files.forEach(file => {
+        this.pipeService.emit("gh_file_upload", { app_id, item_id: file.item_id, element_id }, file);
+      });
     }
   }
 
@@ -190,7 +194,7 @@ async getFiles(app_id, filesId = []) {
 
   async uploadFileFromString(fileObject) {
     const file = await this.uploadFileFromStringApi(fileObject);
-    this.addFileToStorage(file.app_id, file);
+    this.addFileToStorage(file.app_id, fileObject.element_id, file);
     return file;
   }
 

package/GUDHUB/Utils/Utils.js

@@ -9,7 +9,7 @@ import {
 import { group } from "./filter/group.js";
 import { searchValue } from "./filter/utils.js";
 import populateItems from "./populate_items/populate_items.js";
-import { populateWithDate, getDate } from "./get_date/get_date.js";
+import { populateWithDate, getDate, checkRecurringDate } from "./get_date/get_date.js";
 import { mergeObjects } from "./merge_objects/merge_objects.js";
 import { mergeChunks } from "./merge_chunks/merge_chunks.js";
 import { getInterpretedValue } from "./interpretation/interpretation.js";
@@ -85,6 +85,10 @@ export class Utils {
     return getDate(queryKey);
   }
 
+  checkRecurringDate(date, option) {
+    return checkRecurringDate(date, option);
+  }
+
   populateItems(items, model, keep_data) {
     return populateItems(items, model, keep_data);
   }

package/GUDHUB/Utils/filter/filter.js

@@ -171,6 +171,13 @@ class Checker {
           );
         };
         break;
+      case "recurring_date":
+        this._checkFn = function (data, filtersValues) {
+          return filtersValues.some((_filter) => 
+            data.some((_dataItem) =>  gudhub.checkRecurringDate(_dataItem, _filter))
+          );
+        };
+        break;
     }
     return this;
   }
@@ -236,6 +243,16 @@ class BooleanFetchStrategy {
   }
 }
 
+class RecurringDateStrategy {
+  convert(val) {
+    return [Number(val)];
+  }
+
+  convertFilterValue(val) {
+    return String(val);
+  }
+}
+
 class Aggregate {
   constructor() {
     this._strategies = {
@@ -244,6 +261,7 @@ class Aggregate {
       booleanStrategy: new BooleanFetchStrategy(),
       rangeStrategy: new RangeFetchStrategy(),
       dateStrategy: new dateFetchStrategy(),
+      recurringDateStrategy: new RecurringDateStrategy()
     };
   }
 
@@ -277,6 +295,8 @@ class Aggregate {
       case "value":
         this._currentStrategy = this._strategies.booleanStrategy;
         break;
+      case "recurring_date":
+        this._currentStrategy = this._strategies.recurringDateStrategy
     }
     return this;
   }

package/GUDHUB/Utils/get_date/get_date.js

@@ -88,3 +88,45 @@ export function getDate(queryKey) {
       return date.getTime();
   }
 }
+
+//********************** CHECK RECURRING DATE ************************//
+
+export function checkRecurringDate(date, option) {
+
+  date = new Date(date);
+
+  let currentDate = new Date();
+
+  switch (option) {
+    case 'day':
+      if(date.getDate() + '.' + date.getMonth() === currentDate.getDate() + '.' + date.getMonth()) {
+        return true;
+      } else {
+        return false;
+      }
+    case 'week':
+      if(getWeek(currentDate) === getWeek(date)) {
+        return true;
+      } else {
+        return false;
+      }
+    case 'month':
+      if(date.getMonth() === currentDate.getMonth()) {
+        return true;
+      } else {
+        return false;
+      }
+    default:
+      return true;
+  }
+
+  function getWeek(date) {
+    let d = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+    let dayNumber = d.getDay();
+    d.setDate(d.getDate() + 4 - dayNumber);
+    let firstJanuary = new Date(date.getFullYear(), 0, 1);
+    let weekNumber = Math.ceil((((d- firstJanuary) / 86400000) + 1) / 7);
+    return weekNumber;
+  }
+
+}

package/GUDHUB/Utils/get_date/get_date.test.js

@@ -50,4 +50,37 @@ describe("GET DATE", function () {
     let day = gudhub.getDate('this_saturday');
     day.getDay().should.equal(6);
   });
+
+  it("CHECK IF DATE TODAY", function() {
+    let today = new Date();
+    let result = gudhub.checkRecurringDate(today, 'day');
+    result.should.equal(true);
+
+    let tommorow = new Date();
+    tommorow.setDate(tommorow.getDate() + 1);
+    result = gudhub.checkRecurringDate(tommorow, 'day');
+    result.should.equal(false);
+  })
+
+  it("CHECK IF DATE IN THIS WEEK", function() {
+    let today = new Date();
+    let result = gudhub.checkRecurringDate(today, 'week');
+    result.should.equal(true);
+
+    let twoWeeksLater = new Date();
+    twoWeeksLater.setDate(twoWeeksLater.getDate() + 14);
+    result = gudhub.checkRecurringDate(twoWeeksLater, 'week');
+    result.should.equal(false);
+  });
+
+  it("CHECK IF DATE IN THIS MONTH", function() {
+    let today = new Date();
+    let result = gudhub.checkRecurringDate(today, 'month');
+    result.should.equal(true);
+
+    let twoMonthsLater = new Date();
+    twoMonthsLater.setDate(twoMonthsLater.getDate() + 60);
+    result = gudhub.checkRecurringDate(twoMonthsLater, 'month');
+    result.should.equal(false);
+  });
 });

package/GUDHUB/gudhub.js

@@ -178,6 +178,10 @@ export class GudHub {
     return this.util.populateWithDate(items, model);
   }
 
+  checkRecurringDate(date, option) {
+    return this.util.checkRecurringDate(date, option);
+  }
+
   populateItems(items, model, keep_data) {
     return this.util.populateItems(items, model, keep_data);
   }

package/package.json

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