diff --git a/models/Invite.js b/models/Invite.js index a49c264ba83c345a06cd6e0000f425d354a411e2..4eaa66ae9df42413aab2027b589191f8c25ab16b 100644 --- a/models/Invite.js +++ b/models/Invite.js @@ -1,8 +1,6 @@ -// models/Invite.js +// models/invite.js const { DataTypes } = require('sequelize'); const sequelize = require('../config/sequelize'); -const User = require('./User'); -const Meeting = require('./Meeting'); const Invite = sequelize.define('Invite', { status: { @@ -25,13 +23,6 @@ const Invite = sequelize.define('Invite', { ] }); -// 愿�怨� �ㅼ젙 -// Invite.belongsTo(Meeting, { foreignKey: 'meeting_id', as: 'meeting' }); -// Invite.belongsTo(User, { foreignKey: 'inviter_id', as: 'inviter' }); // 珥덈��� �ъ슜�� -// Invite.belongsTo(User, { foreignKey: 'invitee_id', as: 'invitee' }); // 珥덈�諛쏆� �ъ슜�� -// User.hasMany(Invite, { foreignKey: 'inviter_id', as: 'sentInvites' }); // 蹂대궦 珥덈� 紐⑸줉 -// User.hasMany(Invite, { foreignKey: 'invitee_id', as: 'receivedInvites' }); // 諛쏆� 珥덈� 紐⑸줉 -// Meeting.hasMany(Invite, { foreignKey: 'meeting_id', as: 'invites' }); // �대떦 誘명똿�� 紐⑤뱺 珥덈� module.exports = Invite; \ No newline at end of file diff --git a/models/index.js b/models/index.js index a5096e08312b924c758f95b6b15ba077021696c6..2998026a2b9ad6d4f59a58d48c0eca3b23229c43 100644 --- a/models/index.js +++ b/models/index.js @@ -2,12 +2,12 @@ const sequelize = require('../config/sequelize'); const User = require('./user'); -const Schedule = require('./Schedule'); -const Meeting = require('./Meeting'); -const Friend = require('./Friend'); +const Schedule = require('./schedule'); +const Meeting = require('./meeting'); +const Friend = require('./friend'); const FcmToken = require('./fcmToken'); -const Invite =require('./Invite') -const MeetingParticipant = require('./MeetingParticipant'); +const Invite =require('./invite') +const MeetingParticipant = require('./meetingParticipant'); // const ChatRooms = require('./ChatRooms'); // 愿�怨� �ㅼ젙 @@ -29,9 +29,6 @@ User.hasMany(MeetingParticipant, { foreignKey: 'user_id', as: 'meetingParticipat Schedule.belongsTo(User, { foreignKey: 'user_id', as: 'user' }); User.hasMany(Schedule, { foreignKey: 'user_id', as: 'schedules' }); -FcmToken.belongsTo(User, { foreignKey: 'userId', as: 'user' }); -User.hasMany(FcmToken, { foreignKey: 'userId', as: 'fcmTokenList' }); - Invite.belongsTo(Meeting, { foreignKey: 'meeting_id', as: 'meeting' }); Invite.belongsTo(User, { foreignKey: 'inviter_id', as: 'inviter' }); // 珥덈��� �ъ슜�� Invite.belongsTo(User, { foreignKey: 'invitee_id', as: 'invitee' }); // 珥덈�諛쏆� �ъ슜�� diff --git a/models/meeting.js b/models/meeting.js index 9946d1e2c6e9c0fef889c0e848e6be5a1fe4b55d..8eecaabc74644fdc133dd0e35a1e9d8084fd0314 100644 --- a/models/meeting.js +++ b/models/meeting.js @@ -1,7 +1,7 @@ // models/Meeting.js const { DataTypes } = require('sequelize'); const sequelize = require('../config/sequelize'); -const User = require('./User'); +const User = require('./user'); const Meeting = sequelize.define('Meeting', { title: { diff --git a/services/meetingService.test.js b/services/meetingService.test.js index 0ba48c6252b827a13df842d75f5b5a6de40c8a0d..f0711a930379bbc4e2e5a4e7f3f561553a08d5e2 100644 --- a/services/meetingService.test.js +++ b/services/meetingService.test.js @@ -4,7 +4,7 @@ const { Op } = require('sequelize'); const { Meeting, MeetingParticipant, User, Schedule } = require('../models'); const MeetingService = require('../services/meetingService'); const ScheduleService = require('../services/scheduleService'); -const ChatRooms = require('../models/ChatRooms'); +const ChatRooms = require('../models/chatRooms'); const CreateMeetingRequestDTO = require('../dtos/CreateMeetingRequestDTO'); const MeetingResponseDTO = require('../dtos/MeetingResponseDTO'); const MeetingDetailResponseDTO = require('../dtos/MeetingDetailResponseDTO'); diff --git a/services/memberService.js b/services/memberService.js index fceb6b0f7e52c1b640f5b7a20c5afb4f0269e35a..0435672d90a949dd46dcb7bad1de73d7fe764f69 100644 --- a/services/memberService.js +++ b/services/memberService.js @@ -1,6 +1,6 @@ -const User = require('../models/User'); +const User = require('../models/user'); const FcmToken = require('../models/fcmToken'); -const ChatRooms = require('../schemas/ChatRooms'); +const ChatRooms = require('../schemas/chatRooms'); class MemberService { async registerToken(email, fcmToken) { diff --git a/services/scheduleService.js b/services/scheduleService.js index f827c219f8ed4bea2447a48ecab7d9ea00233b1d..e664a4909abfbca48cbb533bcbcf67f77152382d 100644 --- a/services/scheduleService.js +++ b/services/scheduleService.js @@ -1,7 +1,7 @@ // services/scheduleService.js const sequelize = require('../config/sequelize'); const { Op } = require('sequelize'); -const Schedule = require('../models/Schedule'); +const Schedule = require('../models/schedule'); const ScheduleResponseDTO = require('../dtos/ScheduleResponseDTO'); class ScheduleService {