Merge branch 'BE/release' into BE/refactor/modify-journey-schema

.github/workflows/action.yml

@@ -0,0 +1,46 @@
+# name: musicspot github actions
+
+# on:
+#     pull_request:
+#         branches: ["BE/release"]
+#         types: ["closed"]
+# jobs:
+#     deploy:
+#         runs-on: ubuntu-latest
+
+#         steps:
+#             - name: Checkout repository
+#               uses: actions/checkout@v2
+
+#             - name: Set up Node.js
+#               uses: actions/setup-node@v2
+#               with:
+#                   node-version: "20"
+
+#             - name: Install dependencies
+#               run: |
+#                   cd BE
+#                   cd musicspot
+#                   npm install
+
+#             - name: Build Docker image
+#               run: docker build -t musicspot:latest ./BE/musicspot
+
+#             - name: Login to Docker Hub
+#               run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+
+#             - name: Push Docker image to Docker Hub
+#               run: docker push musicspot
+
+#             - name: SSH into Ubuntu server and pull the latest image
+#               uses: appleboy/ssh-action@master
+#               with:
+#                   host: ${{ secrets.SERVER_IP }}
+#                   username: ${{ secrets.SERVER_USERNAME }}
+#                   password: ${{ secrets.PASSWORD }}
+#                   script: |
+#                       docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+#                       docker pull musicspot
+#                       docker stop musicspot || true
+#                       docker rm musicspot || true
+#                       docker run -e SSH_HOST=${{ secrets.SSH_HOST }} -e SSH_PORT=${{ secrets.SSH_PORT }} -e SSH_USER=${{ secrets.SSH_USER }} -e SSH_PASSWORD=${{ secrets.SSH_PASSWORD }} -e DB_USERNAME=${{ secrets.DB_USERNAME }} -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} -e DB_NAME=${{ secrets.DB_NAME }} -e DB_HOST=${{ secrets.DB_HOST }} -e SECRET_KEY=${{ secrets.SECRET_KEY }} -v /images:/images -v /images/profile:/images/profile -v /images/story:/images/story -d -p 3000:3000 --name heatpick-container geomgichoi/heatpick

BE/musicspot/.env

@@ -0,0 +1 @@
+MONGODB_URI=mongodb://localhost:27017/musicspot

BE/musicspot/src/journey/dto/journeyEnd.dto.ts

@@ -0,0 +1,15 @@
+import {
+  ArrayMaxSize,
+  ArrayMinSize,
+  IsArray,
+  IsNumber,
+  IsString,
+} from 'class-validator';
+
+export class EndJourneyDTO {
+  @IsString()
+  readonly _id: string;
+
+  //   @IsString()
+  //   readonly timestamp: string;
+}

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

@@ -3,6 +3,7 @@ import { JourneyService } from './journey.service';
 import { StartJourneyDTO } from './dto/journeyStart.dto';
 import { ApiCreatedResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Journey } from './journey.schema';
+import { EndJourneyDTO } from './dto/journeyEnd.dto';
 @Controller('journey')
 @ApiTags('journey 관련 API')
 export class JourneyController {
@@ -17,8 +18,20 @@ export class JourneyController {
     description: '생성된 여정 데이터를 반환',
     type: Journey,
   })
-  @Post()
+  @Post('start')
   async create(@Body() startJourneyDTO: StartJourneyDTO) {
     return await this.journeyService.create(startJourneyDTO);
   }
+  @ApiOperation({
+    summary: '여정 종료를 눌렀을 시 실행되는 API',
+    description: 'request로 id값이 필요합니다',
+  })
+  @ApiCreatedResponse({
+    description: '현재는 좌표 데이터의 길이를 반환, 추후 참 거짓으로 변경 예정',
+    type: Journey,
+  })
+  @Post('end')
+  async end(@Body() endJourneyDTO: EndJourneyDTO) {
+    return await this.journeyService.end(endJourneyDTO);
+  }
 }

BE/musicspot/src/journey/journey.service.ts

@@ -4,6 +4,8 @@ import { Injectable } from '@nestjs/common';
 import { StartJourneyDTO } from './dto/journeyStart.dto';
 import { Journey } from './journey.schema';
 import { User } from '../user/user.schema';
+import { UserService } from '../user/user.service';
+import { EndJourneyDTO } from './dto/journeyEnd.dto';
 
 @Injectable()
 export class JourneyService {
@@ -34,4 +36,11 @@ export class JourneyService {
     );
     return createdJourneyData;
   }
+
+  async end(endJourneyDTO: EndJourneyDTO) {
+    const journeyId = endJourneyDTO._id;
+    const journey = await this.journeyModel.findById(journeyId).exec();
+    //check 참 조건인지 확인
+    return journey.coordinates.length;
+  }
 }