refactor: update the ways to use the nestjs services inside the rest …

…and graphql module

.vscode/settings.json

@@ -18,6 +18,7 @@
     "cdktf",
     "codecov",
     "Concat",
+    "datasources",
     "datetime",
     "dbml",
     "deepmerge",

apps/api/src/app/app.module.ts

@@ -7,7 +7,8 @@ import {
   FileStorageModule,
   GraphQLModule,
   MailerModule,
-  ModelsModule,
+  ModelsRestModule,
+  ModelsServicesModule,
   PasswordModule,
 } from './modules';
 
@@ -16,25 +17,21 @@ import { LoggerModule } from '@trxn/nestjs-core';
 @Module({
   imports: [
     // Internal database services
-    DatabaseModule,
-
+    // DatabaseModule,
     // API modules
-    ModelsModule,
-    GraphQLModule,
-
+    ModelsServicesModule,
+    ModelsRestModule,
+    // GraphQLModule,
     // Authentication modules
-    AuthenticationModule,
-    PasswordModule,
-
+    // AuthenticationModule,
+    // PasswordModule,
     // Miscellaneous
-    MailerModule,
-    FileStorageModule,
-
+    // MailerModule,
+    // FileStorageModule,
     // Logger
-    LoggerModule,
-
+    // LoggerModule,
     // Cli
-    ConsoleModule,
+    // ConsoleModule,
   ],
 })
 export class AppModule {}

apps/api/src/app/modules/authentication.module.ts

@@ -3,7 +3,7 @@ import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
 
 import { CaslModule } from './casl.module';
 import { EncryptionModule } from './encryption.module';
-import { ModelsModule } from './models.module';
+import { ModelsServicesModule } from './models-services.module';
 
 import { getSelectPrismaUserQuery } from '@trxn/generated-casl';
 import { USER_SERVICE } from '@trxn/generated-nestjs-models-common';
@@ -18,7 +18,7 @@ import { CaslExceptionInterceptor, PoliciesGuard } from '@trxn/nestjs-casl';
   imports: [
     CaslModule,
     TraxionAuthenticationModule.registerAsync({
-      imports: [ModelsModule, EncryptionModule],
+      imports: [ModelsServicesModule, EncryptionModule],
       useFactory: (userService, encryptionService) => ({
         user: {
           customSelect: getSelectPrismaUserQuery(),

apps/api/src/app/modules/database.module.ts

@@ -1,12 +1,16 @@
-import { Global, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { APP_INTERCEPTOR } from '@nestjs/core';
+import { PrismaClient } from '@prisma/client';
 
 import { PrismaExceptionInterceptor } from '@trxn/nestjs-core';
 import { DatabaseModule as TraxionDatabaseModule } from '@trxn/nestjs-database';
 
-@Global()
 @Module({
-  imports: [TraxionDatabaseModule.register({})],
+  imports: [
+    TraxionDatabaseModule.register({
+      // prismaClient: new PrismaClient(),
+    }),
+  ],
   exports: [TraxionDatabaseModule],
   providers: [
     { provide: APP_INTERCEPTOR, useClass: PrismaExceptionInterceptor },

apps/api/src/app/modules/index.ts

@@ -5,5 +5,6 @@ export * from './encryption.module';
 export * from './file-storage.module';
 export * from './graphql.module';
 export * from './mailer.module';
-export * from './models.module';
+export * from './models-services.module';
+export * from './rest.module';
 export * from './password.module';

apps/api/src/app/modules/models-services.module.ts

@@ -0,0 +1,32 @@
+import { Module } from '@nestjs/common';
+import { PrismaClient } from '@prisma/client';
+
+import { DatabaseModule } from './database.module';
+import { EncryptionModule } from './encryption.module';
+
+import {
+  ModelsModule as TraxionModelsModule,
+  UserMiddlewareModule,
+} from '@trxn/generated-nestjs-models';
+import { ModelsServicesModule as ServicesModule } from '@trxn/generated-nestjs-models-common';
+import { ModelsRestModule } from '@trxn/generated-nestjs-models-rest';
+import { BcryptService } from '@trxn/nestjs-bcrypt';
+import { DATABASE_SERVICE } from '@trxn/nestjs-database';
+
+@Module({
+  imports: [
+    // UserMiddlewareModule.registerAsync({
+    //   imports: [EncryptionModule],
+    //   inject: [BcryptService],
+    //   useFactory: (bcryptService: BcryptService) => ({
+    //     encryptionService: bcryptService,
+    //   }),
+    // }),
+
+    ServicesModule.register({
+      imports: [DatabaseModule],
+    }),
+  ],
+  exports: [ServicesModule],
+})
+export class ModelsServicesModule {}

apps/api/src/app/modules/password.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 
 import { EncryptionModule } from './encryption.module';
 import { MailerModule } from './mailer.module';
-import { ModelsModule } from './models.module';
+import { ModelsServicesModule } from './models-services.module';
 
 import { USER_SERVICE } from '@trxn/generated-nestjs-models-common';
 import { BcryptService, EncryptionService } from '@trxn/nestjs-bcrypt';
@@ -12,7 +12,7 @@ import { PasswordModule as TraxionPasswordModule } from '@trxn/nestjs-password';
 @Module({
   imports: [
     TraxionPasswordModule.registerAsync({
-      imports: [ModelsModule, MailerModule, EncryptionModule],
+      imports: [ModelsServicesModule, MailerModule, EncryptionModule],
       useFactory: (
         userService,
         resetPasswordSendEmailService: ResetPasswordSendEmailService,

apps/api/src/app/modules/rest.module.ts

@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+
+import { ModelsServicesModule } from './models-services.module';
+
+import { ModelsRestModule as RestModule } from '@trxn/generated-nestjs-models-rest';
+
+@Module({
+  imports: [
+    RestModule.register({
+      imports: [ModelsServicesModule],
+    }),
+  ],
+  exports: [RestModule],
+})
+export class ModelsRestModule {}

hapify-models.json

@@ -116,7 +116,7 @@
         },
         {
           "name": "name",
-          "properties": ["unique", "label", "searchable"],
+          "properties": ["unique", "label", "searchable", "sortable"],
           "type": "string"
         },
         {

libs/generated/prisma/prisma/schemas/base.prisma

@@ -8,7 +8,7 @@ datasource db {
 generator client {
   provider = "prisma-client-js"
   output = "../../../../node_modules/.prisma/client"
-  previewFeatures = ["interactiveTransactions"]
+  previewFeatures = ["clientExtensions"]
 }
 
 generator nestjsGraphql {

libs/hapify/templates/nestjs-graphql/hapify/generated/nestjs-graphql/src/resolvers/__kebab__.resolver.ts.hpf

@@ -25,7 +25,7 @@ import {
   <<if Model not noGuest>>Public,<<endif>>
 } from '@trxn/nestjs-core';
 import {
-  DatabaseService,
+  DATABASE_SERVICE,
 } from '@trxn/nestjs-database';
 import {
   Args,
@@ -40,7 +40,7 @@ import {
 import { GraphQLResolveInfo } from 'graphql';
 import { ForbiddenError } from 'apollo-server-core';
 import { PrismaSelect } from '@paljs/plugins';
-import { User as PrismaUser } from '@prisma/client';
+import { User as PrismaUser, PrismaClient } from '@prisma/client';
 
 import {
   <<Model pascal>>Service,
@@ -83,7 +83,8 @@ export class <<Model pascal>>Resolver {
     @Inject(<<ref constant>>_SERVICE)
     protected <<ref camel>>Service: <<ref pascal>>Service,
 <<endfor>>
-  protected databaseService: DatabaseService,
+  @Inject(DATABASE_SERVICE)
+  protected databaseService: PrismaClient,
   ) {}
 
   /**

libs/hapify/templates/nestjs-models-common/.hapifyrc.js

@@ -9,18 +9,48 @@ module.exports = {
       engine: 'hpf',
       input: 'all',
     },
+    {
+      path: 'generated/nestjs-models-common/src/models-services.providers.ts',
+      engine: 'hpf',
+      input: 'all',
+    },
+    {
+      path: 'generated/nestjs-models-common/src/models-services.module-definition.ts',
+      engine: 'hpf',
+      input: 'all',
+    },
+    {
+      path: 'generated/nestjs-models-common/src/models-services.module.ts',
+      engine: 'hpf',
+      input: 'all',
+    },
     {
       path: 'generated/nestjs-models-common/src/index.ts',
       engine: 'hpf',
       input: 'all',
     },
+    {
+      path: 'generated/nestjs-models-common/src/interfaces/index.ts',
+      engine: 'hpf',
+      input: 'one',
+    },
+    {
+      path: 'generated/nestjs-models-common/src/interfaces/models-services.interface.ts',
+      engine: 'hpf',
+      input: 'one',
+    },
     {
       path: 'generated/nestjs-models-common/src/{kebab}/index.ts',
       engine: 'hpf',
       input: 'one',
     },
     {
-      path: 'generated/nestjs-models-common/src/{kebab}/{kebab}-model.constant.ts',
+      path: 'generated/nestjs-models-common/src/{kebab}/{kebab}-model.constants.ts',
+      engine: 'hpf',
+      input: 'one',
+    },
+    {
+      path: 'generated/nestjs-models-common/src/{kebab}/{kebab}-model.providers.ts',
       engine: 'hpf',
       input: 'one',
     },

libs/hapify/templates/nestjs-models-common/hapify/generated/nestjs-models-common/src/__kebab__/__kebab__-model.providers.ts.hpf

@@ -0,0 +1,16 @@
+import { Provider } from '@nestjs/common';
+
+import {
+  <<Model pascal>>Service,
+} from './services';
+
+import {
+  <<Model constant>>_SERVICE,
+} from './<<Model kebab>>-model.constants';
+
+export const <<Model constant>>_SERVICES_PROVIDERS: Provider[] = [
+  {
+    provide: <<Model constant>>_SERVICE,
+    useClass: <<Model pascal>>Service,
+  }
+];

libs/hapify/templates/nestjs-models-common/hapify/generated/nestjs-models-common/src/__kebab__/index.ts.hpf

@@ -1,2 +1,3 @@
 export * from './services';
-export * from './<<Model kebab>>-model.constant';
+export * from './<<Model kebab>>-model.constants';
+export * from './<<Model kebab>>-model.providers';

libs/hapify/templates/nestjs-models-common/hapify/generated/nestjs-models-common/src/__kebab__/services/__kebab__-database.service.ts.hpf

@@ -1,13 +1,13 @@
-import { DatabaseService } from '@trxn/nestjs-database';
+import { DATABASE_SERVICE } from '@trxn/nestjs-database';
 
-import { Prisma } from '@prisma/client';
+import { Prisma, PrismaClient } from '@prisma/client';
 
 export type <<Model pascal>>DatabaseService = Prisma.<<Model pascal>>Delegate<undefined>
 
 export function <<Model camel>>DatabaseServiceFactory(
-  databaseService: DatabaseService,
+  databaseService: PrismaClient,
 ): Prisma.<<Model pascal>>Delegate<undefined> {
   return databaseService.<<Model camel>>;
 }
 
-export const <<Model camel>>DatabaseServiceInject = [DatabaseService];
+export const <<Model camel>>DatabaseServiceInject = [DATABASE_SERVICE];