Skip to content

Commit 8f12c34

Browse files
authored
Merge pull request #219 from kyumin1227/clean
청소(cleaning) 관리 기능 dev 병합
2 parents 0ef79b6 + 8d70a0d commit 8f12c34

35 files changed

Lines changed: 7238 additions & 24 deletions

src/cleaning/cleaning.controller.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/cleaning/cleaning.entity.ts

Whitespace-only changes.

src/cleaning/cleaning.module.ts

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,46 @@
1-
import { Module } from '@nestjs/common';
2-
import { CleaningController } from './cleaning.controller';
3-
import { CleaningService } from './cleaning.service';
1+
import { Module, forwardRef } from '@nestjs/common';
2+
import { TypeOrmModule } from '@nestjs/typeorm';
3+
import { CleaningRuleController } from './controller/cleaning-rule.controller';
4+
import { CleaningScheduleController } from './controller/cleaning-schedule.controller';
5+
import { CleaningTradeController } from './controller/cleaning-trade.controller';
6+
import { CleaningRuleService } from './service/cleaning-rule.service';
7+
import { CleaningScheduleService } from './service/cleaning-schedule.service';
8+
import { CleaningTradeService } from './service/cleaning-trade.service';
9+
import { CleaningRule } from './entity/cleaning-rule.entity';
10+
import { CleaningRuleResource } from './entity/cleaning-rule-resource.entity';
11+
import { CleaningRuleUser } from './entity/cleaning-rule-user.entity';
12+
import { CleaningSchedule } from './entity/cleaning-schedule.entity';
13+
import { CleaningAssignment } from './entity/cleaning-assignment.entity';
14+
import { CleaningTrade } from './entity/cleaning-trade.entity';
15+
import { UserModule } from '../user/user.module';
16+
import { StudentClassModule } from '../student-class/student-class.module';
17+
import { ResourceModule } from '../resource/resource.module';
418

519
@Module({
6-
controllers: [CleaningController],
7-
providers: [CleaningService],
20+
imports: [
21+
TypeOrmModule.forFeature([
22+
CleaningRule,
23+
CleaningRuleResource,
24+
CleaningRuleUser,
25+
CleaningSchedule,
26+
CleaningAssignment,
27+
CleaningTrade,
28+
]),
29+
// UserAdminController가 CleaningScheduleService를 쓰기 때문에 순환 참조를 허용한다.
30+
forwardRef(() => UserModule),
31+
StudentClassModule,
32+
forwardRef(() => ResourceModule),
33+
],
34+
controllers: [
35+
CleaningRuleController,
36+
CleaningScheduleController,
37+
CleaningTradeController,
38+
],
39+
providers: [
40+
CleaningRuleService,
41+
CleaningScheduleService,
42+
CleaningTradeService,
43+
],
44+
exports: [CleaningScheduleService],
845
})
946
export class CleaningModule {}

src/cleaning/cleaning.service.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/cleaning/cleaning.view.ts

Whitespace-only changes.

0 commit comments

Comments
 (0)