Merge pull request #231 from glutengo/bug/issue-230

Fix bug regarding pkType refs #230
jhipster · May 28, 2021 · 058b1da · 058b1da
2 parents eb0e62b + e5d2be3
commit 058b1da
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 # [2.0.0](https://github.com/jhipster/generator-jhipster-nodejs/tree/v2.0.0) - xx/xx/2021 released date
 
+-   Support JHipster primary key type [issue #230](https://github.com/jhipster/generator-jhipster-nodejs/issues/230)
 -   Entity name duplicated into app.module.ts imports every time entity updated [issue #219](https://github.com/jhipster/generator-jhipster-nodejs/issues/219)
 
 # [2.0.0-beta.1](https://github.com/jhipster/generator-jhipster-nodejs/tree/v2.0.0-beta.1) - 08/04/2021 released date

diff --git a/generators/server/templates/server/e2e/account.e2e-spec.ts.ejs b/generators/server/templates/server/e2e/account.e2e-spec.ts.ejs
@@ -19,7 +19,7 @@ describe('Account', () => {
     };
 
     const testUserAuthenticated: any = {
-        id: '601d70b6ec992423f8d531bd',
+        id: 42,
         login: 'userlogged',
         email: '[email protected]',
         password: 'userloggedPassword',

diff --git a/generators/server/templates/server/package.json.ejs b/generators/server/templates/server/package.json.ejs
@@ -100,7 +100,7 @@
     "eslint-plugin-prettier": "3.3.1",
     "jest": "25.2.3",
     "nodemon": "1.19.1",
-    "prettier": "1.17.0",
+    "prettier": "1.19.0",
     "rimraf": "3.0.2",
     "sonarqube-scanner": "2.5.0",
     "supertest": "6.0.1",

diff --git a/generators/server/templates/server/src/domain/base/base.entity.ts.ejs b/generators/server/templates/server/src/domain/base/base.entity.ts.ejs
@@ -4,10 +4,14 @@ export abstract class BaseEntity {
 
 <%_ if (databaseType === 'mongodb') { _%>
     @ObjectIdColumn({ name: '_id' })
-<%_ } else { _%>
+    id?: string;
+<%_ } else if (getPkType(databaseType) === 'UUID') { _%>
     @PrimaryGeneratedColumn('uuid')
+    id?: string;
+<%_ } else { _%>
+    @PrimaryGeneratedColumn()
+    id?: number;
 <%_ } _%>
-   id?: string;
 
    @Column({ nullable: true })
    createdBy?: string;

diff --git a/generators/server/templates/server/src/security/payload.interface.ts.ejs b/generators/server/templates/server/src/security/payload.interface.ts.ejs
@@ -1,6 +1,6 @@
 export interface Payload {
 
-  id: string;
+  id: <%= getPkType(databaseType) === 'Long' ? 'number' : 'string' %>;
   username: string;
   authorities?: string[];
 

diff --git a/generators/server/templates/server/src/service/auth.service.ts.ejs b/generators/server/templates/server/src/service/auth.service.ts.ejs
@@ -10,6 +10,10 @@ import { UserService } from '../service/user.service';
 import { UserDTO } from './dto/user.dto';
 import { FindManyOptions } from 'typeorm';
 
+<%_
+const userIdType = getPkType(databaseType) === 'Long' ? 'number' : 'string';
+_%>
+
 
 @Injectable()
 export class AuthService {
@@ -51,7 +55,7 @@ export class AuthService {
     return await this.findUserWithAuthById(payload.id);
   }
 
-  async findUserWithAuthById(userId: string): Promise<UserDTO | undefined> {
+  async findUserWithAuthById(userId: <%= userIdType %>): Promise<UserDTO | undefined> {
     <%_ if (databaseType === 'mongodb') { _%>
     const userDTO: UserDTO = await this.userService.findById(userId);
     <%_ } else { _%>
@@ -60,7 +64,7 @@ export class AuthService {
     return userDTO;
   }
 
-  async getAccount(userId: string): Promise<UserDTO | undefined> {
+  async getAccount(userId: <%= userIdType %>): Promise<UserDTO | undefined> {
     const userDTO: UserDTO = await this.findUserWithAuthById(userId);
     if (!userDTO) {
        return;

diff --git a/generators/server/templates/server/src/service/dto/base.dto.ts.ejs b/generators/server/templates/server/src/service/dto/base.dto.ts.ejs
@@ -1,10 +1,10 @@
 
 /**
- * A DTO base objct.
+ * A DTO base object.
  */
 export class BaseDTO  {
 
-  id?: string;
+  id?:<%_ if (getPkType(databaseType) === 'Long') { _%>number<%_ } else { _%>string<%_ } _%>;
 
   createdBy?: string;
 

diff --git a/generators/server/templates/server/src/service/user.service.ts.ejs b/generators/server/templates/server/src/service/user.service.ts.ejs
@@ -10,7 +10,7 @@ import { FindManyOptions, FindOneOptions } from 'typeorm';
 export class UserService {
     constructor(@InjectRepository(UserRepository) private userRepository: UserRepository) {}
 
-    async findById(id: string): Promise<UserDTO | undefined> {
+    async findById(id: <%= getPkType(databaseType) === 'Long' ? 'number' : 'string' %>): Promise<UserDTO | undefined> {
         const result = await this.userRepository.findOne(id);
         return UserMapper.fromEntityToDTO(this.flatAuthorities(result))
     }