@aneuhold/core-ts-db-lib 1.0.25 → 1.0.26

package/lib/documents/dashboard/Task.d.ts

@@ -46,16 +46,20 @@ export default class DashboardTask extends BaseDocumentWithType implements Requi
      */
     sharedWith: ObjectId[];
     /**
-     * The recurrence info for this task if there is any. This is ignored
-     * if {@link parentRecurringTask} is set.
+     * The recurrence info for this task if there is any.
      */
     recurrenceInfo?: RecurrenceInfo;
     /**
-     * The ID of the parent recurring task if there is one. Users should not
-     * be able to share the current task if this is set to a value. It would
-     * get confusing for the user it was shared with.
+     * The recurring task info for the parent recurring task if there is one.
+     *
+     * If this is set, then the current tasks's recurrence info should be the
+     * same as the parent recurring task.
      */
-    parentRecurringTaskId?: ObjectId;
+    parentRecurringTaskInfo?: {
+        taskId: ObjectId;
+        startDate?: Date;
+        dueDate?: Date;
+    };
     title: string;
     completed: boolean;
     /**

package/lib/documents/dashboard/Task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Task.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/Task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,cAAc,MAAM,4CAA4C,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EACL,cAAc,EAEf,MAAM,oDAAoD,CAAC;AAE5D,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,CAAC,aAAa,CAqBlE,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,OAAO,OAAO,aACnB,SAAQ,oBACR,YAAW,cAAc;IAEzB,MAAM,CAAC,OAAO,SAAU;IAExB,OAAO,SAAyB;IAEhC;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;;;;;;;;;OAWG;IACH,UAAU,EAAE,QAAQ,EAAE,CAAM;IAE5B;;;OAGG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,QAAQ,CAAC;IAEjC,KAAK,SAAM;IAEX,SAAS,UAAS;IAElB;;OAEG;IACH,YAAY,CAAC,EAAE,QAAQ,CAAC;IAExB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,WAAW,OAAc;IAEzB;;OAEG;IACH,eAAe,OAAc;IAE7B,SAAS,CAAC,EAAE,IAAI,CAAC;IAEjB,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAM;IAEpB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAa;gBAEjB,OAAO,EAAE,QAAQ;CAI9B"}
+{"version":3,"file":"Task.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/Task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,cAAc,MAAM,4CAA4C,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EACL,cAAc,EAEf,MAAM,oDAAoD,CAAC;AAE5D,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,CAAC,aAAa,CAsBlE,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,OAAO,OAAO,aACnB,SAAQ,oBACR,YAAW,cAAc;IAEzB,MAAM,CAAC,OAAO,SAAU;IAExB,OAAO,SAAyB;IAEhC;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;;;;;;;;;OAWG;IACH,UAAU,EAAE,QAAQ,EAAE,CAAM;IAE5B;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE;QACxB,MAAM,EAAE,QAAQ,CAAC;QACjB,SAAS,CAAC,EAAE,IAAI,CAAC;QACjB,OAAO,CAAC,EAAE,IAAI,CAAC;KAChB,CAAC;IAEF,KAAK,SAAM;IAEX,SAAS,UAAS;IAElB;;OAEG;IACH,YAAY,CAAC,EAAE,QAAQ,CAAC;IAExB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,WAAW,OAAc;IAEzB;;OAEG;IACH,eAAe,OAAc;IAE7B,SAAS,CAAC,EAAE,IAAI,CAAC;IAEjB,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAM;IAEpB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAa;gBAEjB,OAAO,EAAE,QAAQ;CAI9B"}

package/lib/documents/dashboard/Task.js

@@ -23,6 +23,7 @@ const validateDashboardTask = (task) => {
     validate.object('lastUpdatedDate', exampleTask.lastUpdatedDate);
     validate.optionalObject('startDate');
     validate.optionalObject('dueDate');
+    validate.optionalObject('parentRecurringTaskInfo');
     (0, RecurrenceInfo_1.validateRecurrenceInfo)(task, errors);
     return { updatedDoc: task, errors };
 };
@@ -69,16 +70,16 @@ class DashboardTask extends BaseDocumentWithType_1.default {
      */
     sharedWith = [];
     /**
-     * The recurrence info for this task if there is any. This is ignored
-     * if {@link parentRecurringTask} is set.
+     * The recurrence info for this task if there is any.
      */
     recurrenceInfo;
     /**
-     * The ID of the parent recurring task if there is one. Users should not
-     * be able to share the current task if this is set to a value. It would
-     * get confusing for the user it was shared with.
+     * The recurring task info for the parent recurring task if there is one.
+     *
+     * If this is set, then the current tasks's recurrence info should be the
+     * same as the parent recurring task.
      */
-    parentRecurringTaskId;
+    parentRecurringTaskInfo;
     title = '';
     completed = false;
     /**

package/lib/services/dashboard/TaskService.d.ts

@@ -21,6 +21,7 @@ export default class DashboardTaskService {
      * there isn't recurrence info.
      */
     static updateDatesForRecurrence(task: DashboardTask): void;
+    private static getDiffForDateUpdate;
     private static getChildrenTaskIds;
 }
 //# sourceMappingURL=TaskService.d.ts.map

package/lib/services/dashboard/TaskService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskService.d.ts","sourceRoot":"","sources":["../../../src/services/dashboard/TaskService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EACL,mBAAmB,EAEpB,MAAM,oDAAoD,CAAC;AAE5D,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC;;OAEG;IACH,MAAM,CAAC,cAAc,iBACL,aAAa,EAAE,iBACd,QAAQ,EAAE,KACxB,QAAQ,EAAE,CA2BX;IAEF;;;OAGG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,mBAAmB;IAsE3E;;;;;;;;OAQG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;IAiD1D,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAsBlC"}
+{"version":3,"file":"TaskService.d.ts","sourceRoot":"","sources":["../../../src/services/dashboard/TaskService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EACL,mBAAmB,EAEpB,MAAM,oDAAoD,CAAC;AAE5D,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC;;OAEG;IACH,MAAM,CAAC,cAAc,iBACL,aAAa,EAAE,iBACd,QAAQ,EAAE,KACxB,QAAQ,EAAE,CA2BX;IAEF;;;OAGG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,mBAAmB;IAsE3E;;;;;;;;OAQG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;IA+D1D,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAcnC,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAsBlC"}

package/lib/services/dashboard/TaskService.js

@@ -103,41 +103,61 @@ class DashboardTaskService {
      */
     static updateDatesForRecurrence(task) {
         // Initial basic validation
-        if (!task.recurrenceInfo ||
+        if (!task.recurrenceInfo) {
+            return;
+        }
+        // Validation for dates based on parent
+        if (task.parentRecurringTaskInfo) {
+            if (
+            // No dates to move forward
+            (!task.dueDate && !task.startDate) ||
+                // Invalid start date recurrence basis
+                (task.recurrenceInfo.recurrenceBasis === 'startDate' &&
+                    !task.parentRecurringTaskInfo.startDate) ||
+                // Invalid due date recurrence basis
+                (task.recurrenceInfo.recurrenceBasis === 'dueDate' &&
+                    !task.parentRecurringTaskInfo.dueDate)) {
+                return;
+            }
+            // Validation for moving dates based on their own recurrence
+        }
+        else if (!task.recurrenceInfo ||
             (task.recurrenceInfo.recurrenceBasis === 'startDate' &&
                 !task.startDate) ||
             (task.recurrenceInfo.recurrenceBasis === 'dueDate' && !task.dueDate)) {
             return;
         }
-        // Start Date Basis
-        if (task.recurrenceInfo.recurrenceBasis === 'startDate') {
-            if (!task.startDate) {
-                return;
-            }
-            const nextRecurDate = this.getNextFrequencyDate(task.startDate, task.recurrenceInfo.frequency);
-            if (!nextRecurDate) {
-                return;
+        let diff = 0;
+        if (task.parentRecurringTaskInfo) {
+            if (task.recurrenceInfo.recurrenceBasis === 'startDate') {
+                diff = this.getDiffForDateUpdate(task.parentRecurringTaskInfo.startDate, task.recurrenceInfo.frequency);
             }
-            const diff = nextRecurDate.getTime() - task.startDate.getTime();
-            task.startDate = new Date(task.startDate.getTime() + diff);
-            if (task.dueDate) {
-                task.dueDate = new Date(task.dueDate.getTime() + diff);
+            else {
+                diff = this.getDiffForDateUpdate(task.parentRecurringTaskInfo.dueDate, task.recurrenceInfo.frequency);
             }
-            return;
         }
-        // Due Date Basis
-        if (!task.dueDate) {
-            return;
+        else if (task.recurrenceInfo.recurrenceBasis === 'startDate') {
+            diff = this.getDiffForDateUpdate(task.startDate, task.recurrenceInfo.frequency);
         }
-        const nextRecurDate = this.getNextFrequencyDate(task.dueDate, task.recurrenceInfo.frequency);
-        if (!nextRecurDate) {
-            return;
+        else {
+            diff = this.getDiffForDateUpdate(task.dueDate, task.recurrenceInfo.frequency);
         }
-        const diff = nextRecurDate.getTime() - task.dueDate.getTime();
-        task.dueDate = new Date(task.dueDate.getTime() + diff);
         if (task.startDate) {
             task.startDate = new Date(task.startDate.getTime() + diff);
         }
+        if (task.dueDate) {
+            task.dueDate = new Date(task.dueDate.getTime() + diff);
+        }
+    }
+    static getDiffForDateUpdate(basisDate, frequency) {
+        if (!basisDate) {
+            return 0;
+        }
+        const nextFrequencyDate = this.getNextFrequencyDate(basisDate, frequency);
+        if (!nextFrequencyDate) {
+            return 0;
+        }
+        return nextFrequencyDate.getTime() - basisDate.getTime();
     }
     static getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, taskId) {
         const childrenIds = parentToTaskIdsDict[taskId];

package/lib/services/dashboard/TaskService.spec.js

@@ -125,6 +125,29 @@ describe('DashboardTaskService', () => {
                 TaskService_1.default.updateDatesForRecurrence(task);
                 expect(task.startDate).toEqual(new Date(2024, 0, 2));
             });
+            it('should update the start date correctly for daily recurrence on subtask', () => {
+                const task = new Task_1.default(new bson_1.ObjectId());
+                task.startDate = new Date(2024, 0, 8);
+                task.dueDate = new Date(2024, 0, 13);
+                task.recurrenceInfo = {
+                    frequency: {
+                        type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXTimeUnit,
+                        everyXTimeUnit: {
+                            timeUnit: 'day',
+                            x: 1
+                        }
+                    },
+                    recurrenceBasis: RecurrenceInfo_1.RecurrenceBasis.startDate,
+                    recurrenceEffect: RecurrenceInfo_1.RecurrenceEffect.rollOnBasis
+                };
+                task.parentRecurringTaskInfo = {
+                    taskId: new bson_1.ObjectId(),
+                    startDate: new Date(2024, 0, 1)
+                };
+                TaskService_1.default.updateDatesForRecurrence(task);
+                expect(task.startDate).toEqual(new Date(2024, 0, 9));
+                expect(task.dueDate).toEqual(new Date(2024, 0, 14));
+            });
             it('should update the start date correctly for a weekly recurrence', () => {
                 const task = new Task_1.default(new bson_1.ObjectId());
                 task.startDate = new Date(2024, 0, 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aneuhold/core-ts-db-lib",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "A core database library used for personal projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",