fix: new date attribute (#63)

* fix: add new date attribute

* chore: bump version

Author: DanielRamosAcosta

package.json

@@ -1,6 +1,6 @@
 {
   "name": "factorial-cli",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "type": "module",
   "description": "Fill your factorial shifts with ease",
   "main": "dist/src/infrastructure/cli/main.js",
@@ -33,4 +33,4 @@
     "yargs": "^17.7.2",
     "zod": "^3.22.4"
   }
-}
+}

src/domain/models/Day.ts

@@ -3,10 +3,13 @@ import { PeriodId } from "./PeriodId.js";
 import { Shift } from "./Shift.js";
 import { DayRange } from "./DayRange.js";
 import { DayNumber } from "./DayNumber.js";
-import { MonthOfTheYear } from "./MonthOfTheYear.js";
+import { MonthOfTheYear, MonthOfTheYearPrimitives } from "./MonthOfTheYear.js";
 import { EmployeeId } from "./EmployeeId.js";
+import { Year } from "./Year.js";
+import { MonthNumber } from "./MonthNumber.js";
 
 export type DayPrimitives = {
+  monthOfTheYear: MonthOfTheYearPrimitives;
   dayNumber: number;
   leaves: Array<LeavePrimitives>;
   isLaborable: boolean;
@@ -15,17 +18,24 @@ export type DayPrimitives = {
 export class Day {
   static fromPrimitives(primitives: DayPrimitives) {
     return new Day(
+      MonthOfTheYear.fromPrimitives(primitives.monthOfTheYear),
       new DayNumber(primitives.dayNumber),
       primitives.leaves.map(Leave.fromPrimitives),
       primitives.isLaborable,
     );
   }
 
   static at(number: number) {
-    return new Day(new DayNumber(number), [], true);
+    return new Day(
+      new MonthOfTheYear(new Year(2024), new MonthNumber(7)),
+      new DayNumber(number),
+      [],
+      true,
+    );
   }
 
   constructor(
+    private readonly monthOfTheYear: MonthOfTheYear,
     private readonly dayNumber: DayNumber,
     private readonly leaves: Leave[],
     private readonly isLaborable: boolean,
@@ -44,7 +54,13 @@ export class Day {
     currentPeriodId: PeriodId,
     dayRange: DayRange,
   ) {
-    return Shift.create(employeeId, this.dayNumber, currentPeriodId, dayRange);
+    return Shift.create(
+      employeeId,
+      this.dayNumber,
+      currentPeriodId,
+      dayRange,
+      this.monthOfTheYear,
+    );
   }
 
   toDate(monthOfTheYear: MonthOfTheYear) {

src/domain/models/Shift.ts

@@ -5,6 +5,7 @@ import { Primitives } from "../../shared/Primitives.js";
 import { DayNumber } from "./DayNumber.js";
 import { EmployeeId } from "./EmployeeId.js";
 import { ProjectId } from "./ProjectId.js";
+import { MonthOfTheYear } from "./MonthOfTheYear.js";
 
 export type ShiftPrimitives = Primitives<Shift>;
 
@@ -16,6 +17,7 @@ export class Shift {
       new DayNumber(primitives.dayNumber),
       PeriodId.fromPrimitives(primitives.currentPeriodId),
       DayRange.fromPrimitives(primitives.dayRange),
+      MonthOfTheYear.fromPrimitives(primitives.monthOfTheYear),
       primitives.projectId ? new ProjectId(primitives.projectId) : undefined,
     );
   }
@@ -25,8 +27,16 @@ export class Shift {
     value: DayNumber,
     currentPeriodId: PeriodId,
     dayRange: DayRange,
+    monthOfTheYear: MonthOfTheYear,
   ) {
-    return new Shift(null as any, employeeId, value, currentPeriodId, dayRange);
+    return new Shift(
+      null as any,
+      employeeId,
+      value,
+      currentPeriodId,
+      dayRange,
+      monthOfTheYear,
+    );
   }
 
   constructor(
@@ -35,6 +45,7 @@ export class Shift {
     private readonly dayNumber: DayNumber,
     private readonly currentPeriodId: PeriodId,
     private readonly dayRange: DayRange,
+    private readonly monthOfTheYear: MonthOfTheYear,
     private projectId?: ProjectId,
   ) {}
 
@@ -53,6 +64,7 @@ export class Shift {
       dayNumber: this.dayNumber.toPrimitives(),
       currentPeriodId: this.currentPeriodId.toPrimitives(),
       dayRange: this.dayRange.toPrimitives(),
+      monthOfTheYear: this.monthOfTheYear.toPrimitives(),
       projectId: this.projectId?.toPrimitives(),
     };
   }

src/infrastructure/factorial-client/FactorialClient.integration-test.ts

@@ -53,6 +53,7 @@ describe("FactorialClient", () => {
     let periodId: number;
     const year = new Date().getFullYear();
     const month = new Date().getMonth() + 1;
+    const date = `${year}-${month.toString().padStart(2, "0")}-18`;
 
     beforeEach(async () => {
       const periods = await client.getPeriods(employeeId, year, month);
@@ -72,6 +73,7 @@ describe("FactorialClient", () => {
         clockOutHour: 16,
         clockOutMinutes: 0,
         day: 18,
+        date,
       });
 
       const shifts = await client.getShifts(employeeId, periodId, year, month);
@@ -86,6 +88,7 @@ describe("FactorialClient", () => {
         clockOutHour: 16,
         clockOutMinutes: 0,
         day: 18,
+        date,
       });
       const secretProjectId = 116990;
 
@@ -100,6 +103,7 @@ describe("FactorialClient", () => {
         clockOutHour: 16,
         clockOutMinutes: 0,
         day: 18,
+        date,
       });
 
       await client.deleteShift(shiftId);

src/infrastructure/factorial-client/FactorialClient.ts

@@ -137,19 +137,22 @@ export class FactorialClient {
     clockOutHour,
     clockOutMinutes,
     day,
+    date,
   }: {
     periodId: number;
     clockInHour: number;
     clockInMinutes: number;
     clockOutHour: number;
     clockOutMinutes: number;
     day: number;
+    date: string;
   }) {
     const response = await this.client.post("/attendance/shifts", {
       period_id: periodId,
       clock_in: `${clockInHour}:${clockInMinutes}`,
       clock_out: `${clockOutHour}:${clockOutMinutes}`,
       minutes: 0,
+      date,
       day,
       observations: null,
       history: [],

src/infrastructure/http-client/HttpClientFetch.ts

@@ -104,9 +104,10 @@ export class HttpClientFetch implements HttpClient {
       headers[key] = value;
     });
 
-    const data: T = headers["content-type"].includes("json")
-      ? await response.json()
-      : await response.text();
+    const data: T =
+      headers["content-type"].includes("json") && response.status !== 400
+        ? await response.json()
+        : await response.text();
 
     if (response.status >= 400) {
       throw new HttpClientError({

src/infrastructure/repositories/MonthRepositoryFactorial.ts

@@ -1,6 +1,9 @@
 import { FactorialClient } from "../factorial-client/FactorialClient.js";
 import { EmployeeId } from "../../domain/models/EmployeeId.js";
-import { MonthOfTheYear } from "../../domain/models/MonthOfTheYear.js";
+import {
+  MonthOfTheYear,
+  MonthOfTheYearPrimitives,
+} from "../../domain/models/MonthOfTheYear.js";
 import { Month } from "../../domain/models/Month.js";
 import { CalendarDay } from "../factorial-client/schema/CalendarDay.js";
 import { DayPrimitives } from "../../domain/models/Day.js";
@@ -24,15 +27,21 @@ export class MonthRepositoryFactorial implements MonthRepository {
 
     return Month.fromPrimitives({
       monthOfTheYear: monthOfTheYear.toPrimitives(),
-      days: calendar.map(MonthRepositoryFactorial.dayToDomain),
+      days: calendar.map((d) =>
+        MonthRepositoryFactorial.dayToDomain(d, monthOfTheYear.toPrimitives()),
+      ),
     });
   }
 
-  private static dayToDomain(day: CalendarDay): DayPrimitives {
+  private static dayToDomain(
+    day: CalendarDay,
+    monthOfTheYear: MonthOfTheYearPrimitives,
+  ): DayPrimitives {
     return {
       dayNumber: day.day,
       leaves: day.leaves.map(MonthRepositoryFactorial.leaveToDomain),
       isLaborable: day.isLaborable,
+      monthOfTheYear,
     };
   }
 

src/infrastructure/repositories/ShiftRepositoryFactorial.ts

@@ -13,13 +13,20 @@ export class ShiftRepositoryFactorial implements ShiftRepository {
   async save(shift: Shift) {
     const primitives = shift.toPrimitives();
 
+    const date =
+      primitives.monthOfTheYear.year +
+      "-" +
+      primitives.monthOfTheYear.month.toString().padStart(2, "0") +
+      "-" +
+      primitives.dayNumber.toString().padStart(2, "0");
     const shiftId = await this.factorial.createShift({
       periodId: primitives.currentPeriodId,
       clockInHour: primitives.dayRange.start.hour,
       clockInMinutes: primitives.dayRange.start.minute,
       clockOutHour: primitives.dayRange.end.hour,
       clockOutMinutes: primitives.dayRange.end.minute,
       day: primitives.dayNumber,
+      date,
     });
 
     // @ts-ignore
@@ -68,6 +75,7 @@ export class ShiftRepositoryFactorial implements ShiftRepository {
           minute: 0,
         },
       },
+      monthOfTheYear: {} as any, // TODO
     });
   }
 }