refactor: checkDeletedMMedicinesByCategoryId 메서드 MMedicineCategoriesService로 이동

Author: eeseung

backend/src/m-medicine-categories/m-medicine-categories.module.ts

@@ -3,13 +3,10 @@ import { MMedicineCategoriesService } from './m-medicine-categories.service';
 import { MMedicineCategoriesController } from './m-medicine-categories.controller';
 import { M_Medicine_Categories } from './entity/m_medicine_categories.entity';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { MMedicinesModule } from 'src/m-medicines/m-medicines.module';
+import { M_Medicines } from 'src/m-medicines/entity/m-medicines.entity';
 
 @Module({
-  imports: [
-    TypeOrmModule.forFeature([M_Medicine_Categories]),
-    MMedicinesModule,
-  ],
+  imports: [TypeOrmModule.forFeature([M_Medicine_Categories, M_Medicines])],
   controllers: [MMedicineCategoriesController],
   providers: [MMedicineCategoriesService],
 })

backend/src/m-medicine-categories/m-medicine-categories.service.ts

@@ -5,18 +5,19 @@ import {
 } from '@nestjs/common';
 import { M_Medicine_Categories } from './entity/m_medicine_categories.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { IsNull, Not, Repository } from 'typeorm';
 import { CreateMMedicineCategoryDto } from './dto/create-m-medicine-category.dto';
 import { UpdateMMedicineSubCategoryDto } from './dto/update-m-medicine-sub-category.dto';
-import { MMedicinesService } from 'src/m-medicines/m-medicines.service';
 import { UpdateMMedicineMainCategoryDto } from './dto/update-m-medicine-main-category.dto';
+import { M_Medicines } from 'src/m-medicines/entity/m-medicines.entity';
 
 @Injectable()
 export class MMedicineCategoriesService {
   constructor(
     @InjectRepository(M_Medicine_Categories)
     private readonly mMedicineCategoriesRepository: Repository<M_Medicine_Categories>,
-    private readonly mMedicinesService: MMedicinesService,
+    @InjectRepository(M_Medicines)
+    private readonly mMedicinesRepository: Repository<M_Medicines>,
   ) {}
 
   async getCategories() {
@@ -164,10 +165,7 @@ export class MMedicineCategoriesService {
       throw new NotFoundException();
     }
 
-    const isDeleted =
-      await this.mMedicinesService.checkDeletedMMedicinesByCategoryId(
-        categoryId,
-      );
+    const isDeleted = await this.checkDeletedMMedicinesByCategoryId(categoryId);
 
     if (!isDeleted) {
       throw new BadRequestException('삭제되지 않은 약품이 존재합니다.');
@@ -177,4 +175,28 @@ export class MMedicineCategoriesService {
 
     return categoryId;
   }
+
+  async checkDeletedMMedicinesByCategoryId(categoryId: number) {
+    const [, deletedMedicineCount] =
+      await this.mMedicinesRepository.findAndCount({
+        where: {
+          category: {
+            id: categoryId,
+          },
+          deletedAt: Not(IsNull()),
+        },
+        withDeleted: true,
+      });
+
+    const [, medicineCount] = await this.mMedicinesRepository.findAndCount({
+      where: {
+        category: {
+          id: categoryId,
+        },
+      },
+      withDeleted: true,
+    });
+
+    return deletedMedicineCount === medicineCount;
+  }
 }

backend/src/m-medicines/m-medicines.service.ts

@@ -1,5 +1,5 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { IsNull, Not, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { M_Medicines } from './entity/m-medicines.entity';
 import { CreateMMedicineDto } from './dto/create-m-medicine.dto';
@@ -79,28 +79,4 @@ export class MMedicinesService {
       throw new BadRequestException(error);
     }
   }
-
-  async checkDeletedMMedicinesByCategoryId(categoryId: number) {
-    const [, deletedMedicineCount] =
-      await this.mMedicinesRepository.findAndCount({
-        where: {
-          category: {
-            id: categoryId,
-          },
-          deletedAt: Not(IsNull()),
-        },
-        withDeleted: true,
-      });
-
-    const [, medicineCount] = await this.mMedicinesRepository.findAndCount({
-      where: {
-        category: {
-          id: categoryId,
-        },
-      },
-      withDeleted: true,
-    });
-
-    return deletedMedicineCount === medicineCount;
-  }
 }