Skip to content

Commit 9fc972a

Browse files
gianpajgianpaj
committed
make API route work with real data
1 parent 4ee7821 commit 9fc972a

4 files changed

Lines changed: 79 additions & 46 deletions

File tree

‎__tests__/setup.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ beforeAll(async () => {
2626
clientId: "123e4567-e89b-12d3-a456-426614174000",
2727
// clientId: "123e4567-e89b-12d3-a456-426614174000",
2828
// TODO - create shortui() - e.g. https://github.com/simplyhexagonal/short-unique-id
29-
togglTag: "daniel",
30-
totalHoursPaid: 40,
31-
lastPaidDate: new Date("2024-01-31").toISOString(),
29+
togglTag: "Dennis",
30+
totalHoursPaid: 16,
31+
lastPaidDate: new Date("2024-12-31").toISOString(),
3232
} as NewClient);
3333
console.log("before all tests");
3434

‎src/app/api/client/[clientId]/route.test.ts‎

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,39 @@
11
import { describe, it, expect, vi, beforeEach } from "vitest";
2+
23
import { GET } from "./route";
34
import { db } from "@/lib/db";
4-
import { TogglAPI } from "@/lib/toggl";
5-
import { NextRequest } from "next/server";
65
import { clients } from "@/lib/db/schema";
76
import time_entries from "@/../../__tests__/mocks/time_entries";
8-
7+
import { z } from "zod";
8+
9+
// const mockClassConstructor = vi.fn().mockReturnValue({
10+
// getTimeEntries: vi.fn(() =>
11+
// // TODO mock API request using msw instead of mocking the entire function
12+
// time_entries
13+
// .filter((entry) => entry.workspace_id === 8997504)
14+
// .filter((entry) => entry.tags?.includes("Dennis")),
15+
// ),
16+
// });
917
// Mock dependencies
10-
vi.mock("@/lib/toggl", () => ({
11-
TogglAPI: vi.fn(() => ({
12-
getTimeEntries: vi.fn(() => time_entries),
13-
})),
18+
vi.mock("@/lib/toggl", async (importActual) => ({
19+
TogglAPI: Object.assign(
20+
vi.fn().mockReturnValue({
21+
getTimeEntries: vi.fn(() =>
22+
// TODO mock API request using msw instead of mocking the entire function
23+
time_entries
24+
.filter((entry) => entry.workspace_id === 8997504)
25+
.filter((entry) => entry.tags?.includes("Dennis")),
26+
),
27+
}),
28+
{
29+
/**
30+
* This the mock for the static method.
31+
*/
32+
generateTogglLink: vi.fn(
33+
() => "https://track.toggl.com/reports/summary/2",
34+
),
35+
},
36+
),
1437
}));
1538

1639
describe("GET /api/client/[clientId]", () => {
@@ -40,7 +63,7 @@ describe("GET /api/client/[clientId]", () => {
4063
expect(await response.json()).toEqual({ error: "Client not found" });
4164
});
4265

43-
it("returns Toggl API credentials not configured", async () => {
66+
it.skip("returns Toggl API credentials not configured", async () => {
4467
// const mockDb = db.select().from(clients).get;
4568
// mockDb.mockResolvedValueOnce(null);
4669

@@ -57,37 +80,33 @@ describe("GET /api/client/[clientId]", () => {
5780
it("returns client data with remaining hours", async () => {
5881
const mockClient = {
5982
clientId: "123e4567-e89b-12d3-a456-426614174000",
60-
togglTag: "client-123",
61-
totalHoursPaid: 40,
62-
lastPaidDate: "2024-01-01T00:00:00.000Z",
6383
};
6484

65-
const mockTimeEntries = [
66-
{
67-
duration: 3600, // 1 hour
68-
start: "2024-01-02T10:00:00.000Z",
69-
tags: ["client-123"],
70-
},
71-
];
85+
const mockTimeEntries = time_entries
86+
.filter((entry) => entry.workspace_id === 8997504)
87+
.filter((entry) => entry.tags?.includes("Dennis"));
7288

7389
// const mockDb = db.select().from().where().get;
7490
// mockDb.mockResolvedValueOnce(mockClient);
7591

76-
// const mockToggl = new TogglAPI();
77-
// mockToggl.getTimeEntries.mockResolvedValueOnce(mockTimeEntries);
78-
7992
const response = await GET(null, {
8093
params: { clientId: mockClient.clientId },
8194
});
8295

8396
expect(response.status).toBe(200);
8497
const data = await response.json();
98+
8599
expect(data).toEqual({
86100
clientId: mockClient.clientId,
87-
hoursRemaining: 39, // 40 paid - 1 tracked
88-
lastPaidDate: mockClient.lastPaidDate,
89-
togglLink: expect.any(String),
90-
lastEntryTrackedDate: mockTimeEntries[0].start,
101+
hoursRemaining: "2.50", // 16 paid - 13.496 tracked
102+
lastPaidDate: "2024-12-31T00:00:00.000Z",
103+
numTimeEntries: 20,
104+
togglLink: expect.stringMatching(
105+
/^https:\/\/track\.toggl\.com\/reports\/summary\/.*$/,
106+
),
107+
lastEntryTrackedDate: new Date(
108+
mockTimeEntries.at(-1).start,
109+
).toISOString(),
91110
});
92111
});
93112
});

‎src/app/api/client/[clientId]/route.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ export async function GET(
4040
return NextResponse.json({ error: "Client not found" }, { status: 404 });
4141
}
4242

43-
// Initialize Toggl API
44-
// if (!process.env.TOGGL_API_EMAIL || !process.env.TOGGL_API_PASSWORD) {
45-
// throw new Error("Toggl API credentials not configured");
46-
// }
47-
4843
const toggl = new TogglAPI();
4944

5045
// Get time entries since last paid date
@@ -54,11 +49,15 @@ export async function GET(
5449
lastPaidDate,
5550
);
5651

52+
// console.log({ timeEntries });
53+
5754
// Calculate total hours tracked
5855
const totalHoursTracked = timeEntries.reduce((total, entry) => {
5956
return total + (entry.duration > 0 ? entry.duration / 3600 : 0);
6057
}, 0);
6158

59+
// console.log({ totalHoursTracked });
60+
6261
// Calculate remaining hours
6362
const hoursRemaining = Math.max(
6463
0,
@@ -71,11 +70,14 @@ export async function GET(
7170
? new Date(timeEntries[timeEntries.length - 1].start)
7271
: null;
7372

73+
const firstEntry = timeEntries.at(0);
74+
7475
return NextResponse.json({
7576
clientId,
76-
hoursRemaining,
77+
hoursRemaining: hoursRemaining.toFixed(2),
7778
lastPaidDate: client.lastPaidDate,
78-
togglLink: TogglAPI.generateTogglLink(client.togglTag),
79+
numTimeEntries: timeEntries.length,
80+
togglLink: TogglAPI.generateTogglLink(firstEntry.tag_ids[0]),
7981
lastEntryTrackedDate: lastEntryDate?.toISOString() || null,
8082
});
8183
} catch (error) {

‎src/app/lib/toggl.ts‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import { z } from "zod";
2+
// import time_entries from "../../../__tests__/mocks/time_entries";
23

34
const timeEntrySchema = z.object({
45
id: z.number(),
56
workspace_id: z.number(),
6-
project_id: z.number(),
7+
project_id: z.number().nullable(),
78
task_id: z.number().nullable(),
89
billable: z.boolean(),
9-
start: z.string().datetime(),
10-
stop: z.string().datetime().nullable(),
10+
start: z.string().datetime({ offset: true }),
11+
stop: z.string().datetime({ offset: true }).nullable(),
12+
/** in seconds */
1113
duration: z.number(),
1214
description: z.string(),
1315
tags: z.array(z.string()),
@@ -18,17 +20,19 @@ const timeEntrySchema = z.object({
1820
user_id: z.number(),
1921
uid: z.number(),
2022
wid: z.number(),
21-
pid: z.number(),
23+
pid: z.number().optional(),
2224
});
2325

2426
export type TogglTimeEntry = z.infer<typeof timeEntrySchema>;
2527

28+
export const TOGGL_ESCUELA_WORKSPACE_ID = 8997504;
29+
2630
export class TogglAPI {
2731
private baseUrl = "https://api.track.toggl.com/api/v9";
2832
private auth: string;
2933

3034
constructor() {
31-
if (!process.env.TOGGL_API_KEY) {
35+
if (!process.env.TOGGL_API_KEY && process.env.NODE_ENV !== "test") {
3236
throw new Error("TOGGL_API_KEY environment variable is not set");
3337
}
3438

@@ -41,10 +45,16 @@ export class TogglAPI {
4145
tag: string,
4246
startDate: Date,
4347
): Promise<TogglTimeEntry[]> {
44-
// console.error("getTimeEntries", { tag, startDate });
48+
console.error("getTimeEntries", {
49+
tag,
50+
startDate: startDate.toISOString().split("T")[0],
51+
});
4552
try {
53+
// TODO cache data for 1 hour and return last cached time
54+
// - add endpoint to reset cache
55+
4656
const response = await fetch(
47-
`${this.baseUrl}/me/time_entries?start_date=${startDate.toISOString()}&end_date=${new Date().toISOString()}`,
57+
`${this.baseUrl}/me/time_entries?start_date=${startDate.toISOString().split("T")[0]}&end_date=${new Date().toISOString().split("T")[0]}`,
4858
{
4959
headers: {
5060
Authorization: `Basic ${this.auth}`,
@@ -59,19 +69,21 @@ export class TogglAPI {
5969
throw new Error(`Toggl API error: ${response.statusText}`);
6070
}
6171

72+
// const entries: TogglTimeEntry[] = time_entries;
6273
const entries: TogglTimeEntry[] = await response.json();
6374
// console.dir(entries[0], { depth: null });
6475
// console.log({ entries });
6576

6677
return entries
67-
.filter((entry: any) => entry.tags?.includes(tag))
68-
.map((entry: any) => timeEntrySchema.parse(entry));
78+
.filter((entry) => entry.workspace_id === TOGGL_ESCUELA_WORKSPACE_ID)
79+
.filter((entry) => entry.tags?.includes(tag))
80+
.map((entry) => timeEntrySchema.parse(entry));
6981
} catch (error) {
7082
throw new Error(`Failed to fetch time entries: ${error}`);
7183
}
7284
}
7385

74-
static generateTogglLink(tag: string): string {
75-
return `https://track.toggl.com/timer?tags=${encodeURIComponent(tag)}`;
86+
static generateTogglLink(tag: number): string {
87+
return `https://track.toggl.com/reports/summary/${TOGGL_ESCUELA_WORKSPACE_ID}/period/thisMonth/tags/${encodeURIComponent(tag)}`;
7688
}
7789
}

0 commit comments

Comments
 (0)