diff --git a/controllers/friendController.js b/controllers/friendController.js index 6dc37400fcfea24164af27d46070059b70cd3784..8f385c7cf1a01cdfbf55ab5afea27df9a193ecbe 100644 --- a/controllers/friendController.js +++ b/controllers/friendController.js @@ -4,9 +4,6 @@ class friendController { /** * 친구 요청 보내기 * 클라이언트는 userId와 요청을 보낼 사용자의 email을 전송 - * @param {Object} req - Express 요청 객체 - * @param {Object} res - Express 응답 객체 - * @param {Function} next - Express next 미들웨어 함수 */ async sendFriendRequest(req, res, next) { const { userId, email } = req.body; @@ -140,13 +137,12 @@ class friendController { /** * 친구 목록 조회 - * GET /api/friend/all + * GET /api/friend/all/:offset */ async getFriendList(req, res) { try { const userId = req.user.id; - const friends = await FriendService.getFriendList(userId); - + const friends = await FriendService.getFriendList(userId,20,req.param); return res.status(200).json({ success: true, data: friends diff --git a/services/meetingService.js b/services/meetingService.js index 6eb1e4fbe6899871c0f41f69a3e41480aab8b1e1..021a68299d3b6e339bfe74fbe36d001631c00232 100644 --- a/services/meetingService.js +++ b/services/meetingService.js @@ -2,8 +2,7 @@ const { v4: uuidv4 } = require('uuid'); const { Op } = require('sequelize'); -const { Meeting, MeetingParticipant, User, Schedule } = require('../models'); // models/index.js를 통해 임포트 -const ChatRoom = require('../models/ChatRooms'); +const { Meeting, MeetingParticipant, User, Schedule, ChatRoom } = require('../models'); // models/index.js를 통해 임포트 const chatController = require('../controllers/chatController'); const MeetingResponseDTO = require('../dtos/MeetingResponseDTO'); const MeetingDetailResponseDTO = require('../dtos/MeetingDetailResponseDTO'); diff --git a/services/scheduleService.js b/services/scheduleService.js index 2226a98fca2c05d21f729694324df37944bae07f..e7c5a3b74579771218f686078c6eb18eddcc0257 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'); const ScheduleResponseDTO = require('../dtos/ScheduleResponseDTO'); class scheduleService {