Merge pull request #212 from innovationacademy-kr/develop

develop to main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "24hane",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "24Hane Backend Server",
   "author": "joohongpark, niamu01, enaenen",
   "private": true,

src/auth/auth.service.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
-import { IAuthRepository } from './repository/auth.repository.interface';
 import { UserSessionDto } from 'src/auth/dto/user.session.dto';
+import { IAuthRepository } from './repository/auth.repository.interface';
 
 @Injectable()
 export class AuthService {

src/auth/guard/jwt-sign.guard.ts

@@ -1,12 +1,12 @@
-import { Request, Response } from 'express';
 import {
   CanActivate,
   ExecutionContext,
   Injectable,
   Logger,
 } from '@nestjs/common';
-import { Observable } from 'rxjs';
 import { JwtService } from '@nestjs/jwt';
+import { Request, Response } from 'express';
+import { Observable } from 'rxjs';
 import { UserSessionDto } from 'src/auth/dto/user.session.dto';
 
 /**

src/auth/srategy/auth.admin.strategy.ts

@@ -1,7 +1,7 @@
-import { ExtractJwt, Strategy } from 'passport-jwt';
-import { PassportStrategy } from '@nestjs/passport';
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import { PassportStrategy } from '@nestjs/passport';
+import { ExtractJwt, Strategy } from 'passport-jwt';
 import { UserSessionDto } from '../dto/user.session.dto';
 
 /**

src/auth/srategy/auth.external.strategy.ts

@@ -1,7 +1,7 @@
-import { ExtractJwt, Strategy } from 'passport-jwt';
-import { PassportStrategy } from '@nestjs/passport';
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import { PassportStrategy } from '@nestjs/passport';
+import { ExtractJwt, Strategy } from 'passport-jwt';
 
 /**
  * 외부 API용 passport-jwt Strategy

src/auth/srategy/auth.strategy.ts

@@ -1,7 +1,7 @@
-import { ExtractJwt, Strategy } from 'passport-jwt';
-import { PassportStrategy } from '@nestjs/passport';
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import { PassportStrategy } from '@nestjs/passport';
+import { ExtractJwt, Strategy } from 'passport-jwt';
 import { UserSessionDto } from '../dto/user.session.dto';
 
 /**

src/entities/alive.entity.ts

@@ -1,5 +1,5 @@
 import Cluster from 'src/enums/cluster.enum';
-import { Entity, Column, Index, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 
 // deprecated
 @Entity()

src/entities/card-issuance.entity.ts

@@ -1,6 +1,6 @@
 import {
-  Entity,
   Column,
+  Entity,
   JoinColumn,
   ManyToOne,
   PrimaryGeneratedColumn,

src/entities/device-info.entity.ts

@@ -1,6 +1,6 @@
 import Cluster from 'src/enums/cluster.enum';
 import InOut from 'src/enums/inout.enum';
-import { Entity, Column, PrimaryColumn } from 'typeorm';
+import { Column, Entity, PrimaryColumn } from 'typeorm';
 
 @Entity('DEVICE_INFO')
 export class DeviceInfo {

src/entities/inout.entity.ts

@@ -1,6 +1,6 @@
 import Cluster from 'src/enums/cluster.enum';
 import InOut from 'src/enums/inout.enum';
-import { Entity, Column, Index, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 
 // deprecated
 @Entity()

src/entities/tag-log.entity.ts

@@ -1,4 +1,4 @@
-import { Entity, Column, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity('TAG_LOG')
 export class TagLog {

src/entities/user-info.entity.ts

@@ -1,4 +1,4 @@
-import { Entity, Column, OneToMany, PrimaryColumn } from 'typeorm';
+import { Column, Entity, OneToMany, PrimaryColumn } from 'typeorm';
 import { CardIssuance } from './card-issuance.entity';
 
 @Entity('USER_INFO')

src/enums/cluster.enum.ts

@@ -3,6 +3,6 @@
  */
 enum Cluster {
   GAEPO = 'GAEPO',
-  SEOCHO = 'SEOCHO',
+  //SEOCHO = 'SEOCHO',
 }
 export default Cluster;

src/external/where42/dto/where42.response.dto.ts

@@ -22,10 +22,12 @@ export class Where42ResponseDto {
     example: Cluster.GAEPO,
   })
   cluster: Cluster;
+}
 
+export class Where42RequestDto {
   @ApiProperty({
-    description: '마지막으로 태깅한 시간',
-    type: Date,
+    description: '42 로그인 ID',
+    example: 'yeju',
   })
-  tag_at: Date;
+  login: string;
 }

src/external/where42/where42.controller.ts

@@ -1,13 +1,25 @@
-import { Controller, Get, Logger, Param, UseGuards } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Get,
+  Logger,
+  Param,
+  Post,
+  UseGuards,
+} from '@nestjs/common';
 import {
   ApiBearerAuth,
+  ApiBody,
   ApiOperation,
   ApiParam,
   ApiResponse,
   ApiTags,
 } from '@nestjs/swagger';
 import { ExtAuthGuard } from 'src/auth/guard/ext-auth.guard';
-import { Where42ResponseDto } from './dto/where42.response.dto';
+import {
+  Where42RequestDto,
+  Where42ResponseDto,
+} from './dto/where42.response.dto';
 import { Where42Service } from './where42.service';
 
 @ApiTags('Where42 전용 API')
@@ -50,4 +62,37 @@ export class Where42Controller {
     this.logger.debug(`@islogin) where42: ${login}`);
     return this.where42Service.where42(login);
   }
+
+  /**
+   * 여러 사용자가 클러스터에 체류중인지 확인합니다.
+   *
+   * @param logins 유저 로그인 ID (Where42RequestDto) 리스트
+   * @returns Where42ResponseDto[]
+   */
+  @ApiOperation({
+    summary: '여러 카뎃들의 클러스터 체류여부 확인',
+    description:
+      '여러명의 카뎃이 클러스터에 체류중인지 한번에 확인합니다. 마지막으로 체류했던 체류중인 클러스터의 장소 정보도 함께 가져옵니다.',
+  })
+  @ApiResponse({
+    status: 200,
+    type: Where42ResponseDto,
+    isArray: true,
+    description: '조회 성공',
+  })
+  @ApiResponse({ status: 401, description: '접근 권한 없음 (토큰 만료 등)' })
+  @ApiResponse({ status: 403, description: '태그 기록이 존재하지 않는 카뎃' })
+  @ApiResponse({ status: 500, description: '서버 내부 에러' })
+  @ApiBody({
+    type: [Where42RequestDto],
+    description: '유저 로그인 ID 객체의 배열',
+  })
+  @Post('where42/where42All')
+  async where42All(
+    @Body() logins: Where42RequestDto[],
+  ): Promise<Where42ResponseDto[]> {
+    this.logger.debug(`@where42All) where42All`);
+    const loginList = logins.map((loginDto) => loginDto.login);
+    return this.where42Service.where42All(loginList);
+  }
 }

src/external/where42/where42.module.ts

@@ -4,6 +4,7 @@ import { DeviceInfo } from 'src/entities/device-info.entity';
 import { TagLog } from 'src/entities/tag-log.entity';
 import { TagLogRepository } from 'src/tag-log/repository/mysql/tag-log.repository';
 import { UserModule } from 'src/user/user.module';
+import { DateCalculatorModule } from 'src/utils/data-calculator/data-calculator.module';
 import { DeviceInfoRepository } from './repository/mysql/device-info.repository';
 import { Where42Controller } from './where42.controller';
 import { Where42Service } from './where42.service';
@@ -22,7 +23,11 @@ const deviceInfoRepo = {
  * 24Hane 기능 외 다른 서비스에서 사용하는 외부 API 모듈
  */
 @Module({
-  imports: [UserModule, TypeOrmModule.forFeature([DeviceInfo, TagLog])],
+  imports: [
+    UserModule,
+    TypeOrmModule.forFeature([DeviceInfo, TagLog]),
+    DateCalculatorModule,
+  ],
   controllers: [Where42Controller],
   providers: [tagLogRepo, deviceInfoRepo, Where42Service],
 })