From ca04f9d32af1003779e5c8d6e69ed17c42fb2772 Mon Sep 17 00:00:00 2001 From: Dominik Sumer <domi.sumer@gmail.com> Date: Fri, 10 Nov 2023 14:34:21 +0100 Subject: [PATCH] rename OvertimeCarry to OvertimeCarryover --- src/clockodo.test.ts | 6 +++--- src/clockodo.ts | 14 +++++++------- src/index.ts | 2 +- src/mocks.ts | 2 +- ...meCarry.mocks.ts => overtimeCarryover.mocks.ts} | 6 +++--- .../{overtimeCarry.ts => overtimeCarryover.ts} | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) rename src/models/{overtimeCarry.mocks.ts => overtimeCarryover.mocks.ts} (75%) rename src/models/{overtimeCarry.ts => overtimeCarryover.ts} (86%) diff --git a/src/clockodo.test.ts b/src/clockodo.test.ts index bb62339b..dd0d8b57 100644 --- a/src/clockodo.test.ts +++ b/src/clockodo.test.ts @@ -653,13 +653,13 @@ describe("Clockodo (instance)", () => { }); }); - describe("getOvertimecarry()", () => { - it("correctly builds getOvertimecarry() request", async () => { + describe("getOvertimeCarryovers()", () => { + it("correctly builds getOvertimeCarryovers() request", async () => { const nockScope = nock(CLOCKODO_API) .get("/overtimecarry?users_id=17&year=2028") .reply(200, {}); - await clockodo.getOvertimeCarry({ usersId: 17, year: 2028 }); + await clockodo.getOvertimeCarryovers({ usersId: 17, year: 2028 }); nockScope.done(); }); diff --git a/src/clockodo.ts b/src/clockodo.ts index 99eff061..c40d763c 100644 --- a/src/clockodo.ts +++ b/src/clockodo.ts @@ -41,7 +41,7 @@ import { WorkTimeChangeRequestStatus, WorkTimeDay, } from "./models/workTimes.js"; -import { OvertimeCarry } from "./models/overtimeCarry.js"; +import { OvertimeCarryover } from "./models/overtimeCarryover.js"; import { HolidaysquotaRow } from "./models/holidaysquota.js"; import { HolidayscarryRow } from "./models/holidayscarry.js"; import { OvertimeReduction } from "./models/overtimeReduction.js"; @@ -841,9 +841,9 @@ export class Clockodo { ); } - async getOvertimeCarry( - params?: Params<OvertimeCarryParams> - ): Promise<OvertimeCarryReturnType> { + async getOvertimeCarryovers( + params?: Params<OvertimeCarryoversParams> + ): Promise<OvertimeCarryoverReturnType> { return this.api.get("/overtimecarry", params); } @@ -1170,10 +1170,10 @@ export type AddWorkTimesChangeRequestReturnType = replacedChangeRequest: null; }; -export type OvertimeCarryReturnType = { - overtimecarry: Array<OvertimeCarry>; +export type OvertimeCarryoverReturnType = { + overtimecarry: Array<OvertimeCarryover>; }; -export type OvertimeCarryParams = { +export type OvertimeCarryoversParams = { /** The user ID by which the overtime carry rows should be filtered */ usersId?: number; /** The year to which the data should be restricted to */ diff --git a/src/index.ts b/src/index.ts index 740112ef..4a512837 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,7 +11,7 @@ export * from "./models/holidaysquota.js"; export * from "./models/lumpsumService.js"; export * from "./models/nonbusinessDay.js"; export * from "./models/nonbusinessGroup.js"; -export * from "./models/overtimeCarry.js"; +export * from "./models/overtimeCarryover.js"; export * from "./models/overtimeReduction.js"; export * from "./models/project.js"; export * from "./models/service.js"; diff --git a/src/mocks.ts b/src/mocks.ts index d819254c..eefc9eee 100644 --- a/src/mocks.ts +++ b/src/mocks.ts @@ -9,7 +9,7 @@ export * from "./models/holidaysquota.mocks.js"; export * from "./models/lumpsumService.mocks.js"; export * from "./models/service.mocks.js"; export * from "./models/nonbusinessDay.mocks.js"; -export * from "./models/overtimeCarry.mocks.js"; +export * from "./models/overtimeCarryover.mocks.js"; export * from "./models/overtimeReduction.mocks.js"; export * from "./models/project.mocks.js"; // export * from "./models/service.mocks.js"; diff --git a/src/models/overtimeCarry.mocks.ts b/src/models/overtimeCarryover.mocks.ts similarity index 75% rename from src/models/overtimeCarry.mocks.ts rename to src/models/overtimeCarryover.mocks.ts index 42be4393..ea4155a8 100644 --- a/src/models/overtimeCarry.mocks.ts +++ b/src/models/overtimeCarryover.mocks.ts @@ -1,5 +1,5 @@ import { faker } from "@faker-js/faker"; -import { OvertimeCarry } from "./overtimeCarry.js"; +import { OvertimeCarryover } from "./overtimeCarryover.js"; type Options = { count?: number; @@ -7,12 +7,12 @@ type Options = { yearMinMax?: [number, number]; }; -export const createOvertimeCarryMocks = ({ +export const createOvertimeCarryoverMocks = ({ count = 1, hoursMinMax = [0, 100], yearMinMax = [1900, 2024], }: Options = {}) => { - return Array.from({ length: count }, (): OvertimeCarry => { + return Array.from({ length: count }, (): OvertimeCarryover => { return { usersId: 0, year: faker.datatype.number({ min: yearMinMax[0], max: yearMinMax[1] }), diff --git a/src/models/overtimeCarry.ts b/src/models/overtimeCarryover.ts similarity index 86% rename from src/models/overtimeCarry.ts rename to src/models/overtimeCarryover.ts index 3b2aceab..2ec731e8 100644 --- a/src/models/overtimeCarry.ts +++ b/src/models/overtimeCarryover.ts @@ -1,4 +1,4 @@ -export type OvertimeCarry = { +export type OvertimeCarryover = { /** The related employee's ID */ usersId: number; /**