Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit ce5295f

Browse files
committed
fix: todayTasks methods
1 parent 442d147 commit ce5295f

File tree

4 files changed

+13
-44
lines changed

4 files changed

+13
-44
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"types": "dist/index.d.ts",
2121
"dependencies": {
2222
"axios": "^0.24.0",
23-
"moment": "^2.29.1",
2423
"uuid": "^8.3.2"
2524
},
2625
"devDependencies": {

src/__tests__/task.tests.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import TDSClient, { Task } from "..";
22
import { APITaskObject, CreatableTask } from "../definitions";
3-
import moment from "moment";
43

54
const myClient = TDSClient(process.env.TODOIST_TOKEN);
65

@@ -129,19 +128,9 @@ describe("API Tasks Functions", () => {
129128
allTodayJSON.some((taskObj) => taskObj.content === "First task") &&
130129
allTodayNames.some((name) => name === "First task");
131130

132-
let normalDate = new Date().toISOString().substring(0, 10);
133-
let momentDate = moment.parseZone(new Date()).format().substring(0, 10);
134-
135-
if (normalDate === momentDate) {
136-
// GMT day = local day
137-
expect(allTodayJSON.length).toBe(2);
138-
expect(typeof allTodayJSON[0]).toBe("object");
139-
expect(firstTaskExists).toBe(true);
140-
} else {
141-
// GMT day != local day (offset influence in day)
142-
expect(allTodayJSON.length).toBe(0);
143-
expect(firstTaskExists).toBe(false);
144-
}
131+
expect(allTodayJSON.length).toBe(2);
132+
expect(typeof allTodayJSON[0]).toBe("object");
133+
expect(firstTaskExists).toBe(true);
145134
});
146135

147136
test("Test getAllTaskNames", async () => {

src/submodules/extras.ts

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
APIProjectObject,
66
APISectionObject,
77
} from "../definitions";
8-
import moment from "moment";
98
import { get } from "../libs/apiRequests";
109
import {
1110
LABELS_URL,
@@ -26,35 +25,22 @@ const extrasClientModule = (headers: AuthHeader): ExtrasModule => {
2625
},
2726

2827
getTodayTaskNames: async () => {
29-
let json = await get<APITaskObject[]>(`${TASKS_URL}`, { headers });
28+
let json = await get<APITaskObject[]>(`${TASKS_URL}`, {
29+
headers,
30+
params: { lang: "en", filter: "today" },
31+
});
3032
let arrayTasks: string[] = [];
3133

32-
let todayTasksJson = json
33-
.filter((task) => task.due !== undefined)
34-
.filter(
35-
(task) =>
36-
task.due.date ===
37-
moment.parseZone(new Date()).format().substring(0, 10)
38-
);
39-
40-
todayTasksJson.forEach((task) => arrayTasks.push(task.content));
34+
json.forEach((task) => arrayTasks.push(task.content));
4135

4236
return arrayTasks;
4337
},
4438

45-
getTodayTaskJSON: async () => {
46-
let json = await get<APITaskObject[]>(`${TASKS_URL}`, { headers });
47-
48-
let todayTasksJson = json
49-
.filter((task) => task.due !== undefined)
50-
.filter(
51-
(task) =>
52-
task.due.date ===
53-
moment.parseZone(new Date()).format().substring(0, 10)
54-
);
55-
56-
return todayTasksJson;
57-
},
39+
getTodayTaskJSON: async () =>
40+
await get<APITaskObject[]>(`${TASKS_URL}`, {
41+
headers,
42+
params: { lang: "en", filter: "today" },
43+
}),
5844

5945
getAllProjectNames: async () => {
6046
let json = await get<APIProjectObject[]>(`${PROJECTS_URL}`, { headers });

yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,11 +1981,6 @@ minimist@^1.2.5:
19811981
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
19821982
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
19831983

1984-
moment@^2.29.1:
1985-
version "2.29.1"
1986-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
1987-
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
1988-
19891984
ms@2.1.2:
19901985
version "2.1.2"
19911986
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"

0 commit comments

Comments
 (0)