Skip to content

Commit

Permalink
refactor: import 경로 패턴 통일
Browse files Browse the repository at this point in the history
  • Loading branch information
jjeonghak committed Nov 14, 2024
1 parent db5174e commit 2363746
Show file tree
Hide file tree
Showing 31 changed files with 111 additions and 110 deletions.
61 changes: 31 additions & 30 deletions apps/server/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir: __dirname,
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin', 'prettier'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'airbnb-base',
'airbnb-typescript/base',
'plugin:prettier/recommended',
],
root: true,
env: {
node: true,
jest: true,
},
ignorePatterns: ['.eslintrc.js', 'ecosystem.config.js'],
rules: {
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir: __dirname,
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin', 'prettier'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'airbnb-base',
'airbnb-typescript/base',
'plugin:prettier/recommended',
],
root: true,
env: {
node: true,
jest: true,
},
ignorePatterns: ['.eslintrc.js', 'ecosystem.config.js'],
rules: {
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',

'import/prefer-default-export': 'off', // nest not use default export
'class-methods-use-this': 'off', // nest not use this in class
'import/no-extraneous-dependencies': 'off',
'import/prefer-default-export': 'off', // nest not use default export
'class-methods-use-this': 'off', // nest not use this in class
'import/no-extraneous-dependencies': 'off',
'import/extensions': 'off',

'prettier/prettier': ['error', { endOfLine: 'auto' }],
},
'prettier/prettier': ['error', { endOfLine: 'auto' }],
},
};
16 changes: 8 additions & 8 deletions apps/server/src/account/account.module.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Module } from '@nestjs/common';
import { JwtModule } from '@nestjs/jwt';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AccountController } from './controller/account.controller';
import { AccountService } from './service/account.service';
import { AccessTokenStrategy } from './strategy/accessToken.strategy';
import { RefreshTokenStrategy } from './strategy/refreshToken.strategy';
import { AccessTokenGuard } from './guard/accessToken.guard';
import { RefreshTokenGuard } from './guard/refreshToken.guard';
import { AuthService } from './service/auth.service';
import { Account } from './entity/account.entity';
import { AccountController } from '@/account/controller/account.controller';
import { AccountService } from '@/account/service/account.service';
import { AccessTokenStrategy } from '@/account/strategy/accessToken.strategy';
import { RefreshTokenStrategy } from '@/account/strategy/refreshToken.strategy';
import { AccessTokenGuard } from '@/account/guard/accessToken.guard';
import { RefreshTokenGuard } from '@/account/guard/refreshToken.guard';
import { AuthService } from '@/account/service/auth.service';
import { Account } from '@/account/entity/account.entity';

@Module({
imports: [JwtModule.register({ global: true }), TypeOrmModule.forFeature([Account])],
Expand Down
12 changes: 6 additions & 6 deletions apps/server/src/account/controller/account.controller.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Body, Controller, Headers, Post, Res, UseGuards } from '@nestjs/common';
import { Response } from 'express';
import { AuthService } from '../service/auth.service';
import { RefreshTokenGuard } from '../guard/refreshToken.guard';
import { AuthUser } from '../decorator/authUser.decorator';
import { Account } from '../entity/account.entity';
import { CreateUserDto } from '../dto/create-user.dto';
import { UserDto } from '../dto/user.dto';
import { AuthService } from '@/account/service/auth.service';
import { RefreshTokenGuard } from '@/account/guard/refreshToken.guard';
import { AuthUser } from '@/account/decorator/authUser.decorator';
import { Account } from '@/account/entity/account.entity';
import { CreateUserDto } from '@/account/dto/create-user.dto';
import { UserDto } from '@/account/dto/user.dto';

@Controller('auth')
export class AccountController {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/account/dto/user.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Account } from '../entity/account.entity';
import { Account } from '@/account/entity/account.entity';

export class UserDto {
id: number;
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/account/service/account.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { Account } from '../entity/account.entity';
import { Account } from '@/account/entity/account.entity';

@Injectable()
export class AccountService {
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/account/service/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { JwtService } from '@nestjs/jwt';
import { BadRequestException, Injectable, UnauthorizedException } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import * as bcrypt from 'bcrypt';
import { AccountService } from './account.service';
import { Account } from '../entity/account.entity';
import { AccountService } from '@/account/service/account.service';
import { Account } from '@/account/entity/account.entity';

@Injectable()
export class AuthService {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/account/strategy/accessToken.strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable, UnauthorizedException } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { PassportStrategy } from '@nestjs/passport';
import { ExtractJwt, Strategy } from 'passport-jwt';
import { AccountService } from '../service/account.service';
import { AccountService } from '@/account/service/account.service';

@Injectable()
export class AccessTokenStrategy extends PassportStrategy(Strategy, 'access_token') {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/account/strategy/refreshToken.strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable, UnauthorizedException } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { PassportStrategy } from '@nestjs/passport';
import { ExtractJwt, Strategy } from 'passport-jwt';
import { AccountService } from '../service/account.service';
import { AccountService } from '@/account/service/account.service';

@Injectable()
export class RefreshTokenStrategy extends PassportStrategy(Strategy, 'refresh_token') {
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/app.controller.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test, TestingModule } from '@nestjs/testing';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { AppController } from '@/app.controller';
import { AppService } from '@/app.service';

describe('AppController', () => {
let appController: AppController;
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/app.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller, Get } from '@nestjs/common';
import { AppService } from './app.service';
import { AppService } from '@/app.service';

@Controller()
export class AppController {
Expand Down
14 changes: 7 additions & 7 deletions apps/server/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { DataSource, DataSourceOptions } from 'typeorm';
import { ConfigModule } from '@nestjs/config';
import { APP_FILTER, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
import { TaskModule } from './task/task.module';
import { TaskModule } from '@/task/task.module';
import { TypeormConfig } from '../config/typeorm.config';
import { AppService } from './app.service';
import { AppController } from './app.controller';
import { HttpLoggingInterceptor } from './common/httpLog.Interceptor';
import { AllExceptionsFilter } from './common/allException.filter';
import { AccountModule } from './account/account.module';
import { ProjectModule } from './project/project.module';
import { AppService } from '@/app.service';
import { AppController } from '@/app.controller';
import { HttpLoggingInterceptor } from '@/common/httpLog.Interceptor';
import { AllExceptionsFilter } from '@/common/allException.filter';
import { AccountModule } from '@/account/account.module';
import { ProjectModule } from '@/project/project.module';

@Module({
imports: [
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NestFactory } from '@nestjs/core';
import * as dotenv from 'dotenv';
import { AppModule } from './app.module';
import { AppModule } from '@/app.module';

dotenv.config();

Expand Down
8 changes: 4 additions & 4 deletions apps/server/src/project/controller/project.controller.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Body, Controller, Get, Param, Patch, Post, UseGuards } from '@nestjs/common';
import { ProjectService } from '../service/project.service';
import { ProjectService } from '@/project/service/project.service';
import { AccessTokenGuard } from '@/account/guard/accessToken.guard';
import { CreateProjectRequest } from '../dto/create-project-request.dto';
import { CreateProjectRequest } from '@/project/dto/create-project-request.dto';
import { AuthUser } from '@/account/decorator/authUser.decorator';
import { Account } from '@/account/entity/account.entity';
import { InviteUserRequest } from '../dto/invite-user-request.dto';
import { UpdateContributorRequest } from '../dto/update-contributor-request.dts';
import { InviteUserRequest } from '@/project/dto/invite-user-request.dto';
import { UpdateContributorRequest } from '@/project/dto/update-contributor-request.dts';

@UseGuards(AccessTokenGuard)
@Controller('project')
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/project/controller/projects.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller, Get, UseGuards } from '@nestjs/common';
import { ProjectService } from '../service/project.service';
import { ProjectService } from '@/project/service/project.service';
import { AccessTokenGuard } from '@/account/guard/accessToken.guard';
import { AuthUser } from '@/account/decorator/authUser.decorator';
import { Account } from '@/account/entity/account.entity';
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/project/dto/create-project-response.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Project } from '../entity/project.entity';
import { Project } from '@/project/entity/project.entity';

export class CreateProjectResponse {
id: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ContributorStatus } from '../enum/contributor-status.enum';
import { ContributorStatus } from '@/project/enum/contributor-status.enum';

export class ProjectContributorsResponse {
id: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IsEnum, IsIn, IsNotEmpty, IsNumber, IsPositive } from 'class-validator';
import { ContributorStatus } from '../enum/contributor-status.enum';
import { ContributorStatus } from '@/project/enum/contributor-status.enum';

export class UpdateContributorRequest {
@IsNotEmpty()
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/project/dto/user-projects-response.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ContributorStatus } from '../enum/contributor-status.enum';
import { ContributorStatus } from '@/project/enum/contributor-status.enum';

export class UserProjectsResponse {
role: ContributorStatus;
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/project/entity/contributor.entity.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { ContributorStatus } from '../enum/contributor-status.enum';
import { ProjectRole } from '../enum/project-role.enum';
import { ContributorStatus } from '@/project/enum/contributor-status.enum';
import { ProjectRole } from '@/project/enum/project-role.enum';
import { EntityTimestamp } from '@/common/entity-timestamp.entity';

@Entity()
Expand Down
8 changes: 4 additions & 4 deletions apps/server/src/project/project.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { ProjectService } from './service/project.service';
import { ProjectController } from './controller/project.controller';
import { Project } from './entity/project.entity';
import { Contributor } from './entity/contributor.entity';
import { ProjectService } from '@/project/service/project.service';
import { ProjectController } from '@/project/controller/project.controller';
import { Project } from '@/project/entity/project.entity';
import { Contributor } from '@/project/entity/contributor.entity';
import { Account } from '@/account/entity/account.entity';
import { Task } from '@/task/domain/task.entity';
import { ProjectsController } from '@/project/controller/projects.controller';
Expand Down
14 changes: 7 additions & 7 deletions apps/server/src/project/service/project.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import {
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { DataSource, Repository } from 'typeorm';
import { Project } from '../entity/project.entity';
import { Contributor } from '../entity/contributor.entity';
import { ContributorStatus } from '../enum/contributor-status.enum';
import { ProjectRole } from '../enum/project-role.enum';
import { CreateProjectResponse } from '../dto/create-project-response.dto';
import { Project } from '@/project/entity/project.entity';
import { Contributor } from '@/project/entity/contributor.entity';
import { ContributorStatus } from '@/project/enum/contributor-status.enum';
import { ProjectRole } from '@/project/enum/project-role.enum';
import { CreateProjectResponse } from '@/project/dto/create-project-response.dto';
import { Account } from '@/account/entity/account.entity';
import { UserInvitationResponse } from '../dto/user-invitation-response.dto';
import { BaseResponse } from '../../common/BaseResponse';
import { UserInvitationResponse } from '@/project/dto/user-invitation-response.dto';
import { BaseResponse } from '@/common/BaseResponse';
import { Section } from '@/task/domain/section.entity';

@Injectable()
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/task/controller/snapshot.controller.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Controller, Get, Query, Req, Res, UseGuards } from '@nestjs/common';
import { Request, Response } from 'express';
import { AccessTokenGuard } from '@/account/guard/accessToken.guard';
import { TaskService } from '../service/task.service';
import { TaskService } from '@/task/service/task.service';
import { AuthUser } from '@/account/decorator/authUser.decorator';
import { Account } from '@/account/entity/account.entity';
import { CustomResponse } from '../domain/custom-response.interface';
import { CustomResponse } from '@/task/domain/custom-response.interface';

@UseGuards(AccessTokenGuard)
@Controller('snapshot')
Expand Down
8 changes: 4 additions & 4 deletions apps/server/src/task/controller/task.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import {
Query,
UseGuards,
} from '@nestjs/common';
import { TaskService } from '../service/task.service';
import { UpdateTaskRequest } from '../dto/update-task-request.dto';
import { MoveTaskRequest } from '../dto/move-task-request.dto';
import { TaskService } from '@/task/service/task.service';
import { UpdateTaskRequest } from '@/task/dto/update-task-request.dto';
import { MoveTaskRequest } from '@/task/dto/move-task-request.dto';
import { CreateTaskRequest } from '@/task/dto/create-task-request.dto';
import { AuthUser } from '@/account/decorator/authUser.decorator';
import { Account } from '@/account/entity/account.entity';
import { AccessTokenGuard } from '@/account/guard/accessToken.guard';
import { BaseResponse } from '../../common/BaseResponse';
import { BaseResponse } from '@/common/BaseResponse';

@UseGuards(AccessTokenGuard)
@Controller('task')
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/task/domain/snapshot.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Task } from './task.entity';
import { Task } from '@/task/domain/task.entity';

export class Snapshot {
constructor(project) {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/task/domain/task.entity.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
import { Section } from './section.entity';
import { Section } from '@/task/domain/section.entity';

@Entity()
export class Task {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/task/dto/create-task-response.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Task } from '../domain/task.entity';
import { Task } from '@/task/domain/task.entity';

export class CreateTaskResponse {
constructor(task: Task) {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/task/dto/move-task-response.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Task } from '../domain/task.entity';
import { Task } from '@/task/domain/task.entity';

export class MoveTaskResponse {
constructor(task: Task) {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/task/dto/task-response.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Task } from '../domain/task.entity';
import { Task } from '@/task/domain/task.entity';

export class TaskResponse {
constructor(task: Task) {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/task/dto/update-task-response.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Task } from '../domain/task.entity';
import { Task } from '@/task/domain/task.entity';

export class UpdateTaskResponse {
constructor(task: Task) {
Expand Down
20 changes: 10 additions & 10 deletions apps/server/src/task/service/task.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import { Injectable, NotFoundException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { LexoRank } from 'lexorank';
import { Task } from '../domain/task.entity';
import { Section } from '../domain/section.entity';
import { UpdateTaskRequest } from '../dto/update-task-request.dto';
import { UpdateTaskResponse } from '../dto/update-task-response.dto';
import { MoveTaskRequest } from '../dto/move-task-request.dto';
import { MoveTaskResponse } from '../dto/move-task-response.dto';
import { TaskResponse } from '../dto/task-response.dto';
import { DeleteTaskResponse } from '../dto/delete-task-response.dto';
import { Task } from '@/task/domain/task.entity';
import { Section } from '@/task/domain/section.entity';
import { UpdateTaskRequest } from '@/task/dto/update-task-request.dto';
import { UpdateTaskResponse } from '@/task/dto/update-task-response.dto';
import { MoveTaskRequest } from '@/task/dto/move-task-request.dto';
import { MoveTaskResponse } from '@/task/dto/move-task-response.dto';
import { TaskResponse } from '@/task/dto/task-response.dto';
import { DeleteTaskResponse } from '@/task/dto/delete-task-response.dto';
import { CreateTaskResponse } from '@/task/dto/create-task-response.dto';
import { Project } from '@/project/entity/project.entity';
import { CreateTaskRequest } from '@/task/dto/create-task-request.dto';
import { Snapshot } from '../domain/snapshot';
import { CustomResponse } from '../domain/custom-response.interface';
import { Snapshot } from '@/task/domain/snapshot';
import { CustomResponse } from '@/task/domain/custom-response.interface';

@Injectable()
export class TaskService {
Expand Down
Loading

0 comments on commit 2363746

Please sign in to comment.