refactor: divide user resource directory

src/app.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { UsersModule } from './users/users.module';
+import { UsersModule } from './presentation/user/users.module';
 import { CommonModule } from './common/common.module';
 import { AuthModule } from './auth/auth.module';
 import { MailModule } from './mail/mail.module';
@@ -15,7 +15,7 @@ import { TypeOrmConfigService } from './database/typerom-config.service';
 import { OpenaiModule } from './openai/openai.module';
 import { AppController } from './app.controller';
 import { AopModule } from './common/aop/aop.module';
-import { InfraModule } from './infra/infra.module';
+import { InfraModule } from './infrastructure/infra.module';
 
 @Module({
   imports: [

src/auth/auth.controller.ts

@@ -10,7 +10,7 @@ import {
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
 import { ErrorOutput } from '../common/dtos/output.dto';
-import { User } from '../users/entities/user.entity';
+import { User } from '../domain/user/entities/user.entity';
 import { AuthUser } from './auth-user.decorator';
 import { AuthService } from './auth.service';
 import {

src/auth/auth.module.ts

@@ -8,12 +8,13 @@ import { JwtStrategy } from './jwt/jwt.strategy';
 import { GoogleStrategy } from './passport/google/google.strategy';
 import { customJwtService } from './jwt/jwt.service';
 import { TWOHOUR } from './jwt/jwt.payload';
-import { UsersModule } from '../users/users.module';
+import { UsersModule } from '../presentation/user/users.module';
 import { OAuthUtil } from './util/oauth.util';
 import { ContentsModule } from '../contents/contents.module';
 import { OAuthService } from './oauth.service';
 import { CategoryModule } from '../categories/category.module';
-import { RedisModule } from '../infra/redis/redis.module';
+import { RedisModule } from '../infrastructure/redis/redis.module';
+import { UserDomainModule } from '../domain/user/user.module';
 
 const accessTokenExpiration = TWOHOUR;
 export const refreshTokenExpirationInCache = 60 * 60 * 24 * 365; // 1 year
@@ -29,7 +30,7 @@ export const verifyEmailExpiration = 60 * 5;
         signOptions: { expiresIn: accessTokenExpiration },
       }),
     }),
-    UsersModule,
+    UserDomainModule,
     ContentsModule,
     CategoryModule,
     RedisModule,

src/auth/auth.service.spec.ts

@@ -8,14 +8,14 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken, TypeOrmModule } from '@nestjs/typeorm';
 import { CONFIG_OPTIONS } from '../common/common.constants';
 import { MailService } from '../mail/mail.service';
-import { User, UserRole } from '../users/entities/user.entity';
+import { User, UserRole } from '../domain/user/entities/user.entity';
 import { DataSource, ObjectLiteral, Repository } from 'typeorm';
 import { AuthService } from './auth.service';
 import { customJwtService } from './jwt/jwt.service';
 import { Cache } from 'cache-manager';
 import { LoginBodyDto, LogoutBodyDto } from './dtos/login.dto';
-import { UsersModule } from '../users/users.module';
-import { UserRepository } from '../users/repository/user.repository';
+import { UsersModule } from '../presentation/user/users.module';
+import { UserRepository } from '../infrastructure/user/repository/user.repository';
 import { TWOHOUR } from './jwt/jwt.payload';
 import * as dotenv from 'dotenv';
 

src/auth/auth.service.ts

@@ -1,5 +1,6 @@
 import {
   BadRequestException,
+  Inject,
   Injectable,
   NotFoundException,
   UnauthorizedException,
@@ -23,15 +24,15 @@ import { RefreshTokenDto, RefreshTokenOutput } from './dtos/token.dto';
 import { ValidateUserDto, ValidateUserOutput } from './dtos/validate-user.dto';
 import { ONEYEAR, Payload } from './jwt/jwt.payload';
 import { customJwtService } from './jwt/jwt.service';
-import { UserRepository } from '../users/repository/user.repository';
-import { RedisService } from '../infra/redis/redis.service';
+import { UserRepository } from '../domain/user/user.repository';
+import { RedisService } from '../infrastructure/redis/redis.service';
 import { PASSWORD_CODE_KEY, REFRESH_TOKEN_KEY } from './constants';
 
 @Injectable()
 export class AuthService {
   constructor(
     private readonly jwtService: customJwtService,
-    private readonly userRepository: UserRepository,
+    @Inject(UserRepository) private readonly userRepository: UserRepository,
     private readonly mailService: MailService,
     private readonly redisService: RedisService,
   ) {}
@@ -66,7 +67,7 @@ export class AuthService {
     userId: number,
     { refresh_token: refreshToken }: LogoutBodyDto,
   ): Promise<LogoutOutput> {
-    const user = await this.userRepository.findOneBy({ id: userId });
+    const user = await this.userRepository.findById(userId);
     if (user) {
       if (!refreshToken) {
         throw new BadRequestException('Refresh token is required');
@@ -100,7 +101,7 @@ export class AuthService {
     } catch (e) {
       throw new UnauthorizedException('Invalid refresh token');
     }
-    const user = await this.userRepository.findOneBy({ id: decoded.sub });
+    const user = await this.userRepository.findById(decoded.sub);
     if (!user) {
       throw new NotFoundException('User not found');
     }
@@ -140,7 +141,7 @@ export class AuthService {
   async sendPasswordResetEmail(
     email: string,
   ): Promise<sendPasswordResetEmailOutput> {
-    const user = await this.userRepository.findOneBy({ email });
+    const user = await this.userRepository.findByEmail(email);
     if (user) {
       if (!user.verified) {
         throw new UnauthorizedException('User not verified');
@@ -167,10 +168,7 @@ export class AuthService {
     password,
   }: ValidateUserDto): Promise<ValidateUserOutput> {
     try {
-      const user = await this.userRepository.findOne({
-        where: { email },
-        select: { id: true, password: true },
-      });
+      const user = await this.userRepository.findByEmail(email);
       if (!user) {
         throw new NotFoundException('User Not Found');
       }

src/auth/dtos/create-account.dto.ts

@@ -1,6 +1,6 @@
 import { PickType } from '@nestjs/swagger';
 import { CoreOutput } from '../../common/dtos/output.dto';
-import { User } from '../../users/entities/user.entity';
+import { User } from '../../domain/user/entities/user.entity';
 
 // export class CreateAccountBodyDto extends PickType(User, [
 //   'email',

src/auth/dtos/login.dto.ts

@@ -1,7 +1,7 @@
 import { ApiProperty, PickType } from '@nestjs/swagger';
 import { IsBoolean, IsOptional, IsString } from 'class-validator';
 import { CoreOutput } from '../../common/dtos/output.dto';
-import { User } from '../../users/entities/user.entity';
+import { User } from '../../domain/user/entities/user.entity';
 
 export class LoginBodyDto extends PickType(User, ['email', 'password']) {
   @ApiProperty({

src/auth/dtos/validate-user.dto.ts

@@ -1,6 +1,6 @@
 import { ApiProperty, PickType } from '@nestjs/swagger';
 import { CoreOutput } from '../../common/dtos/output.dto';
-import { User } from '../../users/entities/user.entity';
+import { User } from '../../domain/user/entities/user.entity';
 
 export class ValidateUserDto extends PickType(User, ['email', 'password']) {}
 

src/auth/jwt/jwt.strategy.ts

@@ -1,12 +1,14 @@
 import { ExtractJwt, Strategy } from 'passport-jwt';
-import { Injectable, UnauthorizedException } from '@nestjs/common';
+import { Inject, Injectable, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { Payload } from './jwt.payload';
-import { UserRepository } from '../../users/repository/user.repository';
+import { UserRepository } from '../../domain/user/user.repository';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {
-  constructor(private readonly userRepository: UserRepository) {
+  constructor(
+    @Inject(UserRepository) private readonly userRepository: UserRepository,
+  ) {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       ignoreExpiration: false,
@@ -15,7 +17,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   }
 
   async validate(payload: Payload) {
-    const user = await this.userRepository.findOneBy({ id: payload.sub });
+    const user = await this.userRepository.findById(payload.sub);
     if (user) {
       return user;
     } else {

src/auth/oauth.service.ts

@@ -3,6 +3,8 @@ import {
   UnauthorizedException,
   BadRequestException,
   InternalServerErrorException,
+  Inject,
+  NotFoundException,
 } from '@nestjs/common';
 import axios from 'axios';
 import { refreshTokenExpirationInCache } from './auth.module';
@@ -13,20 +15,21 @@ import { Payload } from './jwt/jwt.payload';
 import { customJwtService } from './jwt/jwt.service';
 import { OAuthUtil } from './util/oauth.util';
 import { CategoryRepository } from '../categories/category.repository';
-import { User } from '../users/entities/user.entity';
-import { UserRepository } from '../users/repository/user.repository';
+import { User } from '../domain/user/entities/user.entity';
+
 import * as CryptoJS from 'crypto-js';
 import { CookieOptions } from 'express';
-import { RedisService } from '../infra/redis/redis.service';
+import { RedisService } from '../infrastructure/redis/redis.service';
 import { REFRESH_TOKEN_KEY } from './constants';
 import { KakaoLoginRequest } from './dtos/request/kakao-login.request.dto';
 import { KakaoLoginDto } from './dtos/kakao-login.dto';
+import { UserRepository } from '../domain/user/user.repository';
 
 @Injectable()
 export class OAuthService {
   constructor(
     private readonly jwtService: customJwtService,
-    private readonly userRepository: UserRepository,
+    @Inject(UserRepository) private readonly userRepository: UserRepository,
     private readonly categoryRepository: CategoryRepository,
     private readonly oauthUtil: OAuthUtil,
     private readonly redisService: RedisService,
@@ -35,7 +38,11 @@ export class OAuthService {
   // OAuth Login
   async oauthLogin(email: string): Promise<LoginOutput> {
     try {
-      const user: User = await this.userRepository.findOneByOrFail({ email });
+      const user = await this.userRepository.findByEmail(email);
+      if (!user) {
+        throw new NotFoundException('User not found');
+      }
+
       if (user) {
         const payload: Payload = this.jwtService.createPayload(
           user.email,
@@ -97,7 +104,7 @@ export class OAuthService {
         throw new BadRequestException('Please Agree to share your email');
       }
 
-      let user = await this.userRepository.findOneByEmail(email);
+      let user = await this.userRepository.findByEmail(email);
 
       // 회원가입인 경우 기본 카테고리 생성 작업 진행
       if (!user) {
@@ -131,7 +138,7 @@ export class OAuthService {
         throw new BadRequestException('Please Agree to share your email');
       }
 
-      let user = await this.userRepository.findOneByEmail(email);
+      let user = await this.userRepository.findByEmail(email);
 
       // 회원가입인 경우 기본 카테고리 생성 작업 진행
       if (!user) {
@@ -161,7 +168,7 @@ export class OAuthService {
     picture,
   }: googleUserInfo): Promise<LoginOutput> {
     try {
-      let user = await this.userRepository.findOneByEmail(email);
+      let user = await this.userRepository.findByEmail(email);
 
       // 회원가입인 경우 기본 카테고리 생성 작업 진행
       if (!user) {
@@ -229,7 +236,7 @@ export class OAuthService {
 
     const { sub: id, email } = this.jwtService.decode(data.id_token);
 
-    let user = await this.userRepository.findOneByEmail(email);
+    let user = await this.userRepository.findByEmail(email);
 
     if (!user) {
       user = new User();

src/auth/role.decorator.ts

@@ -1,5 +1,5 @@
 import { SetMetadata } from '@nestjs/common';
-import { UserRole } from '../users/entities/user.entity';
+import { UserRole } from '../domain/user/entities/user.entity';
 
 export type AllowedRoles = keyof typeof UserRole | 'Any';
 

src/auth/role.guard.ts

@@ -1,7 +1,7 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { AllowedRoles } from './role.decorator';
-import { User } from '../users/entities/user.entity';
+import { User } from '../domain/user/entities/user.entity';
 
 @Injectable()
 export class RoleGuard implements CanActivate {

src/categories/category.controller.ts

@@ -39,7 +39,7 @@ import {
   LoadPersonalCategoriesOutput,
   LoadFrequentCategoriesOutput,
 } from './dtos/load-personal-categories.dto';
-import { User } from '../users/entities/user.entity';
+import { User } from '../domain/user/entities/user.entity';
 import { CategoryService } from './category.service';
 
 @Controller('categories')

src/categories/category.entity.ts

@@ -11,7 +11,7 @@ import {
 import { Content } from '../contents/entities/content.entity';
 import { CoreEntity } from '../common/entities/core.entity';
 import { Collection } from '../collections/entities/collection.entity';
-import { User } from '../users/entities/user.entity';
+import { User } from '../domain/user/entities/user.entity';
 
 export enum IconName {
   None = 'None',

src/categories/category.module.ts

@@ -2,19 +2,20 @@ import { Module } from '@nestjs/common';
 import { ContentsModule } from '../contents/contents.module';
 import { CategoryService } from './category.service';
 import { OpenaiModule } from '../openai/openai.module';
-import { UsersModule } from '../users/users.module';
+import { UsersModule } from '../presentation/user/users.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Category } from './category.entity';
 import { CategoryController } from './category.controller';
 import { ContentRepository } from '../contents/repository/content.repository';
 import { CategoryRepository } from './category.repository';
+import { UserDomainModule } from '../domain/user/user.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([Category]),
     ContentsModule,
     OpenaiModule,
-    UsersModule,
+    UserDomainModule,
   ],
   controllers: [CategoryController],
   providers: [CategoryService, ContentRepository, CategoryRepository],

src/categories/category.repository.ts

@@ -5,7 +5,7 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { Category } from './category.entity';
-import { User } from '../users/entities/user.entity';
+import { User } from '../domain/user/entities/user.entity';
 import { generateSlug } from './utils/category.util';
 
 @Injectable()

src/categories/category.service.ts

@@ -2,6 +2,7 @@ import {
   Injectable,
   NotFoundException,
   ConflictException,
+  Inject,
 } from '@nestjs/common';
 import { EntityManager } from 'typeorm';
 import {
@@ -25,22 +26,23 @@ import { CategoryRepository } from './category.repository';
 import { ContentRepository } from '../contents/repository/content.repository';
 import { getLinkContent, getLinkInfo } from '../contents/util/content.util';
 import { OpenaiService } from '../openai/openai.service';
-import { User } from '../users/entities/user.entity';
-import { UserRepository } from '../users/repository/user.repository';
+import { User } from '../domain/user/entities/user.entity';
+
 import {
   generateCategoriesTree,
   generateSlug,
   loadLogs,
   makeCategoryListWithSaveCount,
 } from './utils/category.util';
 import { Transactional } from '../common/aop/transactional';
+import { UserRepository } from '../domain/user/user.repository';
 
 @Injectable()
 export class CategoryService {
   constructor(
     private readonly contentRepository: ContentRepository,
     private readonly categoryRepository: CategoryRepository,
-    private readonly userRepository: UserRepository,
+    @Inject(UserRepository) private readonly userRepository: UserRepository,
     private readonly openaiService: OpenaiService,
   ) {}
 
@@ -51,7 +53,9 @@ export class CategoryService {
     entityManager?: EntityManager,
   ): Promise<AddCategoryOutput> {
     try {
-      const userInDb = await this.userRepository.findOneWithCategories(user.id);
+      const userInDb = await this.userRepository.findByIdWithCategories(
+        user.id,
+      );
 
       if (!userInDb) {
         throw new NotFoundException('User not found');
@@ -417,7 +421,9 @@ export class CategoryService {
     link: string,
   ): Promise<AutoCategorizeOutput> {
     try {
-      const userInDb = await this.userRepository.findOneWithCategories(user.id);
+      const userInDb = await this.userRepository.findByIdWithCategories(
+        user.id,
+      );
       if (!userInDb) {
         throw new NotFoundException('User not found');
       }