Be/task/logger

BE/musicspot/src/app.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { MiddlewareConsumer, Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { MongooseModule } from '@nestjs/mongoose';
@@ -7,6 +7,7 @@ import { SpotModule } from './spot/module/spot.module';
 import { UserModule } from './user/module/user.module';
 
 import { ReleaseController } from './releasePage/release.controller';
+import { LoggerMiddleware } from './common/middleware/logger.middleware';
 
 @Module({
   imports: [
@@ -20,4 +21,8 @@ import { ReleaseController } from './releasePage/release.controller';
   controllers: [AppController, ReleaseController],
   providers: [AppService],
 })
-export class AppModule {}
+export class AppModule {
+  configure(consumer: MiddlewareConsumer) {
+    consumer.apply(LoggerMiddleware).forRoutes('/*');
+  }
+}

BE/musicspot/src/common/logger/winston.util.ts

@@ -1,30 +1,29 @@
+import { utilities, WinstonModule } from 'nest-winston';
+import * as winstonDaily from 'winston-daily-rotate-file';
+import * as winston from 'winston';
 
-// import { utilities, WinstonModule } from 'nest-winston';
-// import * as winstonDaily from 'winston-daily-rotate-file';
-// import * as winston from 'winston';
-
-// const logDir = `${__dirname}/../../logs`;
-// const options = (level: string) => {
-//   return {
-//     level,
-//     datePattern: 'YYYY-MM-DD',
-//     dirname: logDir + `/${level}`,
-//     filename: `%DATE%.${level}.log`,
-//     maxFiles: 30,
-//     zippedArchive: true,
-//   };
-// };
-// export const winstonLogger = WinstonModule.createLogger({
-//   transports: [
-//     new winston.transports.Console({
-//       level: 'silly',
-//       format: winston.format.combine(
-//         winston.format.timestamp(),
-//         utilities.format.nestLike('music-spot', { prettyPrint: true }),
-//       ),
-//     }),
-//     new winstonDaily(options('info')),
-//     new winstonDaily(options('warn')),
-//     new winstonDaily(options('error')),
-//   ],
-// });
+const logDir = `${__dirname}/../../logs`;
+const options = (level: string) => {
+  return {
+    level,
+    datePattern: 'YYYY-MM-DD',
+    dirname: logDir + `/${level}`,
+    filename: `%DATE%.${level}.log`,
+    maxFiles: 30,
+    zippedArchive: true,
+  };
+};
+export const winstonLogger = WinstonModule.createLogger({
+  transports: [
+    new winston.transports.Console({
+      level: 'silly',
+      format: winston.format.combine(
+        winston.format.timestamp(),
+        utilities.format.nestLike('music-spot', { prettyPrint: true }),
+      ),
+    }),
+    new winstonDaily(options('info')),
+    new winstonDaily(options('warn')),
+    new winstonDaily(options('error')),
+  ],
+});

BE/musicspot/src/common/middleware/logger.middleware.ts

@@ -1,26 +1,41 @@
-// import { Injectable, NestMiddleware } from '@nestjs/common';
-// import { Response, Request, NextFunction } from 'express';
-// import { winstonLogger } from '../logger/winston.util';
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Response, Request, NextFunction } from 'express';
+import { winstonLogger } from '../logger/winston.util';
 
-// @Injectable()
-// export class LoggerMiddleware implements NestMiddleware {
-//   constructor() {}
+@Injectable()
+export class LoggerMiddleware implements NestMiddleware {
+  use(req: Request, res: Response, next: NextFunction) {
+    const { ip, method, originalUrl } = req;
+    res.on('finish', () => {
+      const { statusCode } = res;
 
-//   use(req: Request, res: Response, next: NextFunction) {
-//     const { ip, method, originalUrl } = req;
+      if (statusCode >= 400 && statusCode < 500) {
+        winstonLogger.warn(
+          `[${method}]${originalUrl}(${statusCode}) ${ip}  Reqbody:${JSON.stringify(
+            req.body,
+            null,
+            2,
+          )}`,
+        );
+      } else if (statusCode >= 500) {
+        winstonLogger.error(
+          `[${method}]${originalUrl}(${statusCode}) ${ip}  Reqbody:${JSON.stringify(
+            req.body,
+            null,
+            2,
+          )}`,
+        );
+      } else {
+        winstonLogger.warn(
+          `[${method}]${originalUrl}(${statusCode}) ${ip}  Reqbody:${JSON.stringify(
+            req.body,
+            null,
+            2,
+          )}`,
+        );
+      }
+    });
 
-//     res.on('finish', () => {
-//       const { statusCode } = res;
-//       console.log(statusCode);
-//       // if (statusCode >= 400 && statusCode < 500) {
-//       //   winstonLogger.warn(`[${method}]${originalUrl}(${statusCode}) ${ip}`);
-//       //   console.log('ASDS');
-//       // } else if (statusCode >= 500) {
-//       //   winstonLogger.error(`[${method}]${originalUrl}(${statusCode}) ${ip}`);
-//       // }
-//       winstonLogger.warn(`[${method}]${originalUrl}(${statusCode}) ${ip}`);
-//     });
-
-//     next();
-//   }
-// }
+    next();
+  }
+}

BE/musicspot/src/common/s3/objectStorage.ts

@@ -0,0 +1,41 @@
+import * as AWS from 'aws-sdk';
+import * as dotenv from 'dotenv';
+dotenv.config();
+
+interface INcloudStorageConfig {
+  endpoint: string;
+  region: string;
+  accessKey: string;
+  secretKey: string;
+  bucketName: string;
+}
+
+class NcloudStorageConfig implements INcloudStorageConfig {
+  endpoint: string;
+  region: string;
+  accessKey: string;
+  secretKey: string;
+  bucketName: string;
+  constructor() {
+    this.endpoint = process.env.NCLOUD_ENDPOINT;
+    this.region = process.env.NCLOUD_REGION;
+    this.accessKey = process.env.NCLOUD_ACCESS_KEY;
+    this.secretKey = process.env.NCLOUD_SECRET_KEY;
+    this.bucketName = process.env.BUCKET_NAME;
+  }
+
+  getConfig() {
+    return {
+      endpoint: this.endpoint,
+      region: this.region,
+      credentials: {
+        accessKeyId: this.accessKey,
+        secretAccessKey: this.secretKey,
+      },
+    };
+  }
+}
+
+export const S3 = new AWS.S3(new NcloudStorageConfig().getConfig());
+export const bucketName = process.env.BUCKET_NAME;
+export const endpoint = process.env.NCLOUD_ENDPOINT;

BE/musicspot/src/filters/exception.enum.ts

@@ -9,13 +9,13 @@ export enum JourneyExceptionMessageEnum {
 }
 
 export enum SpotExceptionCodeEnum {
-  SpotNotFound = '0003',
-  UnexpectedError = '9997',
+  SpotNotFound = '0020',
+  SpotRecordFail = '0021',
 }
 
 export enum SpotExceptionMessageEnum {
   SpotNotFound = 'SpotId에 해당하는 Spot이 없습니다.',
-  UnexpectedError = '예상치 못한 오류입니다.',
+  SpotRecordFail = 'Spot 이미지 저장 중 에러가 발생했습니다.',
 }
 
 export enum UserExceptionMessageEnum {

BE/musicspot/src/filters/spot.exception.ts

@@ -11,3 +11,13 @@ export class SpotNotFoundException extends BaseException {
     this.message = SpotExceptionMessageEnum.SpotNotFound;
   }
 }
+
+export class SpotRecordFail extends BaseException {
+  constructor() {
+    super(
+      SpotExceptionCodeEnum.SpotRecordFail,
+      HttpStatus.INTERNAL_SERVER_ERROR,
+    );
+    this.message = SpotExceptionMessageEnum.SpotRecordFail;
+  }
+}

BE/musicspot/src/journey/controller/journey.controller.ts

@@ -6,6 +6,8 @@ import {
   ValidationPipe,
   Get,
   Query,
+  Res,
+  Req,
 } from '@nestjs/common';
 import { JourneyService } from '../service/journey.service';
 

BE/musicspot/src/main.ts

@@ -4,13 +4,10 @@ import { AppModule } from './app.module';
 import { ValidationPipe } from '@nestjs/common';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { AllExceptionFilter } from './filters/exception.filter';
-
-// import { winstonLogger } from './common/logger/winston.util';
+import { winstonLogger } from './common/logger/winston.util';
 async function bootstrap() {
-  const app = await NestFactory.create<NestExpressApplication>(AppModule, {
-    // logger: winstonLogger,
+  const app = await NestFactory.create<NestExpressApplication>(AppModule);
 
-  });
   const config = new DocumentBuilder()
     .setTitle('Music Spot') // 문서의 제목
     .setDescription('iOS01 Music Spot App API') // 문서의 간단한 설명

BE/musicspot/src/spot/controller/spot.controller.ts

@@ -8,7 +8,7 @@ import {
   Query,
 } from '@nestjs/common';
 import { ApiCreatedResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { RecordSpotDTO } from '../dto/recordSpot.dto';
+import { RecordSpotReqDTO } from '../dto/recordSpot.dto';
 import { SpotService } from '../service/spot.service';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { Spot } from '../schema/spot.schema';
@@ -26,10 +26,10 @@ export class SpotController {
     type: Spot,
   })
   @UseInterceptors(FileInterceptor('image'))
-  @Post('create')
+  @Post('')
   async create(
     @UploadedFile() file: Express.Multer.File,
-    @Body() recordSpotDTO: RecordSpotDTO,
+    @Body() recordSpotDTO: RecordSpotReqDTO,
   ) {
     return await this.spotService.create(file, recordSpotDTO);
   }

BE/musicspot/src/spot/dto/recordSpot.dto.ts

@@ -1,8 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsDateString, IsString } from 'class-validator';
+import { IsDateString, IsString, IsUrl } from 'class-validator';
 import { IsCoordinate } from '../../common/decorator/coordinate.decorator';
 
-export class RecordSpotDTO {
+export class RecordSpotReqDTO {
   @ApiProperty({
     example: '655efda2fdc81cae36d20650',
     description: '여정 id',
@@ -36,3 +36,40 @@ export class RecordSpotDTO {
   // })
   // readonly photoData: Buffer;
 }
+
+export class RecordSpotResDTO {
+  @ApiProperty({
+    example: '655efda2fdc81cae36d20650',
+    description: '여정 id',
+    required: true,
+  })
+  @IsString()
+  readonly journeyId: string;
+
+  @ApiProperty({
+    example: [37.555946, 126.972384],
+    description: '위치 좌표',
+    required: true,
+  })
+  @IsCoordinate({
+    message: '배열의 각 요소는 양수여야 하고 두 개의 요소만 허용됩니다.',
+  })
+  readonly coordinate: number[];
+
+  @ApiProperty({
+    example: '2023-11-22T12:00:00Z',
+    description: 'timestamp',
+    required: true,
+  })
+  @IsDateString()
+  readonly timestamp: string;
+
+  @ApiProperty({
+    example:
+      'https://music-spot-storage.kr.object.ncloudstorage.com/path/name?AWSAccessKeyId=key&Expires=1701850233&Signature=signature',
+    description: 'presigned url',
+    required: true,
+  })
+  @IsUrl()
+  readonly photo: string;
+}

BE/musicspot/src/spot/schema/spot.schema.ts

@@ -34,7 +34,7 @@ export class Spot {
     required: true,
   })
   @Prop({ type: String })
-  photoUrl: string;
+  photoKey: string;
 }
 
 export const SpotSchema = SchemaFactory.createForClass(Spot);