joshuacoles/revision-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update reads to toggl database

Browse Source
This commit is contained in:
Joshua Coles 2024-03-04 19:46:07 +00:00
parent 50730a2b09
commit 1a14485c57
2 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/data/db.d.ts vendored
View File

@ -1,4 +1,4 @@
import type {ColumnType, JSONColumnType} from "kysely"; import type {ColumnType} from "kysely";
export type Generated<T> = T extends ColumnType<infer S, infer I, infer U> export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
? ColumnType<S, I | undefined, U> ? ColumnType<S, I | undefined, U>
@ -32,13 +32,13 @@ export interface Client {
export interface Project { export interface Project {
active: boolean; active: boolean;
client_id: number | null; client_id: number | null;
color: string;
id: Generated<number>; id: Generated<number>;
name: string; name: string;
raw_json: JSONColumnType<{ raw_json: Json;
color: string; server_created_at: Timestamp;
id: number; server_deleted_at: Timestamp | null;
name: string; server_updated_at: Timestamp;
}>;
toggl_id: Int8; toggl_id: Int8;
workspace_id: Int8; workspace_id: Int8;
} }
@ -47,13 +47,12 @@ export interface TimeEntry {
description: string; description: string;
id: Generated<number>; id: Generated<number>;
project_id: Int8 | null; project_id: Int8 | null;
raw_json: JSONColumnType<{ raw_json: Json;
start: string; server_deleted_at: Timestamp | null;
end: string; server_updated_at: Timestamp;
seconds: number;
}>;
start: Timestamp; start: Timestamp;
stop: Timestamp; stop: Timestamp;
tags: Generated<Json>;
toggl_id: Int8; toggl_id: Int8;
} }

20
src/data/fetchData.ts
View File

@ -52,12 +52,12 @@ export async function getData(config: OverviewConfig): Promise<Data> {
let projectIds = config.subjects.map((subject) => subject.projectId.toString()); let projectIds = config.subjects.map((subject) => subject.projectId.toString());
const projects = await db.selectFrom('project') const projects = await db.selectFrom('project')
.select('raw_json') .select(['toggl_id', 'name', 'color'])
.where('project.toggl_id', 'in', projectIds) .where('toggl_id', 'in', projectIds)
.execute(); .execute()
const timeEntries = await db.selectFrom('time_entry') const timeEntries = await db.selectFrom('time_entry')
.select(['project_id', 'raw_json']) .select(['project_id', 'start', 'stop'])
.where('project_id', 'in', projectIds) .where('project_id', 'in', projectIds)
.where('start', '>', dFns.parseISO(config.timePeriod.start)) .where('start', '>', dFns.parseISO(config.timePeriod.start))
.where('start', '<', dFns.parseISO(config.timePeriod.end)) .where('start', '<', dFns.parseISO(config.timePeriod.end))
@ -65,16 +65,16 @@ export async function getData(config: OverviewConfig): Promise<Data> {
return { return {
projects: projects.map((project) => ({ projects: projects.map((project) => ({
projectId: project.raw_json.id, projectId: parseInt(project.toggl_id),
name: project.raw_json.name, name: project.name,
color: project.raw_json.color, color: project.color,
})), })),
timeEntries: timeEntries.map((timeEntry) => ({ timeEntries: timeEntries.map((timeEntry) => ({
projectId: parseInt(timeEntry.project_id!), projectId: parseInt(timeEntry.project_id!),
start: timeEntry.raw_json.start, start: dFns.formatISO(timeEntry.start),
end: timeEntry.raw_json.end, end: dFns.formatISO(timeEntry.stop),
duration: timeEntry.raw_json.seconds, duration: dFns.differenceInSeconds(timeEntry.stop, timeEntry.start)
})), })),
} }
} }