fix: model booking

Makefile

@@ -1,6 +1,4 @@
 doc_build:
 	docker-compose up -d --build --wait
 watch:
-	docker compose watch
-i:
-	npm i --legacy-peer-deps --save
+	docker compose watch

src/app/context/AuthContext.tsx

@@ -1,5 +1,5 @@
 import { createContext, Dispatch, ReactNode, useReducer } from "react";
-import { IUser, UserRoles } from "../../entities/user/user.ts";
+import { IUser, UserRoles } from "@src/entities/user";
 
 const defaultAuthInit = {
   user: null,

src/entities/area/area.ts

@@ -1,3 +1,6 @@
+import $api from "@src/shared/api/axios.ts";
+import { baseUrl } from "@src/app/config/api.ts";
+
 export interface Area {
   id: number;
   institutes_id: number;
@@ -7,3 +10,6 @@ export interface Area {
   institute: string;
   square: number;
 }
+
+export const getAllAreas = () =>
+  $api.get(`${baseUrl}/areas`).then((response) => response?.data?.data);

src/entities/area/index.ts

@@ -1,2 +1,2 @@
-// @ts-ignore
 export type { Area } from "./area.ts";
+export { getAllAreas } from "./area.ts";

src/entities/booking/booking.ts

@@ -1,33 +1,54 @@
-export type TBooking = {
-    id: number
-    date_from: Date
-    date_to: Date
-    created_at: Date
-    updated_at: Date
-    status: "CREATED" | "COMPLETE"
-    user_id: number,
-    equipment_id: number
-    equipments: {
-        id: number
-        area_id: number
-        name: string
-        description: string
-        count: number
-        status: "FREE" | "BOOKED"
-    }
-    users: {
-        id: 16,
-        roles: {
-            id: number,
-            role: "USER" | "ADMIN" | "OWNER"
-        }
-        first_name: string
-        second_name: string
-        mail: string
+import { baseUrl } from "@src/app/config/api.ts";
+import $api from "@src/shared/api";
 
-    }
-}
+export type TBooking = {
+  id: number;
+  date: Date;
+  created_at: Date;
+  updated_at: Date;
+  status: "CREATED" | "COMPLETE";
+  user_id: number;
+  equipment_id: number;
+  equipments: {
+    id: number;
+    area_id: number;
+    name: string;
+    description: string;
+    count: number;
+    status: "FREE" | "BOOKED";
+  };
+  users: {
+    id: 16;
+    roles: {
+      id: number;
+      role: "USER" | "ADMIN" | "OWNER";
+    };
+    first_name: string;
+    second_name: string;
+    mail: string;
+  };
+};
 
 export type BookingDatesList = {
-    date_to: string
-}
+  date_to: string;
+};
+
+export const getBookings = (selectDate: Date | undefined) => {
+  return $api
+    .get(`${baseUrl}/bookings`, {
+      params: {
+        ...(selectDate
+          ? {
+              date_to: new Date(selectDate)?.toISOString(),
+            }
+          : {}),
+        skip: 0,
+        take: 10,
+      },
+    })
+    .then((res) => res.data);
+};
+
+export const fetchBookingDates = () => {
+  return $api.get(`${baseUrl}/booking_dates`).then((res) => res?.data?.data);
+};

src/entities/booking/index.ts

@@ -0,0 +1,2 @@
+export { getBookings, fetchBookingDates } from "./booking";
+export type { TBooking, BookingDatesList } from "./booking";

src/entities/department/department.ts

@@ -1,16 +1,33 @@
+import { baseUrl } from "../../app/config/api.ts";
+import $api from "@src/shared/api/axios.ts";
+
 export interface InstitutesModel {
-    id: number,
-    name: string
+  id: number;
+  name: string;
 }
 
 export interface DepartmentInfo {
-    id: number
-    equipment: string
-    area: string
-    institute: string
+  id: number;
+  equipment: string;
+  area: string;
+  institute: string;
 }
 
 export type fetchAllInfoDepartmentT = {
-    skip: number
-    take: number
-}
+  skip: number;
+  take: number;
+};
+
+export const fetchAllInfoDepartment = (filter: fetchAllInfoDepartmentT) =>
+  $api
+    .get(`${baseUrl}/department/info`, {
+      params: {
+        ...filter,
+      },
+    })
+    .then((res) => {
+      return res.data.data;
+    });
+
+export const getAllInstitutes = async () =>
+  $api.get("/departments").then((res) => res.data.data);

src/entities/department/index.ts

@@ -0,0 +1,6 @@
+export { fetchAllInfoDepartment, getAllInstitutes } from "./department";
+export type {
+  fetchAllInfoDepartmentT,
+  DepartmentInfo,
+  InstitutesModel,
+} from "./department";

src/entities/user/index.ts

@@ -0,0 +1,2 @@
+export type { IUser } from "./user.ts";
+export { UserRoles } from "./user.ts";

src/shared/api/index.ts

@@ -0,0 +1,2 @@
+export { default } from "./axios.ts";
+export { signIn, signOut, logOut } from "./Auth.ts";

src/shared/hooks/useBooking.ts

@@ -1,9 +1,9 @@
 import { useQuery } from "react-query";
-import { getBookings } from "@src/shared/api/Booking.ts";
+import { getBookings } from "@src/entities/booking";
 
 export const useBooking = (selectDate: Date | undefined) => {
   return useQuery({
     queryKey: ["booking", selectDate],
     queryFn: () => getBookings(selectDate),
   });
-};
+};

src/shared/hooks/useDepartmentInfo.ts

@@ -1,9 +1,9 @@
 import { useQuery } from "react-query";
-import { fetchAllInfoDepartment } from "@src/shared/api/Departments.ts";
 import {
   DepartmentInfo,
+  fetchAllInfoDepartment,
   fetchAllInfoDepartmentT,
-} from "../../entities/department/department.ts";
+} from "@src/entities/department";
 
 export const useDepartmentInfo = (filter: fetchAllInfoDepartmentT) => {
   return useQuery<DepartmentInfo[], Error>({

src/shared/hooks/useGetAreas.ts

@@ -1,6 +1,5 @@
 import { useQuery } from "react-query";
-import { getAllAreas } from "@src/shared/api/Areas.ts";
-import { Area } from "../../entities/area/Area.ts";
+import { Area, getAllAreas } from "@src/entities/area";
 
 export const useGetAreas = () => {
   return useQuery<Area[], Error>({

src/shared/hooks/useInstitutes.ts

@@ -1,6 +1,5 @@
 import { useQuery } from "react-query";
-import { InstitutesModel } from "../../entities/department/department.ts";
-import { getAllInstitutes } from "@src/shared/api/Departments.ts";
+import { getAllInstitutes, InstitutesModel } from "@src/entities/department";
 
 export const useInstitutes = () => {
   return useQuery<InstitutesModel[], Error>("institutes", getAllInstitutes);

src/widgets/booking-history/BookingList.tsx

@@ -38,22 +38,12 @@ const columns: GridColDef[] = [
     editable: false,
   },
   {
-    field: "date_from",
-    headerName: "Дата начала брони",
+    field: "date",
+    headerName: "Дата бронирования",
     sortable: false,
     width: 160,
     type: "dateTime",
-    valueGetter: (params: GridValueGetterParams) =>
-      new Date(params.row.date_from),
-  },
-  {
-    field: "date_to",
-    headerName: "Дата конца брони",
-    sortable: false,
-    width: 160,
-    type: "dateTime",
-    valueGetter: (params: GridValueGetterParams) =>
-      new Date(params.row.date_to),
+    valueGetter: (params: GridValueGetterParams) => new Date(params.row.date),
   },
   {
     field: "status",
@@ -73,14 +63,12 @@ const BookingList = ({ data }: BookingList) => {
         const {
           equipments: { status, name },
           users: { first_name, second_name },
-          date_from,
-          date_to,
+          date,
           id,
         } = item;
         return {
           status,
-          date_from,
-          date_to,
+          date,
           id,
           first_name,
           second_name,

src/widgets/card-list/model/card-equipment.model.ts

@@ -1,6 +1,6 @@
 import { useQuery } from "react-query";
 import { getAllEquipments } from "@src/widgets/card-list/model/api/equipment.ts";
-import { Equipment } from "@src/entities/equipment/Equipments.ts";
+import { Equipment } from "@src/entities/equipment";
 
 type FilterEquipments = {
   debouncedValue: string;