fix(crud): primary param fix and swagger

fix #283

integration/crud-typeorm/app.module.ts

@@ -5,13 +5,15 @@ import { withCache } from './orm.config';
 import { CompaniesModule } from './companies/companies.module';
 import { ProjectsModule } from './projects/projects.module';
 import { UsersModule } from './users/users.module';
+import { DevicesModule } from './devices/devices.module';
 
 @Module({
   imports: [
     TypeOrmModule.forRoot(withCache),
     CompaniesModule,
     ProjectsModule,
     UsersModule,
+    DevicesModule,
   ],
 })
 export class AppModule {}

integration/crud-typeorm/devices/device.entity.ts

@@ -0,0 +1,18 @@
+import { Entity, Column, PrimaryGeneratedColumn } from 'typeorm';
+import { IsOptional, IsString, IsUUID } from 'class-validator';
+import { CrudValidationGroups } from '@nestjsx/crud';
+
+const { CREATE, UPDATE } = CrudValidationGroups;
+
+@Entity('devices')
+export class Device {
+  @IsOptional({ always: true })
+  @IsUUID('4', { always: true })
+  @PrimaryGeneratedColumn('uuid')
+  deviceKey: string;
+
+  @IsOptional({ always: true })
+  @IsString({ always: true })
+  @Column({ type: 'text', nullable: true })
+  description?: string;
+}

integration/crud-typeorm/devices/devices.controller.ts

@@ -0,0 +1,22 @@
+import { Controller } from '@nestjs/common';
+import { ApiUseTags } from '@nestjs/swagger';
+import { Crud } from '@nestjsx/crud';
+
+import { Device } from './device.entity';
+import { DevicesService } from './devices.service';
+
+@Crud({
+  model: { type: Device },
+  params: {
+    deviceKey: {
+      field: 'deviceKey',
+      type: 'uuid',
+      primary: true,
+    },
+  },
+})
+@ApiUseTags('devices')
+@Controller('/devices')
+export class DevicesController {
+  constructor(public service: DevicesService) {}
+}

integration/crud-typeorm/devices/devices.module.ts

@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { Device } from './device.entity';
+import { DevicesService } from './devices.service';
+import { DevicesController } from './devices.controller';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([Device])],
+  providers: [DevicesService],
+  exports: [DevicesService],
+  controllers: [DevicesController],
+})
+export class DevicesModule {}

integration/crud-typeorm/devices/devices.service.ts

@@ -0,0 +1,12 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { TypeOrmCrudService } from '@nestjsx/crud-typeorm';
+
+import { Device } from './device.entity';
+
+@Injectable()
+export class DevicesService extends TypeOrmCrudService<Device> {
+  constructor(@InjectRepository(Device) repo) {
+    super(repo);
+  }
+}

integration/crud-typeorm/devices/index.ts

@@ -0,0 +1,2 @@
+export * from './device.entity';
+export * from './devices.service';

packages/crud/src/crud/crud-routes.factory.ts

@@ -73,9 +73,20 @@ export class CrudRoutesFactory {
       arrayMerge: (a, b, c) => b,
     });
 
-    // merge params
-    const params = isObjectFull(this.options.params) ? this.options.params : {};
-    this.options.params = { ...CrudConfigService.config.params, ...params };
+    // set params
+    this.options.params = isObjectFull(this.options.params)
+      ? this.options.params
+      : isObjectFull(CrudConfigService.config.params)
+      ? CrudConfigService.config.params
+      : {};
+    const hasPrimary = this.getPrimaryParam();
+    if (!hasPrimary) {
+      this.options.params['id'] = {
+        field: 'id',
+        type: 'number',
+        primary: true,
+      };
+    }
 
     R.setCrudOptions(this.options, this.target);
   }
@@ -292,7 +303,7 @@ export class CrudRoutesFactory {
 
   private getPrimaryParam(): string {
     return objKeys(this.options.params).find(
-      (param) => this.options.params[param].primary,
+      (param) => this.options.params[param] && this.options.params[param].primary,
     );
   }
 

packages/crud/src/module/crud-config.service.ts

@@ -26,13 +26,7 @@ export class CrudConfigService {
       },
       deleteOneBase: { interceptors: [], decorators: [], returnDeleted: false },
     },
-    params: {
-      id: {
-        field: 'id',
-        type: 'number',
-        primary: true,
-      },
-    },
+    params: {},
   };
 
   static load(config: CrudGlobalConfig = {}) {