refactor: handler use infrastructure

Author: falkoschumann

src/main/application/timesheet_query_handler.ts

@@ -1,7 +1,5 @@
 // Copyright (c) 2026 Falko Schumann. All rights reserved. MIT license.
 
-import { Temporal } from "@js-temporal/polyfill";
-
 import { Clock, isTimestampInPeriod } from "../../shared/domain/temporal";
 import type {
   TimesheetQuery,
@@ -14,55 +12,58 @@ import { VacationChangedEvent } from "../domain/vacation_changed_event";
 import type { EventStore } from "../infrastructure/event_store";
 import { HolidayRepository } from "../infrastructure/holiday_repository";
 import { VacationRepository } from "../infrastructure/vacation_repository";
+import type { SettingsProvider } from "../infrastructure/settings_provider";
 
 export class TimesheetQueryHandler {
   static create({
-    capacity = "PT30M",
     eventStore,
     holidayRepository,
     vacationRepository,
+    settingsProvider,
     clock = Clock.systemDefaultZone(),
   }: {
-    capacity?: Temporal.DurationLike | string;
     eventStore: EventStore;
     holidayRepository: HolidayRepository;
     vacationRepository: VacationRepository;
+    settingsProvider: SettingsProvider;
     clock?: Clock;
   }) {
     return new TimesheetQueryHandler(
-      capacity,
       eventStore,
       holidayRepository,
       vacationRepository,
+      settingsProvider,
       clock,
     );
   }
 
-  capacity: Temporal.Duration;
-
-  readonly #eventStore: EventStore;
-  readonly #holidayRepository: HolidayRepository;
-  readonly #vacationRepository: VacationRepository;
-  readonly #clock: Clock;
+  readonly #eventStore;
+  readonly #holidayRepository;
+  readonly #vacationRepository;
+  readonly #settingsProvider;
+  readonly #clock;
 
   private constructor(
-    capacity: Temporal.DurationLike | string,
     eventStore: EventStore,
     holidayRepository: HolidayRepository,
     vacationRepository: VacationRepository,
+    settingsProvider: SettingsProvider,
     clock: Clock,
   ) {
-    this.capacity = Temporal.Duration.from(capacity);
     this.#eventStore = eventStore;
     this.#holidayRepository = holidayRepository;
     this.#vacationRepository = vacationRepository;
+    this.#settingsProvider = settingsProvider;
     this.#clock = clock;
   }
 
   async handle(query: TimesheetQuery): Promise<TimesheetQueryResult> {
     const readModel = new TimesheetReadModel();
 
-    readModel.project(CapacityChangedEvent.create({ capacity: this.capacity }));
+    const settings = await this.#settingsProvider.load();
+    readModel.project(
+      CapacityChangedEvent.create({ capacity: settings.capacity }),
+    );
 
     const holidays = await this.#holidayRepository.findAllByDate(
       query.from,

src/main/index.ts

@@ -97,6 +97,7 @@ const timesheetQueryHandler = TimesheetQueryHandler.create({
   eventStore,
   holidayRepository,
   vacationRepository,
+  settingsProvider,
 });
 const exportTimesheetCommandHandler = ExportTimesheetCommandHandler.create({
   timesheetExporter,
@@ -165,7 +166,6 @@ function applySettings(settings: Settings) {
   eventStore.fileName = `${settings.dataDir}/activity-log.csv`;
   holidayRepository.fileName = `${settings.dataDir}/holidays.csv`;
   vacationRepository.fileName = `${settings.dataDir}/vacation.csv`;
-  timesheetQueryHandler.capacity = settings.capacity;
 }
 
 async function installDevTools() {

test/main/unit/timesheet.test.ts

@@ -13,9 +13,11 @@ import {
 } from "../../../src/shared/domain/timesheet_query";
 import { ActivityLoggedEvent } from "../../../src/main/domain/activity_logged_event";
 import { Holiday, Vacation } from "../../../src/main/domain/calendar";
+import { Settings } from "../../../src/main/domain/settings";
 import { EventStore } from "../../../src/main/infrastructure/event_store";
 import { HolidayRepository } from "../../../src/main/infrastructure/holiday_repository";
 import { VacationRepository } from "../../../src/main/infrastructure/vacation_repository";
+import { SettingsProvider } from "../../../src/main/infrastructure/settings_provider";
 
 describe("Timesheet", () => {
   describe("Summarize hours worked on tasks", () => {
@@ -456,11 +458,13 @@ function configure({
   events,
   holidays,
   vacations,
+  settings = Settings.create(),
   fixedInstant,
 }: {
   events?: ActivityLoggedEvent[];
   holidays?: Holiday[];
   vacations?: Vacation[];
+  settings?: Settings;
   fixedInstant?: string;
 } = {}) {
   const eventStore = EventStore.createNull({ events });
@@ -470,15 +474,18 @@ function configure({
   const vacationRepository = VacationRepository.createNull({
     readFileResponses: vacations ? [vacations] : undefined,
   });
+  const settingsProvider = SettingsProvider.createNull({
+    readFileResponses: settings ? [settings] : undefined,
+  });
   const clock = Clock.fixed(
     fixedInstant ?? "1970-01-01T00:00:00Z",
     "Europe/Berlin",
   );
   const handler = TimesheetQueryHandler.create({
-    capacity: Temporal.Duration.from("PT40H"),
     eventStore,
     holidayRepository,
     vacationRepository,
+    settingsProvider,
     clock,
   });
   return { handler };