fix

Makefile

@@ -1,19 +1,24 @@
-doc_back_build:
+docker_build_backend:
 	docker-compose up -d --build reeq-backend --wait
 watch:
 	docker compose watch
 docker_build:
 	docker-compose up -d --build --wait
 
+docker_create_volume:
+	docker volume create db_volume
 
+build: docker_create_volume docker_build run_db_push
+
+run_db_push:
+	npx prisma db push
+
+run_migrations:
+	npx prisma migrate deploy
 ## Для загрузки дампа
 ## заходим в контейнер базы и пишем
 # pg_dump <name_db> -U <name_user> < reeq-db.dump
 #
-
-
-
-
 # Windows
 prisma_add_migrate :
 	docker-compose exec reeq-backend sh -c 'npx prisma migrate dev --name %migration_name%'

docker-compose.yml

@@ -10,9 +10,9 @@ services:
     ports:
       - "${DB_EXTERNAL_PORT}:${DB_PORT}"
     environment:
-      - POSTGRES_PASSWORD=${DB_PASSWORD}
-      - POSTGRES_USER=${DB_USER}
-      - POSTGRES_DB=${DB_NAME}
+        - POSTGRES_PASSWORD=${DB_PASSWORD}
+        - POSTGRES_USER=${DB_USER}
+        - POSTGRES_DB=${DB_NAME}
     networks:
       - reeq-network
   reeq-backend:
@@ -31,6 +31,8 @@ services:
         -   action: rebuild
             path: ./prisma
             target: /usr/src/reeq-backend/prisma
+        -   action: rebuild
+            path: .env
     build:
       context: ./
       dockerfile: docker/Dockerfile

docker/Dockerfile

@@ -18,17 +18,11 @@ RUN npm ci
 #prisma init
 RUN npx prisma generate
 
-ENV DATABASE_URL="postgresql://postgres:postgres@db:5437/reeq-db?schema=public"
-
 ## Push prisma schema to database
 #RUN npx prisma db push
 
 # Copy folder project
 COPY . .
 
-## Build
-#RUN npm run build
-
-EXPOSE 3005
 
 CMD ["npm", "run", "dev"]

package.json

@@ -47,7 +47,9 @@
     "express-validator": "^7.0.1",
     "jsonwebtoken": "^9.0.2",
     "module-alias": "^2.2.3",
+    "moment": "^2.30.1",
     "multer": "^1.4.5-lts.1",
-    "pg": "^8.11.3"
+    "pg": "^8.11.3",
+    "socket.io": "^4.7.5"
   }
 }

src/app.ts

@@ -12,10 +12,14 @@ import {bookingRoutes} from "./infrastructure/routes/rest/BookingRoutes";
 import {uploadRoutes} from "./infrastructure/routes/rest/UploadRoutes";
 import bodyParser from "body-parser";
 import multer from "multer";
+import {Server} from "socket.io";
+import * as http from "node:http";
 
 dotenv.config();
 const app = express();
 const router = express.Router();
+const server = new http.Server(app)
+
 app.use(express.json())
 app.use(cookieParser())
 app.use(multer().any());
@@ -42,6 +46,15 @@ app.use("/api", router)
 app.use(ErrorMiddleware)
 
 const port = process.env.PORT;
+
+// Websocket init
+
+const io = new Server(server)
+io.on('connection', (socket) => {
+    console.log('a user connected');
+});
+
+
 app.get('/api', (req, res) => {
     res.send('Express + TypeScript Server');
 });

src/app/repositories/BookingRepo.ts

@@ -1,11 +1,12 @@
 import {Booking} from "../models/Booking/Booking";
-import {addBookingDto} from "./dto/addBookingDto";
+import {addBookingDto, getBookingByParamsDtoType} from "./dto/addBookingDto";
 import {updateBookingDto} from "./dto/updateBookingDto";
 
 export interface BookingRepo {
-    getById(id: number): Promise<Booking[] | null>
     getByFilter(date: string, skip: number| undefined, take: number| undefined): Promise<Booking[] | null>
     add(booking: addBookingDto): Promise<Booking>
     update(booking: updateBookingDto): Promise<Omit<Booking, "equipments">>
     getByField(fields: object): Promise<{}[]>
+    getByParams(params: getBookingByParamsDtoType, include: object): any
+    getListsTimeReservation(equipment_id: number): any
 }