diff --git a/src/models/overtimeReduction.mocks.ts b/src/models/overtimeReduction.mocks.ts index cc88ca43..883ebbf1 100644 --- a/src/models/overtimeReduction.mocks.ts +++ b/src/models/overtimeReduction.mocks.ts @@ -15,14 +15,14 @@ export const createOvertimeReductionMocks = ({ return { id: index, usersId: 0, - usersIdAdded: 1, - dateAdded: isoDateFromDateTime(faker.date.past()), + addedByUsersId: 1, + addedAt: isoDateFromDateTime(faker.date.past()), + date: isoDateFromDateTime(faker.date.past()), note: faker.datatype.boolean() ? faker.lorem.sentences(2) : null, hours: faker.datatype.number({ min: hoursMinMax[0], max: hoursMinMax[1], }), - createdAfterEndOfMonth: faker.datatype.boolean(), }; }); }; diff --git a/src/models/overtimeReduction.ts b/src/models/overtimeReduction.ts index 29f818dc..cc2ecd64 100644 --- a/src/models/overtimeReduction.ts +++ b/src/models/overtimeReduction.ts @@ -6,12 +6,12 @@ export type OvertimeReduction = { /** The related employee's ID */ usersId: number; /** The user who added the overtime reduction */ - usersIdAdded: number; + addedByUsersId: number; /** The date when the overtime reduction was added */ - dateAdded: IsoDate; + addedAt: IsoDate; + /** The date when the overtime reduction was taken */ + date: IsoDate; /** Number of hours */ hours: number; note: string | null; - // TODO: will probably be renamed - createdAfterEndOfMonth: boolean; };