From 7e7b965128e73299c9bbab90f075e62d45241ee2 Mon Sep 17 00:00:00 2001 From: tpgus2603 <kakaneymar2424@gmail.com> Date: Fri, 29 Nov 2024 19:07:14 +0900 Subject: [PATCH] =?UTF-8?q?rename:=20=EC=9B=90=ED=99=9C=ED=95=9C=20?= =?UTF-8?q?=EC=8B=A4=ED=96=89=EC=9C=84=ED=95=B4=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=86=8C=EB=AC=B8=EC=9E=90=EB=A1=9C=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/Invite.js | 11 +---------- models/index.js | 13 +++++-------- models/meeting.js | 2 +- services/meetingService.test.js | 2 +- services/memberService.js | 4 ++-- services/scheduleService.js | 2 +- 6 files changed, 11 insertions(+), 23 deletions(-) diff --git a/models/Invite.js b/models/Invite.js index a49c264..4eaa66a 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 a5096e0..2998026 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 9946d1e..8eecaab 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 0ba48c6..f0711a9 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 fceb6b0..0435672 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 f827c21..e664a49 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 { -- GitLab