Merge pull request #30 from dubisdev/fix-today-tasks

fix: not getting some today tasks

Author: dubisdev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "todoist-rest-client",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A simple todoist-rest-api client",
   "author": "David Jiménez",
   "license": "MIT",
@@ -19,7 +19,8 @@
   },
   "types": "dist/index.d.ts",
   "dependencies": {
-    "axios": "^0.24.0"
+    "axios": "^0.24.0",
+    "moment": "^2.29.1"
   },
   "devDependencies": {
     "@types/jest": "^27.0.2",

src/__tests__/task.tests.ts

@@ -1,8 +1,27 @@
 import TDSClient, { Task } from "..";
 import { APITaskObject, ClientCreatedTask } from "../definitions";
+import moment from "moment";
 
 const myClient = TDSClient(process.env.TODOIST_TOKEN);
 
+beforeAll(async () => {
+	let allTasksJSON = await myClient.task.getAllJSON();
+
+	for (let i = 0; i < allTasksJSON.length; ++i) {
+		await myClient.task.delete(allTasksJSON[i].id);
+	}
+	console.log("Init: Deleted all tasks!");
+});
+
+afterAll(async () => {
+	let allTasksJSON = await myClient.task.getAllJSON();
+
+	for (let i = 0; i < allTasksJSON.length; ++i) {
+		await myClient.task.delete(allTasksJSON[i].id);
+	}
+	console.log("Finish: Deleted all tasks!");
+});
+
 const generalExpectedTask = Task({
 	content: "Hello world",
 });
@@ -113,7 +132,7 @@ describe("API Tasks Functions", () => {
 	});
 
 	// no active tasks now
-	/* Not working now because of #19
+
 	test("Create Two Tasks For Today", async () => {
 		// create tasks in today inbox
 		const due_info = {
@@ -132,12 +151,20 @@ describe("API Tasks Functions", () => {
 			(taskObj) => taskObj.content === "Second task"
 		);
 
-		console.log(allTodayJSON);
-
-		expect(allTodayJSON.length).toBe(2);
-		expect(typeof allTodayJSON[0]).toBe("object");
-		expect(firstTaskExists).toBe(true);
-		expect(secondTaskExists).toBe(true);
+		let normalDate = new Date().toISOString().substring(0, 10);
+		let momentDate = moment.parseZone(new Date()).format().substring(0, 10);
+
+		if (normalDate === momentDate) {
+			// GMT day = local day
+			expect(allTodayJSON.length).toBe(2);
+			expect(typeof allTodayJSON[0]).toBe("object");
+			expect(firstTaskExists).toBe(true);
+			expect(secondTaskExists).toBe(true);
+		} else {
+			// GMT day != local day (offset influence in day)
+			expect(allTodayJSON.length).toBe(0);
+			expect(firstTaskExists).toBe(false);
+			expect(secondTaskExists).toBe(false);
+		}
 	});
-	*/
 });

src/submodules/task.ts

@@ -6,6 +6,7 @@ import {
 	TaskModule,
 	UserCreatedTask,
 } from "../definitions";
+import moment from "moment";
 
 const taskClientModule = (headers: AuthHeader): TaskModule => {
 	async function getOneJSON(id: number | string, headers: AuthHeader) {
@@ -75,7 +76,9 @@ const taskClientModule = (headers: AuthHeader): TaskModule => {
 			let todayTasksJson = json
 				.filter((task) => task.due !== undefined)
 				.filter(
-					(task) => task.due.date === new Date().toISOString().substring(0, 10)
+					(task) =>
+						task.due.date ===
+						moment.parseZone(new Date()).format().substring(0, 10)
 				);
 
 			todayTasksJson.map((task) => {
@@ -91,7 +94,9 @@ const taskClientModule = (headers: AuthHeader): TaskModule => {
 			let todayTasksJson = json
 				.filter((task) => task.due !== undefined)
 				.filter(
-					(task) => task.due.date === new Date().toISOString().substring(0, 10)
+					(task) =>
+						task.due.date ===
+						moment.parseZone(new Date()).format().substring(0, 10)
 				);
 
 			return todayTasksJson;

yarn.lock

@@ -1971,6 +1971,11 @@ minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+moment@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"