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

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

@@ -4,10 +4,6 @@ import RequiredUserId from '../../schemas/required-refs/RequiredUserId';
 import { DocumentValidator } from '../../schemas/validators/DocumentValidator';
 import { RecurrenceInfo } from '../../embedded-types/dashboard/task/RecurrenceInfo';
 export declare const validateDashboardTask: DocumentValidator<DashboardTask>;
-/**
- * Gets all the children task IDs for the given parent task IDs.
- */
-export declare const getDashboardTaskChildrenIds: (allUserTasks: DashboardTask[], parentTaskIds: ObjectId[]) => ObjectId[];
 /**
  * When thinking about the logic of tasks, the following thoughts come to mind:
  *
@@ -50,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;;GAEG;AACH,eAAO,MAAM,2BAA2B,iBACxB,aAAa,EAAE,iBACd,QAAQ,EAAE,KACxB,QAAQ,EA2BV,CAAC;AAyBF;;;;;;;;;;;;;;;;;;;;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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDashboardTaskChildrenIds = exports.validateDashboardTask = void 0;
+exports.validateDashboardTask = void 0;
 const bson_1 = require("bson");
 const BaseDocumentWithType_1 = __importDefault(require("../BaseDocumentWithType"));
 const ValidateUtil_1 = __importDefault(require("../../schemas/validators/ValidateUtil"));
@@ -23,50 +23,11 @@ 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 };
 };
 exports.validateDashboardTask = validateDashboardTask;
-/**
- * Gets all the children task IDs for the given parent task IDs.
- */
-const getDashboardTaskChildrenIds = (allUserTasks, parentTaskIds) => {
-    const parentToTaskIdsDict = {};
-    const taskIdToTaskDict = {};
-    allUserTasks.forEach((task) => {
-        taskIdToTaskDict[task._id.toString()] = task;
-        if (task.parentTaskId) {
-            if (!parentToTaskIdsDict[task.parentTaskId.toString()]) {
-                parentToTaskIdsDict[task.parentTaskId.toString()] = [];
-            }
-            parentToTaskIdsDict[task.parentTaskId.toString()].push(task._id.toString());
-        }
-    });
-    const childrenIds = [];
-    parentTaskIds.forEach((taskId) => {
-        const task = taskIdToTaskDict[taskId.toString()];
-        if (task) {
-            const childrenTaskIds = getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, taskId.toString());
-            childrenIds.push(...childrenTaskIds.map((id) => new bson_1.ObjectId(id)));
-        }
-    });
-    return childrenIds;
-};
-exports.getDashboardTaskChildrenIds = getDashboardTaskChildrenIds;
-function getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, taskId) {
-    const childrenIds = parentToTaskIdsDict[taskId];
-    if (!childrenIds) {
-        return [];
-    }
-    childrenIds.forEach((childId) => {
-        const childTask = taskIdToTaskDict[childId];
-        if (childTask) {
-            const grandchildrenIds = getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, childId);
-            childrenIds.push(...grandchildrenIds);
-        }
-    });
-    return childrenIds;
-}
 /**
  * When thinking about the logic of tasks, the following thoughts come to mind:
  *
@@ -109,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/index.d.ts

@@ -2,11 +2,12 @@ import BaseDocument from './documents/BaseDocument';
 import BaseDocumentWithType from './documents/BaseDocumentWithType';
 import ApiKey, { validateApiKey } from './documents/common/ApiKey';
 import User, { UserCTO, validateUser } from './documents/common/User';
-import DashboardTask, { getDashboardTaskChildrenIds, validateDashboardTask } from './documents/dashboard/Task';
+import DashboardTask, { validateDashboardTask } from './documents/dashboard/Task';
 import DashboardUserConfig, { validateDashboardUserConfig } from './documents/dashboard/UserConfig';
 import { RecurrenceBasis, RecurrenceEffect, RecurrenceFrequency, RecurrenceFrequencyType, RecurrenceInfo } from './embedded-types/dashboard/task/RecurrenceInfo';
 import RequiredUserId from './schemas/required-refs/RequiredUserId';
 import { DocumentValidator } from './schemas/validators/DocumentValidator';
-export { User, validateUser, ApiKey, validateApiKey, DashboardUserConfig, validateDashboardUserConfig, DashboardTask, RecurrenceFrequencyType, RecurrenceBasis, RecurrenceEffect, validateDashboardTask, getDashboardTaskChildrenIds, BaseDocument, BaseDocumentWithType, RequiredUserId };
+import DashboardTaskService from './services/dashboard/TaskService';
+export { User, validateUser, ApiKey, validateApiKey, DashboardUserConfig, validateDashboardUserConfig, DashboardTask, RecurrenceFrequencyType, RecurrenceBasis, RecurrenceEffect, validateDashboardTask, DashboardTaskService, BaseDocument, BaseDocumentWithType, RequiredUserId };
 export type { DocumentValidator, UserCTO, RecurrenceInfo, RecurrenceFrequency };
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,aAAa,EAAE,EACpB,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,mBAAmB,EAAE,EAC1B,2BAA2B,EAC5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACf,MAAM,gDAAgD,CAAC;AACxD,OAAO,cAAc,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAG3E,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,MAAM,EACN,cAAc,EACd,mBAAmB,EACnB,2BAA2B,EAC3B,aAAa,EACb,uBAAuB,EACvB,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,EACZ,oBAAoB,EACpB,cAAc,EACf,CAAC;AAGF,YAAY,EAAE,iBAAiB,EAAE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,aAAa,EAAE,EACpB,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,mBAAmB,EAAE,EAC1B,2BAA2B,EAC5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACf,MAAM,gDAAgD,CAAC;AACxD,OAAO,cAAc,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,MAAM,EACN,cAAc,EACd,mBAAmB,EACnB,2BAA2B,EAC3B,aAAa,EACb,uBAAuB,EACvB,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACpB,cAAc,EACf,CAAC;AAGF,YAAY,EAAE,iBAAiB,EAAE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC"}

package/lib/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequiredUserId = exports.BaseDocumentWithType = exports.BaseDocument = exports.getDashboardTaskChildrenIds = exports.validateDashboardTask = exports.RecurrenceEffect = exports.RecurrenceBasis = exports.RecurrenceFrequencyType = exports.DashboardTask = exports.validateDashboardUserConfig = exports.DashboardUserConfig = exports.validateApiKey = exports.ApiKey = exports.validateUser = exports.User = void 0;
+exports.RequiredUserId = exports.BaseDocumentWithType = exports.BaseDocument = exports.DashboardTaskService = exports.validateDashboardTask = exports.RecurrenceEffect = exports.RecurrenceBasis = exports.RecurrenceFrequencyType = exports.DashboardTask = exports.validateDashboardUserConfig = exports.DashboardUserConfig = exports.validateApiKey = exports.ApiKey = exports.validateUser = exports.User = void 0;
 const BaseDocument_1 = __importDefault(require("./documents/BaseDocument"));
 exports.BaseDocument = BaseDocument_1.default;
 const BaseDocumentWithType_1 = __importDefault(require("./documents/BaseDocumentWithType"));
@@ -39,7 +39,6 @@ exports.User = User_1.default;
 Object.defineProperty(exports, "validateUser", { enumerable: true, get: function () { return User_1.validateUser; } });
 const Task_1 = __importStar(require("./documents/dashboard/Task"));
 exports.DashboardTask = Task_1.default;
-Object.defineProperty(exports, "getDashboardTaskChildrenIds", { enumerable: true, get: function () { return Task_1.getDashboardTaskChildrenIds; } });
 Object.defineProperty(exports, "validateDashboardTask", { enumerable: true, get: function () { return Task_1.validateDashboardTask; } });
 const UserConfig_1 = __importStar(require("./documents/dashboard/UserConfig"));
 exports.DashboardUserConfig = UserConfig_1.default;
@@ -50,3 +49,5 @@ Object.defineProperty(exports, "RecurrenceEffect", { enumerable: true, get: func
 Object.defineProperty(exports, "RecurrenceFrequencyType", { enumerable: true, get: function () { return RecurrenceInfo_1.RecurrenceFrequencyType; } });
 const RequiredUserId_1 = __importDefault(require("./schemas/required-refs/RequiredUserId"));
 exports.RequiredUserId = RequiredUserId_1.default;
+const TaskService_1 = __importDefault(require("./services/dashboard/TaskService"));
+exports.DashboardTaskService = TaskService_1.default;

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

@@ -0,0 +1,27 @@
+import { ObjectId } from 'bson';
+import DashboardTask from '../../documents/dashboard/Task';
+import { RecurrenceFrequency } from '../../embedded-types/dashboard/task/RecurrenceInfo';
+export default class DashboardTaskService {
+    /**
+     * Gets all the children task IDs for the given parent task IDs.
+     */
+    static getChildrenIds: (allUserTasks: DashboardTask[], parentTaskIds: ObjectId[]) => ObjectId[];
+    /**
+     * Gets the next frequency date from the provided basis date. Returns null
+     * if the provided frequency is in an invalid state.
+     */
+    static getNextFrequencyDate(basisDate: Date, frequency: RecurrenceFrequency): Date | null;
+    /**
+     * Moves the start and due date forward by one frequency.
+     *
+     * This does not take into account the recurrence effect. That should be
+     * handled on the frontend.
+     *
+     * Makes no changes if the state of the task is invalid for recurrence or
+     * 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

@@ -0,0 +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;IA+D1D,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAcnC,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAsBlC"}

package/lib/services/dashboard/TaskService.js

@@ -0,0 +1,177 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const bson_1 = require("bson");
+const core_ts_lib_1 = require("@aneuhold/core-ts-lib");
+const RecurrenceInfo_1 = require("../../embedded-types/dashboard/task/RecurrenceInfo");
+class DashboardTaskService {
+    /**
+     * Gets all the children task IDs for the given parent task IDs.
+     */
+    static getChildrenIds = (allUserTasks, parentTaskIds) => {
+        const parentToTaskIdsDict = {};
+        const taskIdToTaskDict = {};
+        allUserTasks.forEach((task) => {
+            taskIdToTaskDict[task._id.toString()] = task;
+            if (task.parentTaskId) {
+                if (!parentToTaskIdsDict[task.parentTaskId.toString()]) {
+                    parentToTaskIdsDict[task.parentTaskId.toString()] = [];
+                }
+                parentToTaskIdsDict[task.parentTaskId.toString()].push(task._id.toString());
+            }
+        });
+        const childrenIds = [];
+        parentTaskIds.forEach((taskId) => {
+            const task = taskIdToTaskDict[taskId.toString()];
+            if (task) {
+                const childrenTaskIds = this.getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, taskId.toString());
+                childrenIds.push(...childrenTaskIds.map((id) => new bson_1.ObjectId(id)));
+            }
+        });
+        return childrenIds;
+    };
+    /**
+     * Gets the next frequency date from the provided basis date. Returns null
+     * if the provided frequency is in an invalid state.
+     */
+    static getNextFrequencyDate(basisDate, frequency) {
+        // Last day of month
+        if (frequency.type === RecurrenceInfo_1.RecurrenceFrequencyType.lastDayOfMonth) {
+            return core_ts_lib_1.DateService.getLastDayOfGivenMonth(basisDate);
+        }
+        // Every X Time Unit
+        if (frequency.type === RecurrenceInfo_1.RecurrenceFrequencyType.everyXTimeUnit) {
+            if (!frequency.everyXTimeUnit) {
+                return null;
+            }
+            if (frequency.everyXTimeUnit.timeUnit === 'day') {
+                return core_ts_lib_1.DateService.addDays(basisDate, frequency.everyXTimeUnit.x);
+            }
+            if (frequency.everyXTimeUnit.timeUnit === 'week') {
+                return core_ts_lib_1.DateService.addDays(basisDate, frequency.everyXTimeUnit.x * 7);
+            }
+            if (frequency.everyXTimeUnit.timeUnit === 'month') {
+                return core_ts_lib_1.DateService.addMonths(basisDate, frequency.everyXTimeUnit.x);
+            }
+            if (frequency.everyXTimeUnit.timeUnit === 'year') {
+                return core_ts_lib_1.DateService.addYears(basisDate, frequency.everyXTimeUnit.x);
+            }
+        }
+        // Week Day Set
+        if (frequency.type === RecurrenceInfo_1.RecurrenceFrequencyType.weekDaySet) {
+            if (!frequency.weekDaySet) {
+                return null;
+            }
+            const newDate = new Date(basisDate);
+            let daysToAdd = 0;
+            while (daysToAdd < 7) {
+                newDate.setDate(newDate.getDate() + 1);
+                if (frequency.weekDaySet.includes(newDate.getDay())) {
+                    return newDate;
+                }
+                daysToAdd += 1;
+            }
+        }
+        // Every X Weekday of Month
+        if (frequency.type === RecurrenceInfo_1.RecurrenceFrequencyType.everyXWeekdayOfMonth) {
+            if (!frequency.everyXWeekdayOfMonth) {
+                return null;
+            }
+            // Start by adding one day
+            let newDate = core_ts_lib_1.DateService.getWeekDayOfXWeekOfMonth(core_ts_lib_1.DateService.addDays(basisDate, 1), frequency.everyXWeekdayOfMonth.weekDay, frequency.everyXWeekdayOfMonth.weekOfMonth);
+            let monthsPassed = 0;
+            while (!newDate ||
+                newDate < basisDate ||
+                newDate.getTime() === basisDate.getTime()) {
+                monthsPassed += 1;
+                newDate = core_ts_lib_1.DateService.getWeekDayOfXWeekOfMonth(core_ts_lib_1.DateService.addMonths(basisDate, monthsPassed), frequency.everyXWeekdayOfMonth.weekDay, frequency.everyXWeekdayOfMonth.weekOfMonth);
+                if (monthsPassed > 11) {
+                    return null;
+                }
+            }
+            return newDate;
+        }
+        return null;
+    }
+    /**
+     * Moves the start and due date forward by one frequency.
+     *
+     * This does not take into account the recurrence effect. That should be
+     * handled on the frontend.
+     *
+     * Makes no changes if the state of the task is invalid for recurrence or
+     * there isn't recurrence info.
+     */
+    static updateDatesForRecurrence(task) {
+        // Initial basic validation
+        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;
+        }
+        let diff = 0;
+        if (task.parentRecurringTaskInfo) {
+            if (task.recurrenceInfo.recurrenceBasis === 'startDate') {
+                diff = this.getDiffForDateUpdate(task.parentRecurringTaskInfo.startDate, task.recurrenceInfo.frequency);
+            }
+            else {
+                diff = this.getDiffForDateUpdate(task.parentRecurringTaskInfo.dueDate, task.recurrenceInfo.frequency);
+            }
+        }
+        else if (task.recurrenceInfo.recurrenceBasis === 'startDate') {
+            diff = this.getDiffForDateUpdate(task.startDate, task.recurrenceInfo.frequency);
+        }
+        else {
+            diff = this.getDiffForDateUpdate(task.dueDate, task.recurrenceInfo.frequency);
+        }
+        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];
+        if (!childrenIds) {
+            return [];
+        }
+        childrenIds.forEach((childId) => {
+            const childTask = taskIdToTaskDict[childId];
+            if (childTask) {
+                const grandchildrenIds = this.getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, childId);
+                childrenIds.push(...grandchildrenIds);
+            }
+        });
+        return childrenIds;
+    }
+}
+exports.default = DashboardTaskService;

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=TaskService.spec.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TaskService.spec.d.ts","sourceRoot":"","sources":["../../../src/services/dashboard/TaskService.spec.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,205 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const bson_1 = require("bson");
+const Task_1 = __importDefault(require("../../documents/dashboard/Task"));
+const RecurrenceInfo_1 = require("../../embedded-types/dashboard/task/RecurrenceInfo");
+const TaskService_1 = __importDefault(require("./TaskService"));
+describe('DashboardTaskService', () => {
+    describe('getNextFrequencyDate', () => {
+        it('should return a valid date for lastDayOfMonth', () => {
+            const basisDate = new Date(2024, 0, 1);
+            const frequency = {
+                type: RecurrenceInfo_1.RecurrenceFrequencyType.lastDayOfMonth
+            };
+            const result = TaskService_1.default.getNextFrequencyDate(basisDate, frequency);
+            expect(result).toEqual(new Date(2024, 0, 31));
+        });
+        describe('every X time unit', () => {
+            it('should return a valid date for every X Day', () => {
+                const basisDate = new Date(2024, 0, 1);
+                const frequency = {
+                    type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXTimeUnit,
+                    everyXTimeUnit: {
+                        timeUnit: 'day',
+                        x: 2
+                    }
+                };
+                const result = TaskService_1.default.getNextFrequencyDate(basisDate, frequency);
+                expect(result).toEqual(new Date(2024, 0, 3));
+            });
+            it('should return a valid date for every X Week', () => {
+                const basisDate = new Date(2024, 0, 1);
+                const frequency = {
+                    type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXTimeUnit,
+                    everyXTimeUnit: {
+                        timeUnit: 'week',
+                        x: 2
+                    }
+                };
+                const result = TaskService_1.default.getNextFrequencyDate(basisDate, frequency);
+                expect(result).toEqual(new Date(2024, 0, 15));
+            });
+            it('should return a valid date for every X Month', () => {
+                const basisDate = new Date(2024, 0, 1);
+                const frequency = {
+                    type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXTimeUnit,
+                    everyXTimeUnit: {
+                        timeUnit: 'month',
+                        x: 2
+                    }
+                };
+                const result = TaskService_1.default.getNextFrequencyDate(basisDate, frequency);
+                expect(result).toEqual(new Date(2024, 2, 1));
+            });
+        });
+        it('should return a valid date for weekDaySet', () => {
+            const basisDate = new Date(2024, 0, 1);
+            const frequency = {
+                type: RecurrenceInfo_1.RecurrenceFrequencyType.weekDaySet,
+                weekDaySet: [0, 6]
+            };
+            const result = TaskService_1.default.getNextFrequencyDate(basisDate, frequency);
+            expect(result).toEqual(new Date(2024, 0, 6));
+        });
+        describe('Every X Weekday of Month', () => {
+            it('should return a valid date for every 2nd Sunday of Month', () => {
+                const basisDate = new Date(2024, 0, 1);
+                // Every second sunday
+                const frequency = {
+                    type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXWeekdayOfMonth,
+                    everyXWeekdayOfMonth: {
+                        weekDay: 0,
+                        weekOfMonth: 2
+                    }
+                };
+                const result = TaskService_1.default.getNextFrequencyDate(basisDate, frequency);
+                expect(result).toEqual(new Date(2024, 0, 14));
+            });
+            it('should return a valid date across year change', () => {
+                const basisDate = new Date(2023, 11, 30);
+                // Every 1st Saturday
+                const frequency = {
+                    type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXWeekdayOfMonth,
+                    everyXWeekdayOfMonth: {
+                        weekDay: 6,
+                        weekOfMonth: 1
+                    }
+                };
+                const result = TaskService_1.default.getNextFrequencyDate(basisDate, frequency);
+                expect(result).toEqual(new Date(2024, 0, 6));
+            });
+            it('should return a valid next date when the basis is the same as the recurrence', () => {
+                const basisDate = new Date(2024, 0, 14);
+                // Every second sunday
+                const frequency = {
+                    type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXWeekdayOfMonth,
+                    everyXWeekdayOfMonth: {
+                        weekDay: 0,
+                        weekOfMonth: 2
+                    }
+                };
+                const result = TaskService_1.default.getNextFrequencyDate(basisDate, frequency);
+                expect(result).toEqual(new Date(2024, 1, 11));
+            });
+        });
+    });
+    describe('updateDatesForRecurrence', () => {
+        describe('Start date basis', () => {
+            it('should update the start date correctly for a daily recurrence', () => {
+                const task = new Task_1.default(new bson_1.ObjectId());
+                task.startDate = new Date(2024, 0, 1);
+                task.recurrenceInfo = {
+                    frequency: {
+                        type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXTimeUnit,
+                        everyXTimeUnit: {
+                            timeUnit: 'day',
+                            x: 1
+                        }
+                    },
+                    recurrenceBasis: RecurrenceInfo_1.RecurrenceBasis.startDate,
+                    recurrenceEffect: RecurrenceInfo_1.RecurrenceEffect.rollOnBasis
+                };
+                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);
+                task.recurrenceInfo = {
+                    frequency: {
+                        type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXTimeUnit,
+                        everyXTimeUnit: {
+                            timeUnit: 'week',
+                            x: 1
+                        }
+                    },
+                    recurrenceBasis: RecurrenceInfo_1.RecurrenceBasis.startDate,
+                    recurrenceEffect: RecurrenceInfo_1.RecurrenceEffect.rollOnBasis
+                };
+                TaskService_1.default.updateDatesForRecurrence(task);
+                expect(task.startDate).toEqual(new Date(2024, 0, 8));
+            });
+            it('should update the start and due date correctly for a weekDaySet reccurence', () => {
+                const task = new Task_1.default(new bson_1.ObjectId());
+                task.startDate = new Date(2024, 0, 1, 11);
+                task.dueDate = new Date(2024, 0, 4, 23, 59);
+                task.recurrenceInfo = {
+                    frequency: {
+                        type: RecurrenceInfo_1.RecurrenceFrequencyType.weekDaySet,
+                        weekDaySet: [0, 5]
+                    },
+                    recurrenceBasis: RecurrenceInfo_1.RecurrenceBasis.startDate,
+                    recurrenceEffect: RecurrenceInfo_1.RecurrenceEffect.rollOnBasis
+                };
+                TaskService_1.default.updateDatesForRecurrence(task);
+                expect(task.startDate).toEqual(new Date(2024, 0, 5, 11));
+                expect(task.dueDate).toEqual(new Date(2024, 0, 8, 23, 59));
+            });
+            it('should update the start and due date correctly for a everyXWeekdayOfMonth reccurence', () => {
+                const task = new Task_1.default(new bson_1.ObjectId());
+                task.startDate = new Date(2024, 0, 1, 11);
+                task.dueDate = new Date(2024, 0, 4, 23, 59);
+                task.recurrenceInfo = {
+                    frequency: {
+                        type: RecurrenceInfo_1.RecurrenceFrequencyType.everyXWeekdayOfMonth,
+                        everyXWeekdayOfMonth: {
+                            weekDay: 0,
+                            weekOfMonth: 1
+                        }
+                    },
+                    recurrenceBasis: RecurrenceInfo_1.RecurrenceBasis.startDate,
+                    recurrenceEffect: RecurrenceInfo_1.RecurrenceEffect.rollOnBasis
+                };
+                TaskService_1.default.updateDatesForRecurrence(task);
+                expect(task.startDate).toEqual(new Date(2024, 0, 7, 11));
+                expect(task.dueDate).toEqual(new Date(2024, 0, 10, 23, 59));
+            });
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aneuhold/core-ts-db-lib",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "A core database library used for personal projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -26,12 +26,15 @@
     "build": "tsc",
     "watch": "tsc -w",
     "link:local": "cd lib && yarn link",
+    "link:core-ts-lib": "yarn link @aneuhold/core-ts-lib",
     "unlink:local": "cd lib && yarn unlink",
+    "unlink:core-ts-lib": "yarn unlink @aneuhold/core-ts-lib && yarn install --force",
     "upgrade:all": "yarn upgrade --latest",
     "upgrade:core": "yarn upgrade --latest --pattern @aneuhold",
     "test": "jest"
   },
   "dependencies": {
+    "@aneuhold/core-ts-lib": "^1.1.10",
     "bson": "^6.2.0"
   },
   "devDependencies": {