[BE#453] auth type null문제, GET요청에 body를 query로 (#454)

* fix: auth_type에러 * fix: timezone get 에러 * fix: datetime으로 변경 * fix: swagger도 datetime으로 변경
boostcampwm2023 · Dec 13, 2023 · a07e4c5 · a07e4c5
1 parent cb23e68
commit a07e4c5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/BE/src/auth/google.strategy.ts b/BE/src/auth/google.strategy.ts
@@ -22,6 +22,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
   ): Promise<any> {
     const user = {
       email: email.emails[0].value,
+      auth_type: 'google',
     };
     done(null, user);
   }

diff --git a/BE/src/mates/mates.controller.ts b/BE/src/mates/mates.controller.ts
@@ -33,23 +33,23 @@ export class MatesController {
   @ApiCreatedResponse({
     description: 'OK',
   })
-  @ApiBody({
-    schema: {
-      properties: {
-        date: {
-          type: 'datetime',
-          example: '2023-11-22T14:00:00+09:00',
-          description: '날짜',
-        },
-      },
-    },
+  @ApiQuery({
+    name: 'datetime',
+    example: '2023-11-22T14:00:00',
+    description: '날짜',
+  })
+  @ApiQuery({
+    name: 'timezone',
+    example: '+09:00',
+    description: '타임존',
   })
   @ApiOperation({ summary: '모든 친구들 조회하기 (완)' })
   getMates(
     @User('id') user_id: number,
-    @Body('date') date: string,
+    @Query('datetime') datetime: string,
+    @Query('timezone') timezone: string,
   ): Promise<object> {
-    return this.matesService.getMates(user_id, date);
+    return this.matesService.getMates(user_id, datetime, timezone);
   }
 
   @Get('/status')

diff --git a/BE/src/mates/mates.service.ts b/BE/src/mates/mates.service.ts
@@ -53,10 +53,17 @@ export class MatesService {
     };
   }
 
-  async getMates(user_id: number, date: string): Promise<object[]> {
-    const offset = date.split(/\d\d:\d\d:\d\d/)[1];
+  async getMates(
+    user_id: number,
+    datetime: string,
+    timezone: string,
+  ): Promise<object[]> {
+    if (!user_id || !datetime || !timezone) {
+      throw new BadRequestException('인자의 형식이 잘못되었습니다.');
+    }
+    const offset = timezone[0] === ' ' ? `+${timezone.trim()}` : timezone;
 
-    const nowUserTime = moment(date)
+    const nowUserTime = moment(`${datetime}${timezone}`)
       .utcOffset(offset)
       .format('YYYY-MM-DD HH:mm:ss');