Feat/fix tutoring time

package.json

@@ -32,7 +32,10 @@
     "@nestjs/websockets": "^10.2.1",
     "agora-access-token": "^2.0.4",
     "aws-sdk": "^2.1410.0",
+    "axios": "^1.5.0",
     "cache-manager": "^5.2.3",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0",
     "cross-env": "^7.0.3",
     "discord-webhook-node": "^1.1.8",
     "dotenv": "^16.3.1",

src/chatting/chatting.repository.ts

@@ -51,7 +51,12 @@ export class ChattingRepository {
     }
   }*/
 
-  async sendMessage(roomId: string, senderId: string, format: string, message) {
+  async sendMessage(
+    roomId: string,
+    senderId: string,
+    format: string,
+    message?: any,
+  ) {
     const chatting = await this.chattingModel.get({ id: roomId });
     chatting.messages.push({
       sender: senderId,
@@ -73,10 +78,24 @@ export class ChattingRepository {
     });
   }
 
+  async getIdByQuestionAndTeacher(questionId: string, teacherId: string) {
+    const result = await this.chattingModel
+      .scan({ questionId, teacherId })
+      .exec();
+    if (result.length > 0) {
+      return result[0].id;
+    }
+    throw new Error('채팅방을 찾을 수 없습니다.');
+  }
+
   async getChatRoomsInfo(roomIds: ChattingKey[]) {
     return await this.chattingModel.batchGet(roomIds);
   }
 
+  /*
+   * 채팅 객체를 생성 합니다
+   * 이 함수는 user.participantingChattingRooms 에 추가 해주지 않음
+   */
   async makeChatRoom(teacherId: string, studentId: string, questionId: string) {
     const chattingRoomId = uuid();
     const chatting: Chatting = {

src/chatting/chatting.service.ts

@@ -58,10 +58,23 @@ export class ChattingService {
               roomInfo.questionId,
             );
             console.log(questionInfo);
-            const { status, isSelect } = questionInfo;
+            const { status, isSelect, selectedTeacherId } = questionInfo;
             const { schoolSubject, schoolLevel, description } =
               questionInfo.problem;
 
+            let chatState: 'pending' | 'reserved' | 'refused' = 'pending';
+
+            if (status == 'pending') {
+              chatState = 'pending';
+            } else if (status == 'reserved') {
+              if (userRole == 'student' || selectedTeacherId == userId) {
+                chatState = 'reserved';
+              } else {
+                // 선생님이 api 부른 경우에 거절 당한 경우.
+                chatState = 'refused';
+              }
+            }
+
             const item = {
               roomImage: undefined,
               id: roomInfo.id,
@@ -71,15 +84,14 @@ export class ChattingService {
                 return { body: JSON.parse(body), isMyMsg: isMyMsg, ...rest };
               }),
               opponentId: undefined,
-              questionState: status,
+              questionState: chatState,
               problemImages: questionInfo.problem.mainImage,
               isSelect: isSelect,
               isTeacherRoom: true,
               questionId: roomInfo.questionId,
               schoolSubject: schoolSubject,
               schoolLevel: schoolLevel,
               title: undefined,
-              status: status,
               description: description,
             };
 
@@ -107,13 +119,18 @@ export class ChattingService {
 
         roomInfosWithQuestion.forEach((roomInfo) => {
           if (roomInfo.isSelect) {
-            if (roomInfo.status === 'pending') {
+            //지정 질문
+            if (roomInfo.questionState === 'pending') {
               result.selectedProposed.push(roomInfo);
-            } else if (roomInfo.status === 'reserved') {
+            } else if (roomInfo.questionState === 'reserved') {
               result.selectedReserved.push(roomInfo);
             }
           } else {
-            if (roomInfo.status === 'pending') {
+            //일반 질문
+            if (
+              roomInfo.questionState === 'pending' ||
+              roomInfo.questionState === 'refused'
+            ) {
               if (userRole == 'student') {
                 //grouping by questionId
                 if (normalProposedGrouping[roomInfo.questionId]) {

src/main.ts

@@ -1,5 +1,6 @@
 import { AppModule } from './app.module';
 import { configSwagger } from './config.swagger';
+import { ValidationPipe } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
 import * as dotenv from 'dotenv';
 import { json, urlencoded } from 'express';
@@ -9,7 +10,7 @@ async function bootstrap() {
   app.enableCors();
   app.use(json({ limit: '50mb' }));
   app.use(urlencoded({ limit: '50mb', extended: false }));
-
+  app.useGlobalPipes(new ValidationPipe({ transform: true }));
   dotenv.config();
   configSwagger(app);
 

src/offer/offer.service.ts

@@ -102,7 +102,28 @@ export class OfferService {
         chatting.teacherId,
       );
 
-      return new Success('선생님 선택이 완료되었습니다.', tutoring);
+      const question = await this.questionRepository.getInfo(questionId);
+
+      const offerTeacherIds = question.offerTeachers;
+
+      for (const offerTeacherId of offerTeacherIds) {
+        if (offerTeacherId != chatting.teacherId) {
+          const teacherChatId =
+            await this.chattingRepository.getIdByQuestionAndTeacher(
+              questionId,
+              offerTeacherId,
+            );
+          //TODO: redis pub/sub으로 변경
+          await this.chattingRepository.sendMessage(
+            teacherChatId,
+            userId,
+            'text',
+            '죄송합니다.\n다른 선생님과 수업을 진행하기로 했습니다.',
+          );
+        }
+      }
+
+      return new Success('선생님 선택이 완료되었습니다.');
     } catch (error) {
       return new Fail(error.message);
     }

src/question/question.repository.ts

@@ -64,6 +64,7 @@ export class QuestionRepository {
   async createSelectedQuestion(
     questionId: string,
     userId: string,
+    selectedTeacherId: string,
     createQuestionDto: CreateSelectedQuestionDto,
     problemImages: string[],
   ): Promise<Question> {
@@ -83,7 +84,7 @@ export class QuestionRepository {
           schoolLevel: createQuestionDto.schoolLevel,
           schoolSubject: createQuestionDto.schoolSubject,
         },
-        selectedTeacherId: '',
+        selectedTeacherId: selectedTeacherId,
         status: 'pending',
         studentId: userId,
         offerTeachers: [],
@@ -123,6 +124,20 @@ export class QuestionRepository {
     return await this.questionModel.get({ id: questionId });
   }
 
+  async changeStatus(questionId: string, status: string) {
+    return await this.questionModel.update(
+      { id: questionId },
+      { status: status },
+    );
+  }
+
+  async setSeletedTeacherId(questionId: string, teacherId: string) {
+    return await this.questionModel.update(
+      { id: questionId },
+      { selectedTeacherId: teacherId },
+    );
+  }
+
   async delete(userId: string, questionId: string) {
     const user: User = await this.userRepository.get(userId);
     if (user.role === 'teacher') {

src/question/question.service.ts

@@ -62,6 +62,7 @@ export class QuestionService {
         await this.questionRepository.createSelectedQuestion(
           questionId,
           userId,
+          teacherId,
           createQuestionDto,
           problemImages,
         );

src/tutoring/descriptions/tutoring.operation.ts

@@ -7,4 +7,8 @@ export const TutoringOperation = {
     summary: '과외 정보 조희',
     description: '특정 과외의 정보를 조회합니다',
   },
+  appoint: {
+    summary: '과외 시간 확정',
+    description: '특정 과외의 시작 종료 시간을 확정합니다',
+  },
 };

src/tutoring/dto/create-tutoring.dto.ts

@@ -1,4 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { IsDate } from 'class-validator';
 
 export class CreateTutoringDto {
   @ApiProperty({
@@ -19,3 +21,21 @@ export class CreateTutoringDto {
   })
   teacherId: string;
 }
+
+export class AppointTutoringDto {
+  @Type(() => Date)
+  @IsDate()
+  @ApiProperty({
+    description: '수업 시작 날짜,시간',
+    example: '2023-11-30T18:00:00+09:00',
+  })
+  startTime: Date;
+
+  @Type(() => Date)
+  @IsDate()
+  @ApiProperty({
+    description: '수업 종료 날짜,시간',
+    example: '2023-11-30T19:00:00+09:00',
+  })
+  endTime: Date;
+}

src/tutoring/entities/tutoring.interface.ts

@@ -3,7 +3,7 @@ export interface TutoringKey {
 }
 
 export interface Tutoring extends TutoringKey {
-  requestId?: string;
+  questionId: string;
   studentId: string;
   teacherId: string;
   status: string;
@@ -16,4 +16,6 @@ export interface Tutoring extends TutoringKey {
   teacherRTCToken?: string;
   studentRTCToken?: string;
   RTCAppId?: string;
+  reservedStart?: Date;
+  reservedEnd?: Date;
 }

src/tutoring/entities/tutoring.schema.ts

@@ -5,7 +5,7 @@ export const TutoringSchema = new Schema({
     type: String,
     hashKey: true,
   },
-  requestId: {
+  questionId: {
     type: String,
   },
   studentId: {
@@ -44,4 +44,10 @@ export const TutoringSchema = new Schema({
   RTCAppId: {
     type: String,
   },
+  reservedStart: {
+    type: Date,
+  },
+  reservedEnd: {
+    type: Date,
+  },
 });