conflict/#66: solve conflict

src/apis/common-posts/common-posts.module.ts

@@ -1,19 +1,20 @@
-import { DynamicModule, Module } from '@nestjs/common';
+import { DynamicModule, Module, Type } from '@nestjs/common';
 import { COMMON_POST_REPOSITORY_TOKEN } from '@src/apis/common-posts/constants/common-posts.token';
 import { CommonPostsService } from '@src/apis/common-posts/services/common-posts.service';
+import { RequiredCommonPostColumn } from '@src/apis/common-posts/types/common-post.type';
 
 @Module({
   providers: [CommonPostsService],
   exports: [CommonPostsService],
 })
 export class CommonPostsModule {
-  static forFeature(postRepository: any): DynamicModule {
+  static forFeature(postEntity: Type<RequiredCommonPostColumn>): DynamicModule {
     return {
       module: CommonPostsModule,
       providers: [
         {
           provide: COMMON_POST_REPOSITORY_TOKEN,
-          useValue: postRepository,
+          useClass: postEntity,
         },
       ],
     };

src/apis/common-posts/services/common-posts.service.spec.ts

@@ -1,5 +1,4 @@
 import { faker } from '@faker-js/faker';
-import { ModuleRef } from '@nestjs/core';
 import { Test, TestingModule } from '@nestjs/testing';
 import { COMMON_POST_REPOSITORY_TOKEN } from '@src/apis/common-posts/constants/common-posts.token';
 import { HttpNotFoundException } from '@src/http-exceptions/exceptions/http-not-found.exception';
@@ -10,29 +9,20 @@ const mockPostRepository = {
 };
 
 describe(CommonPostsService.name, () => {
-  let service: CommonPostsService;
+  let service: CommonPostsService<any>;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [
         CommonPostsService,
         {
           provide: COMMON_POST_REPOSITORY_TOKEN,
-          useValue: class PostRepository {},
-        },
-        {
-          provide: ModuleRef,
-          useValue: {
-            get() {
-              return mockPostRepository;
-            },
-          },
+          useValue: mockPostRepository,
         },
       ],
     }).compile();
 
-    service = module.get<CommonPostsService>(CommonPostsService);
-    service.onModuleInit();
+    service = module.get<CommonPostsService<any>>(CommonPostsService);
   });
 
   beforeEach(() => {

src/apis/common-posts/services/common-posts.service.ts

@@ -1,37 +1,24 @@
-import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
-import { ModuleRef } from '@nestjs/core';
+import { Inject, Injectable } from '@nestjs/common';
 import { CommonPostStatus } from '@src/apis/common-posts/constants/common-posts.enum';
 import { COMMON_POST_REPOSITORY_TOKEN } from '@src/apis/common-posts/constants/common-posts.token';
+import { RequiredCommonPostColumn } from '@src/apis/common-posts/types/common-post.type';
 import { COMMON_ERROR_CODE } from '@src/constants/error/common/common-error-code.constant';
 import { HttpNotFoundException } from '@src/http-exceptions/exceptions/http-not-found.exception';
-import { Repository } from 'typeorm';
+import { FindOptionsWhere, Repository } from 'typeorm';
 
 @Injectable()
-export class CommonPostsService implements OnModuleInit {
-  private postRepository: Repository<any>;
-
+export class CommonPostsService<E extends RequiredCommonPostColumn> {
   constructor(
     @Inject(COMMON_POST_REPOSITORY_TOKEN)
-    private readonly PostRepository: typeof Repository<any>,
-
-    private readonly moduleRef: ModuleRef,
+    private readonly postRepository: Repository<E>,
   ) {}
 
-  onModuleInit() {
-    this.postRepository = this.moduleRef.get<Repository<any>>(
-      this.PostRepository,
-      {
-        strict: false,
-      },
-    );
-  }
-
   async incrementHit(postId: number): Promise<void> {
     const updateResult = await this.postRepository.increment(
       {
         id: postId,
         status: CommonPostStatus.Posting,
-      },
+      } as FindOptionsWhere<E>,
       'hit',
       1,
     );

src/apis/common-posts/types/common-post.type.ts

@@ -0,0 +1,5 @@
+export interface RequiredCommonPostColumn {
+  id: number;
+  status: unknown;
+  hit: number;
+}

src/apis/free-posts/controllers/free-posts.controller.spec.ts

@@ -1,16 +1,12 @@
 import { faker } from '@faker-js/faker';
 import { Test, TestingModule } from '@nestjs/testing';
-import { CommonPostsService } from '@src/apis/common-posts/services/common-posts.service';
 import { CreateFreePostDto } from '@src/apis/free-posts/dto/create-free-post.dto';
 import { FindFreePostListQueryDto } from '@src/apis/free-posts/dto/find-free-post-list-query.dto';
 import { FreePostDto } from '@src/apis/free-posts/dto/free-post.dto';
 import { PatchUpdateFreePostDto } from '@src/apis/free-posts/dto/patch-update-free-post.dto.td';
 import { PutUpdateFreePostDto } from '@src/apis/free-posts/dto/put-update-free-post.dto';
 import { UserDto } from '@src/apis/users/dto/user.dto';
-import {
-  mockCommonPostsService,
-  mockFreePostsService,
-} from '@test/mock/mock.service';
+import { mockFreePostsService } from '@test/mock/mock.service';
 import { FreePostsService } from '../services/free-posts.service';
 import { FreePostsController } from './free-posts.controller';
 
@@ -21,10 +17,6 @@ describe(FreePostsController.name, () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [FreePostsController],
       providers: [
-        {
-          provide: CommonPostsService,
-          useValue: mockCommonPostsService,
-        },
         {
           provide: FreePostsService,
           useValue: mockFreePostsService,
@@ -181,7 +173,7 @@ describe(FreePostsController.name, () => {
     it('increment hit', async () => {
       freePostId = faker.number.int();
 
-      mockCommonPostsService.incrementHit.mockResolvedValue(undefined);
+      mockFreePostsService.incrementHit.mockResolvedValue(undefined);
 
       await expect(
         controller.incrementHit(freePostId),

src/apis/free-posts/controllers/free-posts.controller.ts

@@ -14,7 +14,6 @@ import {
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { JwtAuthGuard } from '@src/apis/auth/jwt/jwt.guard';
-import { CommonPostsService } from '@src/apis/common-posts/services/common-posts.service';
 import { ApiFreePost } from '@src/apis/free-posts/controllers/free-posts.swagger';
 import { FindFreePostListQueryDto } from '@src/apis/free-posts/dto/find-free-post-list-query.dto';
 import { FreePostDto } from '@src/apis/free-posts/dto/free-post.dto';
@@ -33,10 +32,7 @@ import { FreePostsService } from '../services/free-posts.service';
 @ApiTags('free-posts')
 @Controller('free-posts')
 export class FreePostsController {
-  constructor(
-    private readonly freePostsService: FreePostsService,
-    private readonly commonPostsService: CommonPostsService,
-  ) {}
+  constructor(private readonly freePostsService: FreePostsService) {}
 
   @ApiFreePost.Create({ summary: '자유 게시글 생성' })
   @UseGuards(JwtAuthGuard)
@@ -119,6 +115,6 @@ export class FreePostsController {
   incrementHit(
     @Param('freePostId', ParsePositiveIntPipe) freePostId: number,
   ): Promise<void> {
-    return this.commonPostsService.incrementHit(freePostId);
+    return this.freePostsService.incrementHit(freePostId);
   }
 }

src/apis/free-posts/free-posts.module.ts

@@ -3,6 +3,7 @@ import { CommonPostsModule } from '@src/apis/common-posts/common-posts.module';
 import { FreePostHistoryModule } from '@src/apis/free-posts/free-post-history/free-post-history.module';
 import { FreePostRepository } from '@src/apis/free-posts/repositories/free-post.repository';
 import { TypeOrmExModule } from '@src/core/type-orm/type-orm-ex.module';
+import { FreePost } from '@src/entities/FreePost';
 import { QueryHelper } from '@src/helpers/query.helper';
 import { FreePostsController } from './controllers/free-posts.controller';
 import { FreePostsService } from './services/free-posts.service';
@@ -11,7 +12,7 @@ import { FreePostsService } from './services/free-posts.service';
   imports: [
     FreePostHistoryModule,
     TypeOrmExModule.forCustomRepository([FreePostRepository]),
-    CommonPostsModule.forFeature(FreePostRepository),
+    CommonPostsModule.forFeature(FreePost),
   ],
   controllers: [FreePostsController],
   providers: [FreePostsService, QueryHelper],

src/apis/free-posts/services/free-posts.service.spec.ts

@@ -1,5 +1,6 @@
 import { faker } from '@faker-js/faker';
 import { Test, TestingModule } from '@nestjs/testing';
+import { CommonPostsService } from '@src/apis/common-posts/services/common-posts.service';
 import { CreateFreePostDto } from '@src/apis/free-posts/dto/create-free-post.dto';
 import { FindFreePostListQueryDto } from '@src/apis/free-posts/dto/find-free-post-list-query.dto';
 import { FreePostDto } from '@src/apis/free-posts/dto/free-post.dto';
@@ -17,7 +18,10 @@ import {
   mockDataSource,
   mockFreePostRepository,
 } from '@test/mock/mock.repository';
-import { mockFreePostHistoryService } from '@test/mock/mock.service';
+import {
+  mockCommonPostsService,
+  mockFreePostHistoryService,
+} from '@test/mock/mock.service';
 import { DataSource } from 'typeorm';
 import { FreePostsService } from './free-posts.service';
 
@@ -28,6 +32,10 @@ describe(FreePostsService.name, () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [
         FreePostsService,
+        {
+          provide: CommonPostsService,
+          useValue: mockCommonPostsService,
+        },
         {
           provide: FreePostHistoryService,
           useValue: mockFreePostHistoryService,

src/apis/free-posts/services/free-posts.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { CommonPostsService } from '@src/apis/common-posts/services/common-posts.service';
 import { FreePostStatus } from '@src/apis/free-posts/constants/free-post.enum';
 import { FindFreePostListQueryDto } from '@src/apis/free-posts/dto/find-free-post-list-query.dto';
 import { FreePostDto } from '@src/apis/free-posts/dto/free-post.dto';
@@ -10,6 +11,7 @@ import { FreePostRepository } from '@src/apis/free-posts/repositories/free-post.
 import { HistoryAction } from '@src/constants/enum';
 import { COMMON_ERROR_CODE } from '@src/constants/error/common/common-error-code.constant';
 import { ERROR_CODE } from '@src/constants/error/error-code.constant';
+import { FreePost } from '@src/entities/FreePost';
 import { QueryHelper } from '@src/helpers/query.helper';
 import { HttpBadRequestException } from '@src/http-exceptions/exceptions/http-bad-request.exception';
 import { HttpForbiddenException } from '@src/http-exceptions/exceptions/http-forbidden.exception';
@@ -28,6 +30,7 @@ export class FreePostsService {
 
   constructor(
     private readonly freePostHistoryService: FreePostHistoryService,
+    private readonly commonPostsService: CommonPostsService<FreePost>,
 
     private readonly queryHelper: QueryHelper,
 
@@ -325,4 +328,8 @@ export class FreePostsService {
       }
     }
   }
+
+  incrementHit(freePostId: number): Promise<void> {
+    return this.commonPostsService.incrementHit(freePostId);
+  }
 }

src/apis/notice-posts/services/notice-posts.service.ts

@@ -281,7 +281,7 @@ export class NoticePostsService {
     try {
       const entityManager = queryRunner.manager;
 
-      await entityManager
+      const updateResult = await entityManager
         .withRepository(this.noticePostRepository)
         .update({ id: noticePostId }, { status: NoticePostStatus.Remove });
 
@@ -298,7 +298,7 @@ export class NoticePostsService {
 
       await queryRunner.commitTransaction();
 
-      return 1;
+      return updateResult.affected;
     } catch (error) {
       if (queryRunner.isTransactionActive) {
         await queryRunner.rollbackTransaction();

src/apis/reactions/constants/reaction.enum.ts

@@ -0,0 +1,3 @@
+export enum ReactionName {
+  Like = 'like',
+}

src/apis/reactions/constants/reaction.token.ts

@@ -0,0 +1 @@
+export const REACTION_REPOSITORY_TOKEN = Symbol('REACTION_REPOSITORY_TOKEN');

src/apis/reactions/reactions.module.ts

@@ -0,0 +1,34 @@
+import { DynamicModule, Module, Type } from '@nestjs/common';
+import { REACTION_REPOSITORY_TOKEN } from '@src/apis/reactions/constants/reaction.token';
+import { ReactionTypeRepository } from '@src/apis/reactions/repositories/reaction-type.repository';
+import { ReactionsService } from '@src/apis/reactions/services/reactions.service';
+import { RequiredReactionColumn } from '@src/apis/reactions/types/reaction.type';
+import { TypeOrmExModule } from '@src/core/type-orm/type-orm-ex.module';
+import { DataSource } from 'typeorm';
+
+@Module({
+  imports: [TypeOrmExModule.forCustomRepository([ReactionTypeRepository])],
+  providers: [ReactionsService],
+  exports: [ReactionsService],
+})
+export class ReactionsModule {
+  /**
+   * @requires 해당 module을 사용하려면 entity에 userId, parentId, reactionTypeId가 선언돼야합니다.
+   */
+  static forFeature(
+    reactionEntity: Type<RequiredReactionColumn>,
+  ): DynamicModule {
+    return {
+      module: ReactionsModule,
+      providers: [
+        {
+          provide: REACTION_REPOSITORY_TOKEN,
+          useFactory: (dataSource: DataSource) => {
+            return dataSource.getRepository(reactionEntity);
+          },
+          inject: [DataSource],
+        },
+      ],
+    };
+  }
+}

src/apis/reactions/repositories/reaction-type.repository.ts

@@ -0,0 +1,6 @@
+import { CustomRepository } from '@src/core/type-orm/decorators/custom-repository.decorator';
+import { ReactionType } from '@src/entities/ReactionType';
+import { Repository } from 'typeorm';
+
+@CustomRepository(ReactionType)
+export class ReactionTypeRepository extends Repository<ReactionType> {}