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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"@slack/client": "^5.0.2",
"@supabase/supabase-js": "^2.45.1",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"cross-env": "^7.0.3",
"dotenv": "^16.4.5",
"joi": "^17.13.3",
Expand Down
111 changes: 71 additions & 40 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

42 changes: 0 additions & 42 deletions src/common/dto/request.dto.ts

This file was deleted.

29 changes: 0 additions & 29 deletions src/common/dto/response.dto.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/instrument.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Sentry.init({
enableTracing: process.env.NODE_ENV !== 'development',

// Enable debug mode to log event submission
debug: process.env.NODE_ENV === 'development',
// debug: process.env.NODE_ENV === 'development',

// Advanced, optional: Called for message and error events
beforeSend(event) {
Expand Down
50 changes: 39 additions & 11 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,63 @@ import * as process from 'process';
import { NestFactory, HttpAdapterHost } from '@nestjs/core';
import { AppModule } from './modules/app/app.module';
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
import { KakaoInterceptor } from './interceptors/kakao.interceptor';
import { ResponseDTO } from './common/dto/response.dto';
import { SentryInterceptor } from './interceptors/sentry.interceptor.js';
import { SentryFilter } from './common/filter/sentry.filter';
import { KakaoInterceptor } from './modules/interceptors/kakao.interceptor';
import { ResponseDTO } from './modules/common/dtos/response.dto';
import { SentryInterceptor } from './modules/interceptors/sentry.interceptor.js';
import { SentryFilter } from './modules/common/filters/sentry.filter';
import { initializeTransactionalContext } from 'typeorm-transactional';
import { ValidationPipe } from '@nestjs/common';
import { HttpExceptionFilter } from './modules/common/filters/http-exception.filter';

async function bootstrap() {
initializeTransactionalContext();
const app = await NestFactory.create(AppModule);
const nodeEnv = process.env.NODE_ENV;

app.useGlobalInterceptors(new SentryInterceptor());

if (nodeEnv == 'production') {
app.useGlobalInterceptors(new SentryInterceptor());
const { httpAdapter } = app.get(HttpAdapterHost);
app.useGlobalFilters(new SentryFilter(httpAdapter));
} else {
app.useGlobalFilters(new HttpExceptionFilter());
}
app.useGlobalInterceptors(new KakaoInterceptor(ResponseDTO));

const { httpAdapter } = app.get(HttpAdapterHost);
app.useGlobalFilters(new SentryFilter(httpAdapter));
app.useGlobalPipes(new ValidationPipe({
whitelist: false,
forbidNonWhitelisted: false,
transform: true,
//transformOptions: { enableImplicitConversion: true }
}))


app.setGlobalPrefix('api/node');
const config = new DocumentBuilder()
.setTitle('커넥트지누 노드 서버 API')
.setDescription('커넥트지누 노드 서버 API 문서입니다.')
.setVersion('1.0')
.addApiKey(
{
type: 'apiKey',
name: 'X-USER-ID',
in: 'header',
description: 'userId를 입력하세요 (예: 123456)',
},
'X-USER-ID',
)
.addSecurityRequirements('X-USER-ID')
.build();

const document = SwaggerModule.createDocument(app, config);

SwaggerModule.setup('api/node/docs', app, document);
await app.listen(nodeEnv == 'production' ? 5200 : 5000);
SwaggerModule.setup('api/node/docs', app, document,
{
swaggerOptions: {
persistAuthorization: true, // 새로고침해도 인증 정보 유지
defaultModelsExpandDepth: -1
}
}
);
await app.listen(nodeEnv == 'production' ? 5200 : 5001);
}

bootstrap();
2 changes: 1 addition & 1 deletion src/modules/app/app.controller.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Controller } from '@nestjs/common';
import { AppService } from './app.service';
import { ResponseDTO } from '../../common/dto/response.dto';
import { ResponseDTO } from '../common/dtos/response.dto';

@Controller()
export class AppController {
Expand Down
16 changes: 8 additions & 8 deletions src/modules/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import { SentryGlobalFilter, SentryModule } from '@sentry/nestjs/setup';
import { Module } from '@nestjs/common';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { UtilsModule } from 'src/common/utils/utils.module';
import { UtilsModule } from 'src/modules/common/utils/utils.module';
import { ConfigModule } from '@nestjs/config';
import { UserModule } from '../user/user.module';
import { UsersModule } from '../users/users.module';
import { SupabaseModule } from '../supabase/supabase.module';
import { validationSchema } from 'src/common/utils/enviornment';
import { validationSchema } from 'src/modules/common/utils/enviornment';
import { APP_FILTER } from '@nestjs/core';
import { CafeteriaModule } from '../cafeteria/cafeteria.module';
import { CommonModule } from '../common/common.module';
import { ClickerModule } from '../clicker/clicker.module';
import { ReadingRoomsModule } from '../reading-rooms/reading-rooms.module';
import { ScheduleModule } from '@nestjs/schedule';
import { HttpModule } from '@nestjs/axios';
import { AuthModule } from 'src/modules/auth/auth.module';

@Module({
imports: [
Expand All @@ -22,9 +22,9 @@ import { HttpModule } from '@nestjs/axios';
SupabaseModule,
UtilsModule,
CommonModule,
UserModule,
CafeteriaModule,
ClickerModule,
UsersModule,
ReadingRoomsModule,
AuthModule,
ConfigModule.forRoot({
isGlobal: true,
envFilePath: process.env.NODE_ENV === 'production' ? '.env.prod' : '.env.dev',
Expand Down
15 changes: 15 additions & 0 deletions src/modules/auth/auth.guard.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Injectable, CanActivate, ExecutionContext } from '@nestjs/common';
import { Observable } from 'rxjs';

@Injectable()
export class AuthGuard implements CanActivate {
canActivate(context: ExecutionContext): boolean | Promise<boolean> | Observable<boolean> {
const request = context.switchToHttp().getRequest();
const userId = request.headers['x-user-id'] || request.body.userRequest.user?.id;
if (userId) {
request['userId'] = userId;
}

return !!userId;
}
}
15 changes: 15 additions & 0 deletions src/modules/auth/auth.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Module } from '@nestjs/common';
import { AuthGuard } from './auth.guard';
import { APP_GUARD } from '@nestjs/core';

@Module({
providers: [
AuthGuard,
{
provide: APP_GUARD,
useClass: AuthGuard
}
],
exports: [AuthGuard]
})
export class AuthModule {}
20 changes: 0 additions & 20 deletions src/modules/cafeteria/cafeteria.controller.spec.ts

This file was deleted.

9 changes: 0 additions & 9 deletions src/modules/cafeteria/cafeteria.controller.ts

This file was deleted.

11 changes: 0 additions & 11 deletions src/modules/cafeteria/cafeteria.module.ts

This file was deleted.

18 changes: 0 additions & 18 deletions src/modules/cafeteria/cafeteria.service.spec.ts

This file was deleted.

6 changes: 0 additions & 6 deletions src/modules/cafeteria/cafeteria.service.ts

This file was deleted.

45 changes: 0 additions & 45 deletions src/modules/clicker/clicker.controller.ts

This file was deleted.

19 changes: 0 additions & 19 deletions src/modules/clicker/clicker.module.ts

This file was deleted.

21 changes: 0 additions & 21 deletions src/modules/clicker/repository/clicker.repository.ts

This file was deleted.

Loading
Loading