Skip to content

Commit

Permalink
refactor: 使用單數 user
Browse files Browse the repository at this point in the history
  • Loading branch information
a20688392 committed Jun 8, 2023
1 parent 2137260 commit 00bf9e6
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import { AppService } from "./app.service";
import { AuthModule } from "./auth/auth.module";
import { dataSourceOptions } from "./config/data-source";
import { validate } from "./config/env.validation";
import { UsersModule } from "./users/users.module";
import { UserModule } from "./user/user.module";

@Module({
imports: [
ConfigModule.forRoot({
validate,
}),
TypeOrmModule.forRoot(dataSourceOptions),
UsersModule,
UserModule,
AuthModule,
],
controllers: [AppController],
Expand Down
10 changes: 5 additions & 5 deletions src/auth/auth.controller.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import { getRepositoryToken, TypeOrmModule } from "@nestjs/typeorm";
import { plainToInstance } from "class-transformer";
import { validate } from "class-validator";
import { dataSourceJest } from "src/config/data-source";
import { UserEntity } from "src/users/entities/user.entity";
import { CreateUserRespose } from "src/users/resposes/create-user-respose";
import { UsersService } from "src/users/users.service";
import { UserEntity } from "src/user/entities/user.entity";
import { CreateUserRespose } from "src/user/resposes/create-user-respose";
import { UserService } from "src/user/user.service";
import { Repository } from "typeorm";

import { CreateUserDto } from "../users/dto/create-user.dto";
import { CreateUserDto } from "../user/dto/create-user.dto";
import { AuthController } from "./auth.controller";
import { AuthService } from "./auth.service";

Expand All @@ -36,7 +36,7 @@ describe("AuthController", () => {
controllers: [AuthController],
providers: [
AuthService,
UsersService,
UserService,
{
provide: getRepositoryToken(UserEntity),
useValue: UserEntity, // 使用測試資料庫的 Repository
Expand Down
8 changes: 4 additions & 4 deletions src/auth/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import {
ApiOperation,
ApiTags,
} from "@nestjs/swagger";
import { CreateUserDto } from "src/users/dto/create-user.dto";
import { CreateUserBadrequestError } from "src/users/exceptions/create-user-badrequest-error.exception";
import { CreateUserConflictError } from "src/users/exceptions/create-user-conflict-error.exception";
import { CreateUserRespose } from "src/users/resposes/create-user-respose";
import { CreateUserDto } from "src/user/dto/create-user.dto";
import { CreateUserBadrequestError } from "src/user/exceptions/create-user-badrequest-error.exception";
import { CreateUserConflictError } from "src/user/exceptions/create-user-conflict-error.exception";
import { CreateUserRespose } from "src/user/resposes/create-user-respose";

import { AuthService } from "./auth.service";

Expand Down
6 changes: 3 additions & 3 deletions src/auth/auth.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Module } from "@nestjs/common";
import { TypeOrmModule } from "@nestjs/typeorm";
import { UserEntity } from "src/users/entities/user.entity";
import { UsersModule } from "src/users/users.module";
import { UserEntity } from "src/user/entities/user.entity";
import { UserModule } from "src/user/user.module";

import { AuthController } from "./auth.controller";
import { AuthService } from "./auth.service";

@Module({
imports: [UsersModule, TypeOrmModule.forFeature([UserEntity])],
imports: [UserModule, TypeOrmModule.forFeature([UserEntity])],
controllers: [AuthController],
providers: [AuthService],
})
Expand Down
8 changes: 4 additions & 4 deletions src/auth/auth.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { Test, TestingModule } from "@nestjs/testing";
import { getRepositoryToken, TypeOrmModule } from "@nestjs/typeorm";
import { validate } from "class-validator";
import { dataSourceJest } from "src/config/data-source";
import { CreateUserDto } from "src/users/dto/create-user.dto";
import { UserEntity } from "src/users/entities/user.entity";
import { UsersService } from "src/users/users.service";
import { CreateUserDto } from "src/user/dto/create-user.dto";
import { UserEntity } from "src/user/entities/user.entity";
import { UserService } from "src/user/user.service";
import { Repository } from "typeorm";

import { AuthService } from "./auth.service";
Expand All @@ -19,7 +19,7 @@ describe("AuthService", () => {
imports: [TypeOrmModule.forRoot(dataSourceJest)],
providers: [
AuthService,
UsersService,
UserService,
{
provide: getRepositoryToken(UserEntity),
useValue: UserEntity, // 使用測試資料庫的 Repository
Expand Down
10 changes: 5 additions & 5 deletions src/auth/auth.service.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { ConflictException, Injectable } from "@nestjs/common";
import { InjectRepository } from "@nestjs/typeorm";
import { CreateUserDto } from "src/users/dto/create-user.dto";
import { UserEntity } from "src/users/entities/user.entity";
import { UsersService } from "src/users/users.service";
import { CreateUserDto } from "src/user/dto/create-user.dto";
import { UserEntity } from "src/user/entities/user.entity";
import { UserService } from "src/user/user.service";
import { Repository } from "typeorm";

@Injectable()
export class AuthService {
constructor(
private usersService: UsersService,
private userService: UserService,
@InjectRepository(UserEntity)
private userRepository: Repository<UserEntity>,
) {}
Expand All @@ -27,6 +27,6 @@ export class AuthService {
});
throw new ConflictException(conflictedAttributes);
}
return this.usersService.create(userDto);
return this.userService.create(userDto);
}
}
2 changes: 1 addition & 1 deletion src/config/data-source.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as dotenv from "dotenv";
import { UserEntity } from "src/users/entities/user.entity";
import { UserEntity } from "src/user/entities/user.entity";
import { DataSource, DataSourceOptions } from "typeorm";

dotenv.config();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions src/user/user.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Module } from "@nestjs/common";

import { UserService } from "./user.service";

@Module({
providers: [UserService],
exports: [UserService],
})
export class UserModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ import { dataSourceJest } from "src/config/data-source";

import { CreateUserDto } from "./dto/create-user.dto";
import { UserEntity } from "./entities/user.entity";
import { UsersService } from "./users.service";
import { UserService } from "./user.service";

describe("UsersService", () => {
let userService: UsersService;
describe("UserService", () => {
let userService: UserService;

beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
imports: [TypeOrmModule.forRoot(dataSourceJest)],
providers: [
UsersService,
UserService,
{
provide: getRepositoryToken(UserEntity),
useValue: UserEntity, // 使用測試資料庫的 Repository
},
],
}).compile();

userService = module.get<UsersService>(UsersService);
userService = module.get<UserService>(UserService);
});

it("應該會創建 一個使用者", async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/users/users.service.ts → src/user/user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { CreateUserDto } from "./dto/create-user.dto";
import { UserEntity } from "./entities/user.entity";

@Injectable()
export class UsersService {
export class UserService {
async create(userDto: CreateUserDto) {
const hash = await bcrypt.hashSync(userDto.password, 5);
const user = new UserEntity();
Expand Down
9 changes: 0 additions & 9 deletions src/users/users.module.ts

This file was deleted.

0 comments on commit 00bf9e6

Please sign in to comment.