Upgraded to Angular 21 and Prisma 7

.gitignore

@@ -43,13 +43,12 @@ Thumbs.db
 .angular
 .firebase
 
-# Production .env files
-/apps/api/.env.prod
-/apps/api/generated
-/libs/prisma/generated
+# .env files
+/**/.env.*
 
-# .env copied to root before deploying the BE
-.env
+# Prisma generated files
+/libs/prisma/generated
 
 # Auto created when starting Firebase emulators
 ui-debug.log
+.vercel

.vercelignore

@@ -0,0 +1,2 @@
+!dist
+!dist/**

apps/api/src/main.ts

@@ -32,11 +32,17 @@ async function bootstrap() {
 	setupSwagger(app);
 	setupAxios();
 
-	await app.listen(port);
-	Logger.log(`🚀 Application is running on: http://localhost:${port}/${globalPrefix}`);
+	return { app, port, globalPrefix };
 }
 
-bootstrap();
+bootstrap()
+	.then(async ({ app, port, globalPrefix }) => {
+		await app.listen(port, () => Logger.log(`🚀 Application is running on: http://localhost:${port}/${globalPrefix}`));
+	})
+	.catch((error) => {
+		Logger.error('Error starting the application', error);
+	});
+
 
 // Firebase integration
 export const api = functions.https.onRequest(server);

apps/api/src/modules/users/users.module.ts

@@ -14,7 +14,7 @@ import { UsersController } from './users.controller';
 					transport: Transport.TCP,
 					options: {
 						host: configService.get<string>('USERS_MICROSERVICE_HOST') ?? 'localhost',
-						port: configService.get<number>('USERS_MICROSERVICE_PORT') ?? 3001,
+						port: configService.get<number>('USERS_MICROSERVICE_PORT') ?? 3002,
 					},
 				}),
 				inject: [ConfigService],

apps/api/src/server.ts

@@ -0,0 +1,56 @@
+/**
+ * This is not a production server yet!
+ * This is only a minimal backend to get started.
+ */
+
+import { Logger, ValidationPipe } from '@nestjs/common';
+import { NestFactory } from '@nestjs/core';
+import { ExpressAdapter } from '@nestjs/platform-express';
+import cookieParser from 'cookie-parser';
+import express from 'express';
+import { GithubModule } from './modules/github/github.module';
+import { setupAxios } from './setup/axios';
+import { setupSwagger } from './setup/swagger';
+
+const server = express();
+let cachedServer: any
+
+async function bootstrap() {
+	const adapter = new ExpressAdapter(server);
+
+	adapter.post('/test', (req, res) => {
+		res.json({ message: 'Test route works!' });
+	});
+
+	const app = await NestFactory.create(GithubModule, adapter, { cors: true });
+	const globalPrefix = 'api';
+
+	app.setGlobalPrefix(globalPrefix);
+	app.use(cookieParser());
+	app.useGlobalPipes(
+		new ValidationPipe({
+			transform: true,
+		}),
+	);
+
+	// set up other services and tools running together with the app
+	setupSwagger(app);
+	setupAxios();
+
+	await app.init();
+
+	return app.getHttpAdapter().getInstance();
+}
+
+export default async function apiHandler(req: any, res: { status: (arg0: number) => { (): any; new(): any; send: { (arg0: string): void; new(): any; }; }; }) {
+	try {
+		if (!cachedServer) {
+			cachedServer = await bootstrap();
+		}
+
+		return cachedServer(req, res);
+	} catch (error) {
+		Logger.error('Error handling the request', error);
+		res.status(500).send('Internal Server Error');
+	}
+}

apps/api/webpack.config.js

@@ -2,12 +2,23 @@ const { composePlugins, withNx } = require('@nx/webpack');
 
 // Nx plugins for webpack.
 module.exports = composePlugins(
-  withNx({
-    target: 'node',
-  }),
-  (config) => {
-    // Update the webpack config as needed here.
-    // e.g. `config.plugins.push(new MyPlugin())`
-    return config;
-  }
+	withNx({
+		target: 'node',
+		additionalEntryPoints: [
+			{
+				entryName: 'server',
+				entryPath: 'apps/api/src/server.ts',
+			},
+		],
+	}),
+	(config) => {
+		// Update the webpack config as needed here.
+		// e.g. `config.plugins.push(new MyPlugin())`
+		config.output = {
+			...config.output,
+			libraryTarget: 'commonjs2',
+		};
+
+		return config;
+	},
 );

apps/ui/tsconfig.json

@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
+		"moduleResolution": "bundler",
 		"target": "es2022",
 		"useDefineForClassFields": false,
 		"esModuleInterop": true,

copy-files-api.json

@@ -2,7 +2,7 @@
 	"copyFiles": [
 		{
 			"from": "./apps/api/.env.prod",
-			"to": "./.env"
+			"to": "./dist/apps/api/.env"
 		}
 	],
 	"copyFilesSettings": {

libs/auth/src/lib/auth.service.ts

@@ -8,6 +8,7 @@ import { JwtService } from '@nestjs/jwt';
 import { ClientProxy } from '@nestjs/microservices';
 import axios from 'axios';
 import bcrypt from 'bcrypt';
+import { StringValue } from 'ms';
 import { firstValueFrom } from 'rxjs';
 
 @Injectable()
@@ -47,8 +48,8 @@ export class AuthService {
 
 		console.log('*** AuthService / login, user =', user, 'payload =', payload);
 		return {
-			accessToken: await this.jwtService.signAsync(payload, { secret: this.config.jwt.accessToken.secret, expiresIn: this.config.jwt.accessToken.expiry }),
-			refreshToken: await this.jwtService.signAsync(payload, { secret: this.config.jwt.refreshToken.secret, expiresIn: this.config.jwt.refreshToken.expiry }),
+			accessToken: await this.jwtService.signAsync(payload, { secret: this.config.jwt.accessToken.secret, expiresIn: this.config.jwt.accessToken.expiry as StringValue }),
+			refreshToken: await this.jwtService.signAsync(payload, { secret: this.config.jwt.refreshToken.secret, expiresIn: this.config.jwt.refreshToken.expiry as StringValue }),
 		} as AuthProfile;
 	}
 
@@ -63,8 +64,8 @@ export class AuthService {
 			const payload = { email, sub };
 
 			return {
-				accessToken: await this.jwtService.signAsync(payload, { secret: this.config.jwt.accessToken.secret, expiresIn: this.config.jwt.accessToken.expiry }),
-				refreshToken: await this.jwtService.signAsync(payload, { secret: this.config.jwt.refreshToken.secret, expiresIn: this.config.jwt.refreshToken.expiry }),
+				accessToken: await this.jwtService.signAsync(payload, { secret: this.config.jwt.accessToken.secret, expiresIn: this.config.jwt.accessToken.expiry as StringValue }),
+				refreshToken: await this.jwtService.signAsync(payload, { secret: this.config.jwt.refreshToken.secret, expiresIn: this.config.jwt.refreshToken.expiry as StringValue }),
 			} as AuthProfile;
 		} catch {
 			console.log('*** AuthService / refresh, invalid token');

libs/prisma/src/lib/db.config.ts

@@ -0,0 +1,5 @@
+import { PoolConfig } from 'pg';
+
+export const dbConfig: PoolConfig = {
+	connectionString: process.env['DATABASE_URL'],
+};

libs/prisma/src/lib/prisma.config.ts

@@ -0,0 +1,13 @@
+import 'dotenv/config';
+import { defineConfig } from 'prisma/config';
+
+export default defineConfig({
+	// the main entry for your schema
+	schema: 'schema.prisma',
+	// where migrations should be generated
+	// what script to run for "prisma db seed"
+	migrations: {
+		path: 'migrations',
+		seed: 'tsx prisma/seed.ts',
+	},
+});

libs/prisma/src/lib/prisma.service.ts

@@ -1,30 +1,39 @@
-import { Injectable, OnModuleInit } from '@nestjs/common';
+import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+import { PrismaPg } from '@prisma/adapter-pg';
+import pg from 'pg';
 import { PrismaClient } from '../../generated/prisma/client/client';
+import { dbConfig } from './db.config';
 
 @Injectable()
-export class PrismaService implements OnModuleInit {
-	readonly client: PrismaClient;
+export class PrismaService extends PrismaClient implements OnModuleInit, OnModuleDestroy {
 	protected connected = false;
 
 	constructor() {
-		this.client = new PrismaClient();
+		const pool = new pg.Pool(dbConfig);
+		const adapter = new PrismaPg(pool);
+
+		super({ adapter });
 	}
 
 	get isConnected() {
 		return this.connected;
 	}
 
-	async onModuleInit() {
-		await this.connect();
-	}
-
 	async connect() {
 		try {
-			await this.client.$connect();
+			await this.$connect();
 			this.connected = true;
 			console.log('PrismaService initialized and connected to the database');
 		} catch (error) {
 			console.error('PrismaService database connection error:', error);
 		}
 	}
+
+	async onModuleInit() {
+		await this.connect();
+	}
+
+	async onModuleDestroy() {
+		await this.connect();
+	}
 }

libs/prisma/src/lib/schema.prisma

@@ -11,7 +11,6 @@ generator client {
 
 datasource db {
 	provider = "postgresql"
-	url = env("DATABASE_URL")
 }
 
 model User {

libs/users/src/lib/users.service.ts

@@ -20,12 +20,12 @@ export class UsersService {
 	) {}
 
 	async getUsers() {
-		return await this.prisma.client.user.findMany();
+		return await this.prisma.user.findMany();
 	}
 
 	async getUserById(id: number) {
 		try {
-			const user = await this.prisma.client.user.findUnique({ where: { id } });
+			const user = await this.prisma.user.findUnique({ where: { id } });
 
 			if (!user) {
 				throw new HttpException(`User with id ${id} not found`, HttpStatus.NOT_FOUND);
@@ -42,7 +42,7 @@ export class UsersService {
 
 	async getUserByEmail(email: string) {
 		try {
-			const user = await this.prisma.client.user.findUnique({ where: { email } });
+			const user = await this.prisma.user.findUnique({ where: { email } });
 
 			if (!user) {
 				throw new HttpException(`User with email ${email} not found`, HttpStatus.NOT_FOUND);
@@ -59,30 +59,30 @@ export class UsersService {
 
 	async createUser(data: Prisma.UserCreateInput) {
 		const { email, password } = data;
-		const user = await this.prisma.client.user.findUnique({ where: { email } });
+		const user = await this.prisma.user.findUnique({ where: { email } });
 
 		if (user) {
 			throw new HttpException(`User with email ${email} already exists`, HttpStatus.BAD_REQUEST);
 		}
 
 		data.password = await bcrypt.hash(password, this.config.crypt.saltRounds);
 
-		return this.prisma.client.user.create({ data });
+		return this.prisma.user.create({ data });
 	}
 
 	async updateUser(id: number, data: Prisma.UserUpdateInput) {
-		const user = await this.prisma.client.user.findUnique({ where: { id } });
+		const user = await this.prisma.user.findUnique({ where: { id } });
 
 		if (!user) {
 			throw new HttpException(`User with id ${id} not found`, HttpStatus.NOT_FOUND);
 		}
 
-		return this.prisma.client.user.update({ where: { id }, data });
+		return this.prisma.user.update({ where: { id }, data });
 	}
 
 	async deleteUserById(id: number) {
 		await this.getUserById(id);
 
-		return await this.prisma.client.user.delete({ where: { id } });
+		return await this.prisma.user.delete({ where: { id } });
 	}
 }