From 78cf086a477644839e3af816ccf3c68d286a367f Mon Sep 17 00:00:00 2001 From: qajus Date: Thu, 5 Jun 2025 23:16:48 +0200 Subject: [PATCH] fixed bug when there is no .env file and corrected prisma path --- code/backend/scripts/install.json | 2 +- code/backend/scripts/install.ts | 10 ++++++---- code/backend/src/controllers/postController.ts | 2 +- code/backend/src/controllers/userController.ts | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/backend/scripts/install.json b/code/backend/scripts/install.json index 1ebeab1..86a02ad 100644 --- a/code/backend/scripts/install.json +++ b/code/backend/scripts/install.json @@ -6,7 +6,7 @@ "echo generating prisma", "yarn prisma generate", "echo migrating database", - "yarn prisma migrate dev" + "yarn prisma migrate dev --name \"$(date +%Y%m%d%H%M%S)\"" ], "requiredKeys": [ { "name": "DATABASE_URL", "generated": true }, diff --git a/code/backend/scripts/install.ts b/code/backend/scripts/install.ts index 1e872fa..4016e5e 100644 --- a/code/backend/scripts/install.ts +++ b/code/backend/scripts/install.ts @@ -33,11 +33,13 @@ if (fs.existsSync(".env")) { missingConfigs.push(setting); } } +} else { + missingConfigs = config.requiredKeys; } - -if (missingConfigs.length < 1) { - // if it`s all set abort the installation - console.log("All required settings are already set in .env."); + + if (missingConfigs.length < 1 ) { + // if it`s all set abort the installation + console.log("All required settings are already set in .env."); } else { // getting user input for the PostgreSQL username and password console.log("generrating .env file"); diff --git a/code/backend/src/controllers/postController.ts b/code/backend/src/controllers/postController.ts index 4cd7c19..3fd2c5e 100644 --- a/code/backend/src/controllers/postController.ts +++ b/code/backend/src/controllers/postController.ts @@ -2,7 +2,7 @@ import express, { Request, Response } from "express"; import dotenv from "dotenv"; import { StatusCodes } from "http-status-codes"; import { JwtPayload } from "jsonwebtoken"; -import { PrismaClient, Post } from "@prisma/client"; +import { PrismaClient, Post } from "../../prisma/app/generated/prisma/client"; import { minioClient } from "../server"; import { object } from "zod"; import { uploadPostSchema } from "../schemas/postSchemas"; diff --git a/code/backend/src/controllers/userController.ts b/code/backend/src/controllers/userController.ts index eb41b16..327d121 100644 --- a/code/backend/src/controllers/userController.ts +++ b/code/backend/src/controllers/userController.ts @@ -1,5 +1,5 @@ import express, { Request, Response } from "express"; -import { PrismaClient, User } from "@prisma/client"; +import { PrismaClient, User } from "../../prisma/app/generated/prisma/client"; import { UserLoginDto, UserRegistrationDto } from "../schemas/userSchemas"; import jwt from "jsonwebtoken"; import dotenv from "dotenv";