Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { CACHE_MANAGER } from '@nestjs/cache-manager';
import { NotFoundException } from '@nestjs/common';
import { Test, TestingModule } from '@nestjs/testing';
import { CafeteriaDiet } from 'src/api/public/cafeterias/entities/cafeteria-diet.entity';
import { Cafeteria } from 'src/api/public/cafeterias/entities/cafeteria.entity';
import { CafeteriasRepository } from 'src/api/public/cafeterias/cafeterias.repository';
import { CafeteriasService } from './cafeterias.service';
import { CafeteriaDiet } from 'src/api/public/cafeterias/domain/entities/cafeteria-diet.entity';
import { Cafeteria } from 'src/api/public/cafeterias/domain/entities/cafeteria.entity';
import { CafeteriasRepository } from 'src/api/public/cafeterias/infrastructure/cafeterias.repository';
import { CafeteriasService } from 'src/api/public/cafeterias/application/cafeterias.service';

const makeCafeteria = (overrides: Partial<Cafeteria> = {}): Cafeteria =>
({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Cache, CACHE_MANAGER } from '@nestjs/cache-manager';
import { Inject, Injectable, NotFoundException } from '@nestjs/common';
import { CacheKey } from 'src/api/common/decorators/cache-key.decorator';
import { DietTime } from 'src/api/public/cafeterias/dtos/requests/list-cafeteria-diet-request.dto';
import { DietTime } from 'src/api/public/cafeterias/presentation/dtos/requests/list-cafeteria-diet-request.dto';
import {
CafeteriaDietItemResult,
CafeteriaDietResult,
CafeteriaMenuGroupResult,
} from 'src/api/public/cafeterias/dtos/results/cafeteria-diet-result.dto';
import { CafeteriaListResult } from 'src/api/public/cafeterias/dtos/results/cafeteria-list-result.dto';
import { CafeteriasRepository } from 'src/api/public/cafeterias/cafeterias.repository';
} from 'src/api/public/cafeterias/application/dtos/results/cafeteria-diet-result.dto';
import { CafeteriaListResult } from 'src/api/public/cafeterias/application/dtos/results/cafeteria-list-result.dto';
import { CafeteriasRepository } from 'src/api/public/cafeterias/infrastructure/cafeterias.repository';

@Injectable()
export class CafeteriasService {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DietTime } from 'src/api/public/cafeterias/dtos/requests/list-cafeteria-diet-request.dto';
import { CafeteriaItemResult } from 'src/api/public/cafeterias/dtos/results/cafeteria-list-result.dto';
import { DietTime } from 'src/api/public/cafeterias/presentation/dtos/requests/list-cafeteria-diet-request.dto';
import { CafeteriaItemResult } from 'src/api/public/cafeterias/application/dtos/results/cafeteria-list-result.dto';

export interface CafeteriaDietItemResult {
dishCategory: string | null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CampusItemResult } from 'src/api/public/campuses/dtos/results/campus-list-result.dto';
import { CampusItemResult } from 'src/api/public/campuses/application/dtos/results/campus-list-result.dto';

export interface CafeteriaItemResult {
id: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DietDate } from 'src/api/public/cafeterias/dtos/requests/list-cafeteria-diet-request.dto';
import { DietDate } from 'src/api/public/cafeterias/presentation/dtos/requests/list-cafeteria-diet-request.dto';

/** 한국은 연중 UTC+9 (DST 없음). Intl 없이 서울 벽시계 시·분을 쓸 때 사용 */
const KST_OFFSET_MS = 9 * 60 * 60 * 1000;
Expand Down
16 changes: 8 additions & 8 deletions services/api/app/src/api/public/cafeterias/cafeterias.module.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { CafeteriaMessageFactory } from 'src/api/public/cafeterias/cafeteria-message.factory';
import { CafeteriasRepository } from 'src/api/public/cafeterias/cafeterias.repository';
import { CafeteriaDiet } from 'src/api/public/cafeterias/entities/cafeteria-diet.entity';
import { Cafeteria } from 'src/api/public/cafeterias/entities/cafeteria.entity';
import { CafeteriaMessageFactory } from 'src/api/public/cafeterias/presentation/cafeteria-message.factory';
import { CafeteriasRepository } from 'src/api/public/cafeterias/infrastructure/cafeterias.repository';
import { CafeteriaDiet } from 'src/api/public/cafeterias/domain/entities/cafeteria-diet.entity';
import { Cafeteria } from 'src/api/public/cafeterias/domain/entities/cafeteria.entity';
import { CampusesModule } from 'src/api/public/campuses/campuses.module';
import { CampusMessageFactory } from 'src/api/public/campuses/campus-message.factory';
import { CafeteriasNativeController } from './cafeterias-native.controller';
import { CafeteriasController } from './cafeterias.controller';
import { CafeteriasService } from './cafeterias.service';
import { CampusMessageFactory } from 'src/api/public/campuses/presentation/campus-message.factory';
import { CafeteriasNativeController } from 'src/api/public/cafeterias/presentation/cafeterias-native.controller';
import { CafeteriasController } from 'src/api/public/cafeterias/presentation/cafeterias.controller';
import { CafeteriasService } from 'src/api/public/cafeterias/application/cafeterias.service';

@Module({
imports: [CampusesModule, TypeOrmModule.forFeature([Cafeteria, CafeteriaDiet])],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Cafeteria } from 'src/api/public/cafeterias/entities/cafeteria.entity';
import { Cafeteria } from 'src/api/public/cafeterias/domain/entities/cafeteria.entity';
import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';

@Entity('cafeteria_diet')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CafeteriaDiet } from 'src/api/public/cafeterias/entities/cafeteria-diet.entity';
import { Campus } from 'src/api/public/campuses/entities/campus.entity';
import { CafeteriaDiet } from 'src/api/public/cafeterias/domain/entities/cafeteria-diet.entity';
import { Campus } from 'src/api/public/campuses/domain/entities/campus.entity';
import { Column, Entity, JoinColumn, ManyToOne, OneToMany, PrimaryGeneratedColumn } from 'typeorm';

@Entity('cafeteria')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { DietTime } from 'src/api/public/cafeterias/dtos/requests/list-cafeteria-diet-request.dto';
import { CafeteriaDiet } from 'src/api/public/cafeterias/entities/cafeteria-diet.entity';
import { Cafeteria } from 'src/api/public/cafeterias/entities/cafeteria.entity';
import { DietTime } from 'src/api/public/cafeterias/presentation/dtos/requests/list-cafeteria-diet-request.dto';
import { CafeteriaDiet } from 'src/api/public/cafeterias/domain/entities/cafeteria-diet.entity';
import { Cafeteria } from 'src/api/public/cafeterias/domain/entities/cafeteria.entity';
import { Repository } from 'typeorm';

@Injectable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import { BlockId } from 'src/api/common/utils/constants';
import {
DietDate,
DietTime,
} from 'src/api/public/cafeterias/dtos/requests/list-cafeteria-diet-request.dto';
import { CafeteriaDietResult } from 'src/api/public/cafeterias/dtos/results/cafeteria-diet-result.dto';
} from 'src/api/public/cafeterias/presentation/dtos/requests/list-cafeteria-diet-request.dto';
import { CafeteriaDietResult } from 'src/api/public/cafeterias/application/dtos/results/cafeteria-diet-result.dto';
import {
CafeteriaItemResult,
CafeteriaListResult,
} from 'src/api/public/cafeterias/dtos/results/cafeteria-list-result.dto';
import { getDayWeek } from 'src/api/public/cafeterias/utils/time';
} from 'src/api/public/cafeterias/application/dtos/results/cafeteria-list-result.dto';
import { getDayWeek } from 'src/api/public/cafeterias/application/utils/time';

@Injectable()
export class CafeteriaMessageFactory {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Controller, Get, Param, ParseIntPipe, Query, UseGuards } from '@nestjs/common';
import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
import { NativeResponseDto } from 'src/api/common/dtos/native-response.dto';
import { JwtAuthGuard } from 'src/api/public/users/guards/jwt-auth.guard';
import { JwtAuthGuard } from 'src/api/public/users/presentation/guards/jwt-auth.guard';
import { GetCafeteriaDietQueryDto } from './dtos/requests/get-cafeteria-diet-query.dto';
import { GetCafeteriasQueryDto } from './dtos/requests/get-cafeterias-query.dto';
import { CafeteriaDietResponseDto } from './dtos/responses/cafeteria-diet-response.dto';
import { CafeteriaResponseDto } from './dtos/responses/cafeteria-response.dto';
import { CafeteriasService } from './cafeterias.service';
import { CafeteriasService } from 'src/api/public/cafeterias/application/cafeterias.service';

@ApiTags('cafeterias')
@Controller('cafeterias')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import { ApiTags } from '@nestjs/swagger';
import { ApiSkillBody } from 'src/api/common/decorators/api-skill-body.decorator';
import { ClientExtra } from 'src/api/common/decorators/skill-extra.decorator';
import { ResponseDTO } from 'src/api/common/dtos/response.dto';
import { ListCafeteriaDietExtraRequestDto } from 'src/api/public/cafeterias/dtos/requests/list-cafeteria-diet-request.dto';
import { ListCafeteriaRequestDto } from 'src/api/public/cafeterias/dtos/requests/list-cafeteria-request.dto';
import { CafeteriaMessageFactory } from 'src/api/public/cafeterias/cafeteria-message.factory';
import { CampusesService } from 'src/api/public/campuses/campuses.service';
import { CampusMessageFactory } from 'src/api/public/campuses/campus-message.factory';
import { CurrentUser } from 'src/api/public/users/decorators/current-user.decorator';
import { FetchCurrentUser } from 'src/api/public/users/decorators/fetch-current-user.decorator';
import { ListCafeteriaDietExtraRequestDto } from 'src/api/public/cafeterias/presentation/dtos/requests/list-cafeteria-diet-request.dto';
import { ListCafeteriaRequestDto } from 'src/api/public/cafeterias/presentation/dtos/requests/list-cafeteria-request.dto';
import { CafeteriaMessageFactory } from 'src/api/public/cafeterias/presentation/cafeteria-message.factory';
import { CampusesService } from 'src/api/public/campuses/application/campuses.service';
import { CampusMessageFactory } from 'src/api/public/campuses/presentation/campus-message.factory';
import { CurrentUser } from 'src/api/public/users/presentation/decorators/current-user.decorator';
import { FetchCurrentUser } from 'src/api/public/users/presentation/decorators/fetch-current-user.decorator';
import { BlockId } from 'src/api/common/utils/constants';
import { User } from 'src/api/public/users/entities/users.entity';
import { KakaoAuthGuard } from 'src/api/public/users/guards/kakao-auth.guard';
import { getDietTime, getTodayOrTomorrow } from 'src/api/public/cafeterias/utils/time';
import { CafeteriasService } from './cafeterias.service';
import { User } from 'src/api/public/users/domain/entities/users.entity';
import { KakaoAuthGuard } from 'src/api/public/users/presentation/guards/kakao-auth.guard';
import { getDietTime, getTodayOrTomorrow } from 'src/api/public/cafeterias/application/utils/time';
import { CafeteriasService } from 'src/api/public/cafeterias/application/cafeterias.service';

@ApiTags('cafeterias')
@Controller('cafeterias')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApiProperty } from '@nestjs/swagger';
import { CampusResponseDto } from 'src/api/public/campuses/dtos/campus-response.dto';
import { CampusResponseDto } from 'src/api/public/campuses/presentation/dtos/campus-response.dto';

export class CafeteriaResponseDto {
@ApiProperty({ description: '식당 ID' })
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Cache, CACHE_MANAGER } from '@nestjs/cache-manager';
import { Inject, Injectable, Logger } from '@nestjs/common';
import { CampusListResult } from 'src/api/public/campuses/dtos/results/campus-list-result.dto';
import { CampusesRepository } from 'src/api/public/campuses/campuses.repository';
import { CampusListResult } from 'src/api/public/campuses/application/dtos/results/campus-list-result.dto';
import { CampusesRepository } from 'src/api/public/campuses/infrastructure/campuses.repository';
import { CacheKey } from 'src/api/common/decorators/cache-key.decorator';

@Injectable()
Expand Down
8 changes: 4 additions & 4 deletions services/api/app/src/api/public/campuses/campuses.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 { Campus } from 'src/api/public/campuses/entities/campus.entity';
import { CampusesRepository } from 'src/api/public/campuses/campuses.repository';
import { CampusesNativeController } from './campuses-native.controller';
import { CampusesService } from './campuses.service';
import { Campus } from 'src/api/public/campuses/domain/entities/campus.entity';
import { CampusesRepository } from 'src/api/public/campuses/infrastructure/campuses.repository';
import { CampusesNativeController } from 'src/api/public/campuses/presentation/campuses-native.controller';
import { CampusesService } from 'src/api/public/campuses/application/campuses.service';

@Module({
imports: [TypeOrmModule.forFeature([Campus])],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Cafeteria } from 'src/api/public/cafeterias/entities/cafeteria.entity';
import { Cafeteria } from 'src/api/public/cafeterias/domain/entities/cafeteria.entity';
import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
import { User } from 'src/api/public/users/entities/users.entity';
import { User } from 'src/api/public/users/domain/entities/users.entity';

@Entity('campus')
export class Campus {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Campus } from 'src/api/public/campuses/entities/campus.entity';
import { Campus } from 'src/api/public/campuses/domain/entities/campus.entity';
import { In, Repository } from 'typeorm';

@Injectable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ListCard } from 'src/api/common/interfaces/response/fields/component';
import { ListItem } from 'src/api/common/interfaces/response/fields/etc';
import { SkillTemplate } from 'src/api/common/interfaces/response/fields/template';
import { createListCard } from 'src/api/common/utils/component';
import { CampusListResult } from 'src/api/public/campuses/dtos/results/campus-list-result.dto';
import { CampusListResult } from 'src/api/public/campuses/application/dtos/results/campus-list-result.dto';

@Injectable()
export class CampusMessageFactory {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Controller, Get, UseGuards } from '@nestjs/common';
import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
import { NativeResponseDto } from 'src/api/common/dtos/native-response.dto';
import { JwtAuthGuard } from 'src/api/public/users/guards/jwt-auth.guard';
import { JwtAuthGuard } from 'src/api/public/users/presentation/guards/jwt-auth.guard';
import { CampusResponseDto } from './dtos/campus-response.dto';
import { CampusesService } from './campuses.service';
import { CampusesService } from 'src/api/public/campuses/application/campuses.service';

@ApiTags('campuses')
@Controller('campuses')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Cache, CACHE_MANAGER } from '@nestjs/cache-manager';
import { Inject, Injectable, Logger } from '@nestjs/common';
import { CollegeListResult } from 'src/api/public/colleges/dtos/results/college-list-result.dto';
import { CollegesRepository } from 'src/api/public/colleges/colleges.repository';
import { CollegeListResult } from 'src/api/public/colleges/application/dtos/results/college-list-result.dto';
import { CollegesRepository } from 'src/api/public/colleges/infrastructure/colleges.repository';
import { CacheKey } from 'src/api/common/decorators/cache-key.decorator';

@Injectable()
Expand Down
6 changes: 3 additions & 3 deletions services/api/app/src/api/public/colleges/colleges.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { College } from 'src/api/public/colleges/entities/college.entity';
import { CollegesRepository } from 'src/api/public/colleges/colleges.repository';
import { CollegesService } from './colleges.service';
import { College } from 'src/api/public/colleges/domain/entities/college.entity';
import { CollegesRepository } from 'src/api/public/colleges/infrastructure/colleges.repository';
import { CollegesService } from 'src/api/public/colleges/application/colleges.service';

@Module({
imports: [TypeOrmModule.forFeature([College])],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Column, Entity, Index, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
import { Department } from 'src/api/public/departments/entities/department.entity';
import { Department } from 'src/api/public/departments/domain/entities/department.entity';

@Entity('college')
export class College {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { ListCardConfig } from 'src/api/common/utils/constants';
import { Repository } from 'typeorm';
import { College } from './entities/college.entity';
import { College } from 'src/api/public/colleges/domain/entities/college.entity';

@Injectable()
export class CollegesRepository {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ListItem } from 'src/api/common/interfaces/response/fields/etc';
import { SkillTemplate } from 'src/api/common/interfaces/response/fields/template';
import { createListCard } from 'src/api/common/utils/component';
import { BlockId, ListCardConfig } from 'src/api/common/utils/constants';
import { CollegeListResult } from 'src/api/public/colleges/dtos/results/college-list-result.dto';
import { CollegeListResult } from 'src/api/public/colleges/application/dtos/results/college-list-result.dto';

@Injectable()
export class CollegeMessageFactory {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Cache, CACHE_MANAGER } from '@nestjs/cache-manager';
import { Inject, Injectable, Logger } from '@nestjs/common';
import { DepartmentListResult } from 'src/api/public/departments/dtos/results/department-list-result.dto';
import { DepartmentsRepository } from 'src/api/public/departments/departments.repository';
import { DepartmentListResult } from 'src/api/public/departments/application/dtos/results/department-list-result.dto';
import { DepartmentsRepository } from 'src/api/public/departments/infrastructure/departments.repository';
import { CacheKey } from 'src/api/common/decorators/cache-key.decorator';

@Injectable()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { Department } from 'src/api/public/departments/entities/department.entity';
import { DepartmentsRepository } from 'src/api/public/departments/departments.repository';
import { DepartmentsService } from './departments.service';
import { Department } from 'src/api/public/departments/domain/entities/department.entity';
import { DepartmentsRepository } from 'src/api/public/departments/infrastructure/departments.repository';
import { DepartmentsService } from 'src/api/public/departments/application/departments.service';

@Module({
imports: [TypeOrmModule.forFeature([Department])],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Column, Entity, JoinColumn, ManyToOne, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
import { College } from 'src/api/public/colleges/entities/college.entity';
import { User } from 'src/api/public/users/entities/users.entity';
import { College } from 'src/api/public/colleges/domain/entities/college.entity';
import { User } from 'src/api/public/users/domain/entities/users.entity';

@Entity('department')
export class Department {
Expand Down
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 { ListCardConfig } from 'src/api/common/utils/constants';
import { Department } from 'src/api/public/departments/entities/department.entity';
import { Department } from 'src/api/public/departments/domain/entities/department.entity';
import { Repository } from 'typeorm';

@Injectable()
Expand Down
Loading
Loading