typeorm repository update

lovelykd · Jan 7, 2024 · b3b933c · b3b933c
1 parent 67a0186
commit b3b933c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 28 deletions.
diff --git a/generators/node-server/files.js b/generators/node-server/files.js
@@ -14,8 +14,6 @@ export const serverFiles = {
         'src/web/rest/account.controller.ts',
         'src/web/rest/public.user.controller.ts',
         'src/web/rest/management.controller.ts',
-        'src/repository/user.repository.ts',
-        'src/repository/authority.repository.ts',
         'src/module/user.module.ts',
         'src/module/auth.module.ts',
         'src/config/application-dev.yml',

diff --git a/generators/node-server/templates/server/src/module/auth.module.ts.ejs b/generators/node-server/templates/server/src/module/auth.module.ts.ejs
@@ -15,7 +15,6 @@ import { UserOauth2Controller } from '../web/rest/user.oauth2.controller';
 import { config } from '../config';
 <%_ } _%>
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AuthorityRepository } from '../repository/authority.repository';
 
 import { PublicUserController } from '../web/rest/public.user.controller';
 import { AccountController } from '../web/rest/account.controller';

diff --git a/generators/node-server/templates/server/src/module/user.module.ts.ejs b/generators/node-server/templates/server/src/module/user.module.ts.ejs
@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common';
 import { UserController } from '../web/rest/user.controller';
 import { ManagementController } from '../web/rest/management.controller';
-import { UserRepository } from '../repository/user.repository';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { UserService } from '../service/user.service';
 

diff --git a/generators/node-server/templates/server/src/repository/_entityFileName_.repository.ts.ejs b/generators/node-server/templates/server/src/repository/_entityFileName_.repository.ts.ejs
diff --git a/generators/node-server/templates/server/src/repository/authority.repository.ts.ejs b/generators/node-server/templates/server/src/repository/authority.repository.ts.ejs
diff --git a/generators/node-server/templates/server/src/repository/user.repository.ts.ejs b/generators/node-server/templates/server/src/repository/user.repository.ts.ejs
diff --git a/generators/node-server/templates/server/src/service/_entityFileName_.service.ts.ejs b/generators/node-server/templates/server/src/service/_entityFileName_.service.ts.ejs
@@ -1,9 +1,8 @@
 import { Injectable, HttpException, HttpStatus, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { FindManyOptions, FindOneOptions } from 'typeorm';
+import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
 import { <%= dtoClass %> }  from '../service/dto/<%= entityFileName %>.dto';
 import { <%= entityClass %>Mapper }  from '../service/mapper/<%= entityFileName %>.mapper';
-import { <%= entityClass %>Repository } from '../repository/<%= entityFileName %>.repository';
 
 const relationshipNames = [];
 <%_
@@ -28,7 +27,7 @@ _%>
 export class <%= entityClass %>Service {
     logger = new Logger('<%= entityClass %>Service');
 
-    constructor(@InjectRepository(<%= entityClass %>Repository) private <%= entityInstance %>Repository: <%= entityClass %>Repository) {}
+    constructor(@InjectRepository(<%= entityClass %>) private <%= entityInstance %>Repository: Repository<<%= entityClass %>>) {}
 
       async findById(id: <%= pkType %>): Promise<<%= dtoClass %> | undefined> {
         const options = { where: { id: id }, relations: relationshipNames };

diff --git a/generators/node-server/templates/server/src/service/auth.service.ts.ejs b/generators/node-server/templates/server/src/service/auth.service.ts.ejs
@@ -6,10 +6,9 @@ import { UserLoginDTO } from '../service/dto/user-login.dto';
 import { Payload } from '../security/payload.interface';
 import * as bcrypt from 'bcrypt';
 <%_ } _%>
-import { AuthorityRepository } from '../repository/authority.repository';
 import { UserService } from '../service/user.service';
 import { <%= user.dtoClass%> } from './dto/user.dto';
-import { FindManyOptions } from 'typeorm';
+import { FindManyOptions, Repository } from 'typeorm';
 
 <%_
 const userIdType = user.primaryKey.tsType;
@@ -23,7 +22,7 @@ export class AuthService {
     <%_ if (authenticationType === 'jwt') { _%>
     private readonly jwtService: JwtService,
     <%_ } _%>
-    @InjectRepository(AuthorityRepository) private authorityRepository: AuthorityRepository,
+    @InjectRepository(Authority) private authorityRepository: Repository<Authority>,
     private userService: UserService,
   ) {}
 

diff --git a/generators/node-server/templates/server/src/service/user.service.ts.ejs b/generators/node-server/templates/server/src/service/user.service.ts.ejs
@@ -3,13 +3,12 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { <%= user.persistClass %> } from '../domain/user.entity';
 import { <%= user.dtoClass%> } from './dto/user.dto';
 import { UserMapper } from './mapper/user.mapper';
-import { UserRepository } from '../repository/user.repository';
-import { FindManyOptions, FindOneOptions } from 'typeorm';
+import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
 import { transformPassword } from '../security';
 
 @Injectable()
 export class UserService {
-    constructor(@InjectRepository(UserRepository) private userRepository: UserRepository) {}
+    constructor(@InjectRepository(User) private userRepository: Repository<User>) {}
 
     async findById(id: <%= user.primaryKey.tsType %>): Promise<<%= user.dtoClass%> | undefined> {
         const result = await this.userRepository.findOneBy({ id });