fix(server): make prisma as global module (#825)

server/src/app.controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Get, Logger } from '@nestjs/common'
 import { ApiOperation, ApiTags } from '@nestjs/swagger'
 import { ResponseUtil } from './utils/response'
-import { PrismaService } from './prisma.service'
+import { PrismaService } from './prisma/prisma.service'
 
 @ApiTags('Public')
 @Controller()

server/src/app.module.ts

@@ -11,13 +11,14 @@ import { InitializerModule } from './initializer/initializer.module'
 import { InstanceModule } from './instance/instance.module'
 import { ScheduleModule } from '@nestjs/schedule'
 import { DatabaseModule } from './database/database.module'
-import { PrismaService } from './prisma.service'
+import { PrismaService } from './prisma/prisma.service'
 import { StorageModule } from './storage/storage.module'
 import { LogModule } from './log/log.module'
 import { DependencyModule } from './dependency/dependency.module'
 import { TriggerModule } from './trigger/trigger.module'
 import { RegionModule } from './region/region.module'
 import { GatewayModule } from './gateway/gateway.module'
+import { PrismaModule } from './prisma/prisma.module'
 
 @Module({
   imports: [
@@ -40,8 +41,9 @@ import { GatewayModule } from './gateway/gateway.module'
     TriggerModule,
     RegionModule,
     GatewayModule,
+    PrismaModule,
   ],
   controllers: [AppController],
-  providers: [AppService, PrismaService],
+  providers: [AppService],
 })
 export class AppModule {}

server/src/application/application.module.ts

@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common'
 import { ApplicationController } from './application.controller'
 import { ApplicationService } from './application.service'
-import { PrismaService } from '../prisma.service'
 import { ApplicationTaskService } from './application-task.service'
 import { InstanceService } from '../instance/instance.service'
 import { JwtService } from '@nestjs/jwt'
@@ -18,7 +17,6 @@ import { GatewayModule } from 'src/gateway/gateway.module'
   controllers: [ApplicationController, EnvironmentVariableController],
   providers: [
     ApplicationService,
-    PrismaService,
     ApplicationTaskService,
     InstanceService,
     JwtService,

server/src/application/application.service.ts

@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common'
 import * as nanoid from 'nanoid'
 import { CreateApplicationDto } from './dto/create-application.dto'
 import { ApplicationPhase, ApplicationState, Prisma } from '@prisma/client'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import { UpdateApplicationDto } from './dto/update-application.dto'
 import {
   APPLICATION_SECRET_KEY,

server/src/application/environment.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, Logger } from '@nestjs/common'
-import { PrismaService } from 'src/prisma.service'
+import { PrismaService } from 'src/prisma/prisma.service'
 import { CreateEnvironmentDto } from './dto/create-env.dto'
 
 @Injectable()

server/src/auth/auth.module.ts

@@ -9,7 +9,6 @@ import { JwtStrategy } from './jwt.strategy'
 import { AuthController } from './auth.controller'
 import { HttpModule } from '@nestjs/axios'
 import { PatService } from 'src/user/pat.service'
-import { PrismaService } from 'src/prisma.service'
 
 @Module({
   imports: [
@@ -21,13 +20,7 @@ import { PrismaService } from 'src/prisma.service'
     UserModule,
     HttpModule,
   ],
-  providers: [
-    AuthService,
-    JwtStrategy,
-    CasdoorService,
-    PatService,
-    PrismaService,
-  ],
+  providers: [AuthService, JwtStrategy, CasdoorService, PatService],
   exports: [AuthService],
   controllers: [AuthController],
 })

server/src/database/database.module.ts

@@ -5,7 +5,6 @@ import { PolicyController } from './policy/policy.controller'
 import { PolicyService } from './policy/policy.service'
 import { DatabaseService } from './database.service'
 import { DatabaseController } from './database.controller'
-import { PrismaService } from 'src/prisma.service'
 import { PolicyRuleService } from './policy/policy-rule.service'
 import { PolicyRuleController } from './policy/policy-rule.controller'
 import { MongoService } from './mongo.service'
@@ -24,7 +23,6 @@ import { ApplicationService } from 'src/application/application.service'
     CollectionService,
     PolicyService,
     DatabaseService,
-    PrismaService,
     PolicyRuleService,
     MongoService,
     ApplicationService,
@@ -33,7 +31,6 @@ import { ApplicationService } from 'src/application/application.service'
     CollectionService,
     PolicyService,
     DatabaseService,
-    PrismaService,
     PolicyRuleService,
     MongoService,
   ],

server/src/database/database.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common'
 import * as assert from 'node:assert'
 import { MongoAccessor } from 'database-proxy'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import { Database, DatabasePhase, DatabaseState, Region } from '@prisma/client'
 import { GenerateAlphaNumericPassword } from 'src/utils/random'
 import { MongoService } from './mongo.service'

server/src/database/policy/policy-rule.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common'
 import * as assert from 'node:assert'
-import { PrismaService } from 'src/prisma.service'
+import { PrismaService } from 'src/prisma/prisma.service'
 import { CreatePolicyRuleDto } from '../dto/create-rule.dto'
 import { UpdatePolicyRuleDto } from '../dto/update-rule.dto'
 import { PolicyService } from './policy.service'

server/src/database/policy/policy.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common'
 import { DatabasePolicy, DatabasePolicyRule } from '@prisma/client'
 import { CN_PUBLISHED_POLICIES } from 'src/constants'
-import { PrismaService } from 'src/prisma.service'
+import { PrismaService } from 'src/prisma/prisma.service'
 import { DatabaseService } from '../database.service'
 import { CreatePolicyDto } from '../dto/create-policy.dto'
 import { UpdatePolicyDto } from '../dto/update-policy.dto'

server/src/dependency/dependency.module.ts

@@ -1,12 +1,11 @@
 import { Module } from '@nestjs/common'
 import { ApplicationModule } from 'src/application/application.module'
-import { PrismaService } from 'src/prisma.service'
 import { DependencyController } from './dependency.controller'
 import { DependencyService } from './dependency.service'
 
 @Module({
   imports: [ApplicationModule],
   controllers: [DependencyController],
-  providers: [DependencyService, PrismaService],
+  providers: [DependencyService],
 })
 export class DependencyModule {}

server/src/dependency/dependency.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, Logger } from '@nestjs/common'
-import { PrismaService } from 'src/prisma.service'
+import { PrismaService } from 'src/prisma/prisma.service'
 import { RUNTIME_BUILTIN_DEPENDENCIES } from 'src/runtime-builtin-deps'
 import * as npa from 'npm-package-arg'
 import { CreateDependencyDto } from './dto/create-dependency.dto'

server/src/function/function.module.ts

@@ -1,15 +1,14 @@
 import { Module } from '@nestjs/common'
 import { JwtService } from '@nestjs/jwt'
 import { ApplicationModule } from '../application/application.module'
-import { PrismaService } from '../prisma.service'
 import { FunctionController } from './function.controller'
 import { FunctionService } from './function.service'
 import { DatabaseModule } from 'src/database/database.module'
 
 @Module({
   imports: [ApplicationModule, DatabaseModule],
   controllers: [FunctionController],
-  providers: [FunctionService, PrismaService, JwtService],
+  providers: [FunctionService, JwtService],
   exports: [FunctionService],
 })
 export class FunctionModule {}

server/src/function/function.service.ts

@@ -6,7 +6,7 @@ import {
   CN_FUNCTION_LOGS,
   CN_PUBLISHED_FUNCTIONS,
 } from '../constants'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import { CreateFunctionDto } from './dto/create-function.dto'
 import { UpdateFunctionDto } from './dto/update-function.dto'
 import * as assert from 'node:assert'

server/src/gateway/bucket-domain.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common'
 import { DomainPhase, DomainState, StorageBucket } from '@prisma/client'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import { RegionService } from '../region/region.service'
 import * as assert from 'node:assert'
 import { TASK_LOCK_INIT_TIME } from 'src/constants'

server/src/gateway/gateway.module.ts

@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common'
 import { RuntimeDomainService } from './runtime-domain.service'
 import { ApisixService } from './apisix.service'
 import { RegionModule } from 'src/region/region.module'
-import { PrismaService } from 'src/prisma.service'
 import { HttpModule } from '@nestjs/axios'
 import { BucketDomainService } from './bucket-domain.service'
 import { WebsiteTaskService } from './website-task.service'
@@ -14,7 +13,6 @@ import { RuntimeDomainTaskService } from './runtime-domain-task.service'
   providers: [
     RuntimeDomainService,
     ApisixService,
-    PrismaService,
     BucketDomainService,
     WebsiteTaskService,
     BucketDomainTaskService,

server/src/gateway/runtime-domain.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, Logger } from '@nestjs/common'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import * as assert from 'assert'
 import { RegionService } from '../region/region.service'
 import { ApisixService } from './apisix.service'

server/src/initializer/initializer.module.ts

@@ -1,10 +1,9 @@
 import { Module } from '@nestjs/common'
 import { RegionService } from 'src/region/region.service'
 import { MinioService } from 'src/storage/minio/minio.service'
-import { PrismaService } from '../prisma.service'
 import { InitializerService } from './initializer.service'
 
 @Module({
-  providers: [InitializerService, PrismaService, MinioService, RegionService],
+  providers: [InitializerService, MinioService, RegionService],
 })
 export class InitializerModule {}

server/src/initializer/initializer.service.ts

@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common'
 import { RegionService } from 'src/region/region.service'
 import { MinioService } from 'src/storage/minio/minio.service'
 import { CPU_UNIT, ServerConfig } from '../constants'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import * as assert from 'assert'
 
 @Injectable()

server/src/instance/instance.module.ts

@@ -1,13 +1,12 @@
 import { Module } from '@nestjs/common'
 import { InstanceService } from './instance.service'
 import { InstanceTaskService } from './instance-task.service'
-import { PrismaService } from '../prisma.service'
 import { StorageModule } from '../storage/storage.module'
 import { DatabaseModule } from '../database/database.module'
 import { RegionModule } from '../region/region.module'
 
 @Module({
   imports: [StorageModule, DatabaseModule, RegionModule],
-  providers: [InstanceService, InstanceTaskService, PrismaService],
+  providers: [InstanceService, InstanceTaskService],
 })
 export class InstanceModule {}

server/src/instance/instance.service.ts

@@ -2,7 +2,7 @@ import { V1Deployment } from '@kubernetes/client-node'
 import { Injectable, Logger } from '@nestjs/common'
 import { GetApplicationNamespaceByAppId } from '../utils/getter'
 import { MB, ResourceLabelKey } from '../constants'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import { StorageService } from '../storage/storage.service'
 import { DatabaseService } from 'src/database/database.service'
 import { ClusterService } from 'src/region/cluster/cluster.service'

server/src/log/log.module.ts

@@ -3,12 +3,11 @@ import { JwtService } from '@nestjs/jwt'
 import { DatabaseModule } from 'src/database/database.module'
 import { FunctionModule } from 'src/function/function.module'
 import { ApplicationModule } from '../application/application.module'
-import { PrismaService } from '../prisma.service'
 import { LogController } from './log.controller'
 
 @Module({
   imports: [ApplicationModule, FunctionModule, DatabaseModule],
   controllers: [LogController],
-  providers: [PrismaService, JwtService],
+  providers: [JwtService],
 })
 export class LogModule {}

server/src/prisma/prisma.module.ts

@@ -0,0 +1,9 @@
+import { Global, Module } from '@nestjs/common'
+import { PrismaService } from './prisma.service'
+
+@Global()
+@Module({
+  providers: [PrismaService],
+  exports: [PrismaService],
+})
+export class PrismaModule {}

server/src/region/region.module.ts

@@ -1,11 +1,10 @@
 import { Module } from '@nestjs/common'
 import { RegionService } from './region.service'
 import { RegionController } from './region.controller'
-import { PrismaService } from '../prisma.service'
 import { ClusterService } from './cluster/cluster.service'
 
 @Module({
-  providers: [RegionService, PrismaService, ClusterService],
+  providers: [RegionService, ClusterService],
   controllers: [RegionController],
   exports: [RegionService, ClusterService],
 })

server/src/region/region.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 
 @Injectable()
 export class RegionService {

server/src/storage/bucket.service.ts

@@ -6,7 +6,7 @@ import {
   StorageState,
 } from '@prisma/client'
 import { TASK_LOCK_INIT_TIME } from 'src/constants'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import { RegionService } from '../region/region.service'
 import { CreateBucketDto } from './dto/create-bucket.dto'
 import { UpdateBucketDto } from './dto/update-bucket.dto'

server/src/storage/storage.module.ts

@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common'
 import { BucketController } from './bucket.controller'
 import { MinioService } from './minio/minio.service'
 import { StorageService } from './storage.service'
-import { PrismaService } from 'src/prisma.service'
 import { ApplicationService } from 'src/application/application.service'
 import { BucketService } from './bucket.service'
 import { RegionModule } from 'src/region/region.module'
@@ -15,7 +14,6 @@ import { BucketTaskService } from './bucket-task.service'
   providers: [
     MinioService,
     StorageService,
-    PrismaService,
     ApplicationService,
     BucketService,
     BucketTaskService,

server/src/storage/storage.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common'
 import { Region, StoragePhase, StorageState, StorageUser } from '@prisma/client'
-import { PrismaService } from 'src/prisma.service'
+import { PrismaService } from 'src/prisma/prisma.service'
 import { GenerateAlphaNumericPassword } from 'src/utils/random'
 import { MinioService } from './minio/minio.service'
 import { AssumeRoleCommand, STSClient } from '@aws-sdk/client-sts'

server/src/trigger/trigger.module.ts

@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common'
 import { TriggerService } from './trigger.service'
 import { TriggerController } from './trigger.controller'
-import { PrismaService } from 'src/prisma.service'
 import { JwtService } from '@nestjs/jwt'
 import { ApplicationService } from 'src/application/application.service'
 import { StorageModule } from 'src/storage/storage.module'
@@ -18,7 +17,6 @@ import { MongoService } from 'src/database/mongo.service'
   controllers: [TriggerController],
   providers: [
     TriggerService,
-    PrismaService,
     JwtService,
     ApplicationService,
     CronJobService,

server/src/trigger/trigger.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common'
 import { TriggerPhase, TriggerState } from '@prisma/client'
 import { TASK_LOCK_INIT_TIME } from 'src/constants'
-import { PrismaService } from 'src/prisma.service'
+import { PrismaService } from 'src/prisma/prisma.service'
 import { CreateTriggerDto } from './dto/create-trigger.dto'
 import CronValidate from 'cron-validate'
 

server/src/user/pat.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common'
 import { GenerateAlphaNumericPassword } from 'src/utils/random'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import { CreatePATDto } from './dto/create-pat.dto'
 
 @Injectable()

server/src/user/user.module.ts

@@ -1,11 +1,10 @@
 import { Module } from '@nestjs/common'
-import { PrismaService } from '../prisma.service'
 import { UserService } from './user.service'
 import { PatService } from './pat.service'
 import { PatController } from './pat.controller'
 
 @Module({
-  providers: [UserService, PrismaService, PatService],
+  providers: [UserService, PatService],
   exports: [UserService],
   controllers: [PatController],
 })

server/src/user/user.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common'
 import { Prisma, User } from '@prisma/client'
-import { PrismaService } from '../prisma.service'
+import { PrismaService } from '../prisma/prisma.service'
 import * as nanoid from 'nanoid'
 
 @Injectable()