diff --git a/src/app.module.ts b/src/app.module.ts index b7573bc..d11a850 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -7,7 +7,7 @@ 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: [ @@ -15,7 +15,7 @@ import { UsersModule } from "./users/users.module"; validate, }), TypeOrmModule.forRoot(dataSourceOptions), - UsersModule, + UserModule, AuthModule, ], controllers: [AppController], diff --git a/src/auth/auth.controller.spec.ts b/src/auth/auth.controller.spec.ts index 9e60a47..79f37aa 100644 --- a/src/auth/auth.controller.spec.ts +++ b/src/auth/auth.controller.spec.ts @@ -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"; @@ -36,7 +36,7 @@ describe("AuthController", () => { controllers: [AuthController], providers: [ AuthService, - UsersService, + UserService, { provide: getRepositoryToken(UserEntity), useValue: UserEntity, // 使用測試資料庫的 Repository diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts index 47cd518..0f4c827 100644 --- a/src/auth/auth.controller.ts +++ b/src/auth/auth.controller.ts @@ -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"; diff --git a/src/auth/auth.module.ts b/src/auth/auth.module.ts index 359d3b5..72bc4bd 100644 --- a/src/auth/auth.module.ts +++ b/src/auth/auth.module.ts @@ -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], }) diff --git a/src/auth/auth.service.spec.ts b/src/auth/auth.service.spec.ts index e106ef0..771b808 100644 --- a/src/auth/auth.service.spec.ts +++ b/src/auth/auth.service.spec.ts @@ -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"; @@ -19,7 +19,7 @@ describe("AuthService", () => { imports: [TypeOrmModule.forRoot(dataSourceJest)], providers: [ AuthService, - UsersService, + UserService, { provide: getRepositoryToken(UserEntity), useValue: UserEntity, // 使用測試資料庫的 Repository diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts index 46294f8..7afab79 100644 --- a/src/auth/auth.service.ts +++ b/src/auth/auth.service.ts @@ -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, ) {} @@ -27,6 +27,6 @@ export class AuthService { }); throw new ConflictException(conflictedAttributes); } - return this.usersService.create(userDto); + return this.userService.create(userDto); } } diff --git a/src/config/data-source.ts b/src/config/data-source.ts index 50155d5..ac0fd77 100644 --- a/src/config/data-source.ts +++ b/src/config/data-source.ts @@ -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(); diff --git a/src/users/dto/create-user.dto.ts b/src/user/dto/create-user.dto.ts similarity index 100% rename from src/users/dto/create-user.dto.ts rename to src/user/dto/create-user.dto.ts diff --git a/src/users/entities/user.entity.ts b/src/user/entities/user.entity.ts similarity index 100% rename from src/users/entities/user.entity.ts rename to src/user/entities/user.entity.ts diff --git a/src/users/exceptions/create-user-badrequest-error.exception.ts b/src/user/exceptions/create-user-badrequest-error.exception.ts similarity index 100% rename from src/users/exceptions/create-user-badrequest-error.exception.ts rename to src/user/exceptions/create-user-badrequest-error.exception.ts diff --git a/src/users/exceptions/create-user-conflict-error.exception.ts b/src/user/exceptions/create-user-conflict-error.exception.ts similarity index 100% rename from src/users/exceptions/create-user-conflict-error.exception.ts rename to src/user/exceptions/create-user-conflict-error.exception.ts diff --git a/src/users/resposes/create-user-respose.ts b/src/user/resposes/create-user-respose.ts similarity index 100% rename from src/users/resposes/create-user-respose.ts rename to src/user/resposes/create-user-respose.ts diff --git a/src/user/user.module.ts b/src/user/user.module.ts new file mode 100644 index 0000000..01f5337 --- /dev/null +++ b/src/user/user.module.ts @@ -0,0 +1,9 @@ +import { Module } from "@nestjs/common"; + +import { UserService } from "./user.service"; + +@Module({ + providers: [UserService], + exports: [UserService], +}) +export class UserModule {} diff --git a/src/users/users.service.spec.ts b/src/user/user.service.spec.ts similarity index 85% rename from src/users/users.service.spec.ts rename to src/user/user.service.spec.ts index 94c14c4..1b412d0 100644 --- a/src/users/users.service.spec.ts +++ b/src/user/user.service.spec.ts @@ -5,16 +5,16 @@ 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 @@ -22,7 +22,7 @@ describe("UsersService", () => { ], }).compile(); - userService = module.get(UsersService); + userService = module.get(UserService); }); it("應該會創建 一個使用者", async () => { diff --git a/src/users/users.service.ts b/src/user/user.service.ts similarity index 95% rename from src/users/users.service.ts rename to src/user/user.service.ts index 2a454de..c9539a4 100644 --- a/src/users/users.service.ts +++ b/src/user/user.service.ts @@ -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(); diff --git a/src/users/users.module.ts b/src/users/users.module.ts deleted file mode 100644 index cb7270c..0000000 --- a/src/users/users.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from "@nestjs/common"; - -import { UsersService } from "./users.service"; - -@Module({ - providers: [UsersService], - exports: [UsersService], -}) -export class UsersModule {}