Merge pull request #1 from Rykuno/feature/prisma

Refactor database integration and update dependencies: replace Drizzl…

Author: Rykuno

apps/api/.gitignore

@@ -54,7 +54,3 @@ pids
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-/prisma/generated/prisma
-
-/generated/prisma

apps/api/drizzle.config.ts

@@ -7,10 +7,12 @@
   "private": true,
   "scripts": {
     "build": "nest build",
-    "db:generate": "drizzle-kit generate",
-    "db:migrate": "drizzle-kit migrate",
-    "db:push": "drizzle-kit push",
-    "db:studio": "drizzle-kit studio",
+    "db:generate": "prisma generate",
+    "db:migrate:generate": "prisma migrate dev",
+    "db:migrate:deploy": "prisma migrate deploy",
+    "db:push": "prisma db push",
+    "db:reset": "prisma migrate reset",
+    "db:studio": "prisma studio",
     "dev": "nest start --watch",
     "email:dev": "email dev --dir ./src/notifications/emails --port 3030",
     "nuke": "docker compose down -v --remove-orphans && docker compose up -d",
@@ -24,12 +26,14 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.940.0",
+    "@aws-sdk/s3-request-presigner": "^3.940.0",
     "@itgorillaz/configify": "^4.0.1",
     "@keyv/redis": "^5.1.4",
     "@keyv/valkey": "^1.0.11",
     "@nest-lab/throttler-storage-redis": "^1.1.0",
     "@nestjs-cls/transactional": "^3.1.1",
-    "@nestjs-cls/transactional-adapter-drizzle-orm": "^1.2.1",
+    "@nestjs-cls/transactional-adapter-prisma": "^1.3.1",
     "@nestjs/cache-manager": "^3.0.1",
     "@nestjs/common": "^11.1.9",
     "@nestjs/config": "^4.0.2",
@@ -39,6 +43,9 @@
     "@nestjs/swagger": "^11.2.3",
     "@nestjs/throttler": "^6.4.0",
     "@paralleldrive/cuid2": "^3.0.4",
+    "@prisma/adapter-pg": "^7.0.1",
+    "@prisma/client": "^7.0.1",
+    "@prisma/client-runtime-utils": "^7.0.1",
     "@react-email/components": "^1.0.1",
     "@react-email/render": "2.0.0",
     "better-auth": "^1.4.1",
@@ -51,8 +58,6 @@
     "cors": "^2.8.5",
     "date-fns": "^4.1.0",
     "dotenv": "^17.2.3",
-    "drizzle-kit": "1.0.0-beta.1-ac4ce44",
-    "drizzle-orm": "1.0.0-beta.1-ac4ce44",
     "keyv": "^5.5.4",
     "minio": "^8.0.6",
     "nestjs-cls": "^6.1.0",
@@ -87,6 +92,7 @@
     "jest": "^30.2.0",
     "openapi-typescript": "^7.10.1",
     "pnpm": "^10.23.0",
+    "prisma": "^7.0.1",
     "react-email": "5.0.5",
     "source-map-support": "^0.5.21",
     "supertest": "^7.1.4",

apps/api/package.json

@@ -0,0 +1,14 @@
+// This file was generated by Prisma and assumes you have installed the following:
+// npm install --save-dev prisma dotenv
+import 'dotenv/config';
+import { defineConfig, env } from 'prisma/config';
+
+export default defineConfig({
+  schema: 'src/databases/schema.prisma',
+  migrations: {
+    path: 'src/databases/migrations',
+  },
+  datasource: {
+    url: env('DATABASE_URL'),
+  },
+});

apps/api/prisma.config.ts

@@ -3,24 +3,23 @@ import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { DatabasesModule } from './databases/databases.module';
 import { AuthModule } from './auth/auth.module';
-import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
+import { APP_GUARD } from '@nestjs/core';
 import { AuthGuard } from './auth/guards/auth.guard';
 import { NotificationsModule } from './notifications/notifications.module';
 import { CacheModule } from '@nestjs/cache-manager';
 import { createKeyv, Keyv } from '@keyv/redis';
 import { CacheableMemory } from 'cacheable';
-import { BrowserSessionInterceptor } from './common/guards/browser-session.interceptor';
 import { UsersModule } from './users/users.module';
 import { MulterModule } from '@nestjs/platform-express';
 import { StorageModule } from './storage/storage.module';
 import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
 import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis';
 import { ClsPluginTransactional } from '@nestjs-cls/transactional';
 import { ClsModule } from 'nestjs-cls';
-import { TransactionalAdapterDrizzleOrm } from '@nestjs-cls/transactional-adapter-drizzle-orm';
-import { DB_PROVIDER } from './databases/database.provider';
 import { ConfigifyModule } from '@itgorillaz/configify';
 import { CacheConfig } from './common/config/cache.config';
+import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
+import { PrismaService } from './databases/prisma.service';
 
 @Module({
   imports: [
@@ -40,8 +39,9 @@ import { CacheConfig } from './common/config/cache.config';
       plugins: [
         new ClsPluginTransactional({
           imports: [DatabasesModule],
-          adapter: new TransactionalAdapterDrizzleOrm({
-            drizzleInstanceToken: DB_PROVIDER,
+          adapter: new TransactionalAdapterPrisma({
+            prismaInjectionToken: PrismaService,
+            sqlFlavor: 'postgresql',
           }),
         }),
       ],

apps/api/src/app.module.ts

@@ -21,21 +21,7 @@ export class AuthModule {
     private readonly appConfig: AppConfig,
     private readonly authConfig: AuthConfig,
   ) {
-    // this.adapter.httpAdapter.use(cors(this.appConfig.cors as CorsOptions));
-    this.adapter.httpAdapter.use(
-      cors({
-        origin: 'http://localhost:3000',
-        methods: ['GET', 'PATCH', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'HEAD'],
-        allowedHeaders: [
-          'workspace-id',
-          'Content-Type',
-          'Authorization',
-          'X-Requested-With',
-          'Accept',
-        ],
-        credentials: true,
-      }),
-    );
+    this.adapter.httpAdapter.use(cors(this.appConfig.cors as CorsOptions));
     this.adapter.httpAdapter.all(
       `${this.authConfig.basePath}/{*any}`,
       toNodeHandler(this.betterAuthService.client),

apps/api/src/auth/auth.module.ts

@@ -1,37 +1,33 @@
 import { Injectable } from '@nestjs/common';
-import { betterAuth } from 'better-auth';
+import { Auth, betterAuth, BetterAuthOptions } from 'better-auth';
 import { emailOTP, openAPI } from 'better-auth/plugins';
 import { MailService } from 'src/notifications/mail.service';
 import { Cache } from '@nestjs/cache-manager';
-import { drizzleAdapter } from 'better-auth/adapters/drizzle';
 import { seconds } from '@nestjs/throttler';
-import { DatabaseTransactionAdapter } from 'src/databases/database.provider';
-import { TransactionHost } from '@nestjs-cls/transactional';
-import * as schema from 'src/databases/drizzle.schema';
 import { AuthConfig } from 'src/common/config/auth.config';
 import { AppConfig } from 'src/common/config/app.config';
+import { prismaAdapter } from 'better-auth/adapters/prisma';
+import { TransactionHost } from '@nestjs-cls/transactional';
+import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
+import { PrismaClient } from 'src/generated/prisma/client';
 
 @Injectable()
 export class BetterAuthService {
-  readonly client: ReturnType<typeof betterAuth>;
+  readonly client: Auth<BetterAuthOptions>;
 
   constructor(
-    private readonly db: TransactionHost<DatabaseTransactionAdapter>,
-    private mailService: MailService,
-    private cache: Cache,
+    private readonly txHost: TransactionHost<
+      TransactionalAdapterPrisma<PrismaClient>
+    >,
+    private readonly mailService: MailService,
+    private readonly cache: Cache,
     private readonly appConfig: AppConfig,
     private readonly authConfig: AuthConfig,
   ) {
     this.client = betterAuth({
-      database: drizzleAdapter(this.db.tx, {
-        provider: 'pg',
-        schema: {
-          ...schema,
-          user: schema.users,
-          session: schema.sessions,
-          account: schema.accounts,
-          verification: schema.verifications,
-        },
+      experimental: { joins: true },
+      database: prismaAdapter(this.txHost.tx, {
+        provider: 'postgresql',
       }),
       advanced: {
         database: {

apps/api/src/auth/better-auth.service.ts

@@ -32,12 +32,14 @@ export class AppConfig {
   @IsObject()
   @IsNotEmpty()
   cors: CorsOptions = {
-    origin: process.env['WEB_URL']!,
+    origin: process.env['APP_WEB_URL']!,
+    credentials: true,
     methods: ['GET', 'PATCH', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'HEAD'],
     allowedHeaders: [
       'Content-Type',
       'Authorization',
       'X-Requested-With',
+      'user-agent',
       'Accept',
     ],
   };

apps/api/src/common/config/app.config.ts

@@ -1,17 +1,17 @@
 import { Configuration, Value } from '@itgorillaz/configify';
-import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
+import { IsNotEmpty, IsString } from 'class-validator';
 
 @Configuration()
 export class StorageConfig {
   @IsString()
   @IsNotEmpty()
-  @Value('STORAGE_HOST')
-  host!: string;
+  @Value('STORAGE_URL')
+  url!: string;
 
-  @IsNumber()
+  @IsString()
   @IsNotEmpty()
-  @Value('STORAGE_PORT', { parse: parseInt })
-  port!: number;
+  @Value('STORAGE_REGION', { default: 'us-east-1' })
+  region!: string;
 
   @IsString()
   @IsNotEmpty()
@@ -22,4 +22,4 @@ export class StorageConfig {
   @IsNotEmpty()
   @Value('STORAGE_SECRET_KEY')
   secretKey!: string;
-}
+}

apps/api/src/common/config/storage.config.ts

@@ -1,22 +1,19 @@
-import { Inject } from '@nestjs/common';
-import { drizzle, NodePgDatabase } from 'drizzle-orm/node-postgres';
-import { relations } from './drizzle.relations';
-import { TransactionalAdapterDrizzleOrm } from '@nestjs-cls/transactional-adapter-drizzle-orm';
-import { DatabaseConfig } from 'src/common/config/database.config';
+// import { Inject } from '@nestjs/common';
+// import { DatabaseConfig } from 'src/common/config/database.config';
+// import { PrismaPg } from '@prisma/adapter-pg';
+// import { PrismaClient } from '../../generated/prisma/client';
+// import { TransactionHost } from '@nestjs-cls/transactional';
+// import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
 
-export type DatabaseClient = NodePgDatabase<typeof relations, typeof relations>;
-export type DatabaseTransactionAdapter =
-  TransactionalAdapterDrizzleOrm<DatabaseClient>;
+// export const DB_PROVIDER = 'DB_PROVIDER';
+// export const InjectDb = () => Inject(DB_PROVIDER);
 
-export const DB_PROVIDER = 'DB_PROVIDER';
-export const InjectDb = () => Inject(DB_PROVIDER);
-
-export const dbProvider = {
-  provide: DB_PROVIDER,
-  inject: [DatabaseConfig],
-  useFactory: (databaseConfig: DatabaseConfig) => {
-    return drizzle(databaseConfig.url, {
-      relations,
-    });
-  },
-};
+// export const dbProvider = {
+//   provide: DB_PROVIDER,
+//   inject: [DatabaseConfig],
+//   useFactory: (databaseConfig: DatabaseConfig) => {
+//     const adapter = new PrismaPg({ connectionString: databaseConfig.url });
+//     const prisma = new PrismaClient({ adapter });
+//     return prisma;
+//   },
+// };