test: 미팅서비스 테스트완료(#13)

models/meetingParticipant.js

-// models/MeetingParticipant.js
-
 const { DataTypes } = require('sequelize');
-const sequelize  = require('../config/sequelize');
-const Meeting =require('./Meeting');
-const User = require('./user');
-
-
-const MeetingParticipant = sequelize.define('MeetingParticipant', {
-  tableName: 'MeetingParticipants',
-  timestamps: false,
-});
+const sequelize = require('../config/sequelize');
 
+const MeetingParticipant = sequelize.define(
+  'MeetingParticipant',
+  {
+    id: {
+      type: DataTypes.INTEGER,
+      autoIncrement: true,
+      primaryKey: true,
+    },
+    meeting_id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+    user_id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+  },
+  {
+    tableName: 'MeetingParticipants', // 테이블 이름 설정
+    timestamps: false, // createdAt, updatedAt 필드 비활성화
+  }
+);
 
 module.exports = MeetingParticipant;

services/meetingService.js

@@ -182,6 +182,7 @@ class MeetingService {
      */
     async joinMeeting(meetingId, userId) {
         const meeting = await Meeting.findByPk(meetingId);
+        console.log(`참여하려는 모임: ${JSON.stringify(meeting)}`);
         if (!meeting) {
             throw new Error('모임을 찾을 수 없습니다.');
         }
@@ -214,6 +215,7 @@ class MeetingService {
                 meeting.time_idx_end,
                 transaction
             );
+            console.log(`스케줄 충돌 결과: ${hasConflict}`);
             if (hasConflict) {
                 throw new Error('스케줄이 겹칩니다. 다른 모임에 참가하세요.');
             }

services/schedule.test.js

@@ -32,7 +32,6 @@ beforeEach(async () => {
 });
 
 afterAll(async () => {
-    // 모든 테스트가 끝난 후 데이터베이스 연결을 종료합니다.
     await sequelize.close();
 });
 
@@ -272,7 +271,7 @@ describe('ScheduleService', () => {
         });
 
         test('should retrieve one schedule when user has only one', async () => {
-            const schedules = await ScheduleService.getAllSchedules(3); // Charlie has id=3 and only one fixed schedule
+            const schedules = await ScheduleService.getAllSchedules(3); 
 
             expect(schedules).toBeDefined();
             expect(Array.isArray(schedules)).toBe(true);
@@ -309,7 +308,7 @@ describe('ScheduleService', () => {
 
     describe('cleanExpiredSchedules', () => {
         test('should delete all flexible schedules', async () => {
-            // 먼저, 여러 유동 스케줄을 생성
+            // 여러 유동 스케줄을 생성
             await ScheduleService.createSchedules({
                 userId: 1,
                 title: 'Alice Flexible Schedule 2',
@@ -342,7 +341,7 @@ describe('ScheduleService', () => {
         });
 
         test('should not delete fixed schedules', async () => {
-            // 먼저, 여러 고정 스케줄을 생성
+            // 여러 고정 스케줄을 생성
             await ScheduleService.createSchedules({
                 userId: 3,
                 title: 'Charlie Fixed Schedule 2',
@@ -361,7 +360,7 @@ describe('ScheduleService', () => {
                 where: { user_id: 3, is_fixed: true },
             });
 
-            expect(remainingFixedSchedules.length).toBe(3); // 기존 1개 + 2개 추가
+            expect(remainingFixedSchedules.length).toBe(3); 
         });
     });
 });

services/scheduleService.js

@@ -133,6 +133,9 @@ class ScheduleService {
     }
 
     async checkScheduleOverlapByTime(userId, time_idx_start, time_idx_end, transaction = null) {
+        console.log(
+            `checkScheduleOverlapByTime 호출: userId=${userId}, time_idx_start=${time_idx_start}, time_idx_end=${time_idx_end}`
+        );
         const overlappingSchedule = await Schedule.findOne({
             where: {
                 user_id: userId,
@@ -142,8 +145,10 @@ class ScheduleService {
             },
             transaction,
         });
-    
-        return !!overlappingSchedule;
+         console.log(`중복 스케줄: ${JSON.stringify(overlappingSchedule)}`);
+    const result = !!overlappingSchedule;
+    console.log(`스케줄 충돌 결과: ${result}`);
+    return result;
     }