From 614f5396f0409e793e0d31f061bbe28e97f22fd7 Mon Sep 17 00:00:00 2001
From: tpgus2603 <kakaneymar2424@gmail.com>
Date: Tue, 19 Nov 2024 01:55:57 +0900
Subject: [PATCH] =?UTF-8?q?bugfix:=20=EC=B9=9C=EA=B5=AC=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80=20=EB=A1=9C=EC=A7=81,=EB=8D=B0=EC=9D=B4=ED=84=B0?=
=?UTF-8?q?=EB=AA=A8=EB=8D=B8=20=EB=B3=80=EA=B2=BD(#7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
controllers/friendController.js | 8 +-------
{middleware => middlewares}/auth.js | 0
package-lock.json | 13 +++++++++++++
package.json | 1 +
routes/friend.js | 2 +-
routes/index.js | 0
routes/schedule.js | 2 +-
7 files changed, 17 insertions(+), 9 deletions(-)
rename {middleware => middlewares}/auth.js (100%)
delete mode 100644 routes/index.js
diff --git a/controllers/friendController.js b/controllers/friendController.js
index a8411e3..6dc3740 100644
--- a/controllers/friendController.js
+++ b/controllers/friendController.js
@@ -1,10 +1,6 @@
const FriendService = require('../services/friendService');
class friendController {
-
-
-
- class FriendController {
/**
* 친구 요청 보내기
* 클라이언트는 userId와 요청을 보낼 사용자의 email을 전송
@@ -37,12 +33,11 @@ class friendController {
if (error.message === 'Friend request already exists') {
return res.status(409).json({ message: error.message });
}
+
// 일반 오류 처리
return res.status(500).json({ message: '서버 오류가 발생했습니다.', error: error.message });
}
}
- }
-
/**
* 받은 친구 요청 목록 조회
* GET /api/friend/requests/received
@@ -195,7 +190,6 @@ class friendController {
});
}
}
-
}
module.exports = new friendController();
\ No newline at end of file
diff --git a/middleware/auth.js b/middlewares/auth.js
similarity index 100%
rename from middleware/auth.js
rename to middlewares/auth.js
diff --git a/package-lock.json b/package-lock.json
index ea44223..cb3d8d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,7 @@
"morgan": "^1.10.0",
"multer": "^1.4.5-lts.1",
"mysql2": "^3.11.4",
+ "node-cron": "^3.0.3",
"passport": "^0.7.0",
"passport-google-oauth20": "^2.0.0",
"sequelize": "^6.37.5",
@@ -11802,6 +11803,18 @@
"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
"license": "ISC"
},
+ "node_modules/node-cron": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.3.tgz",
+ "integrity": "sha512-dOal67//nohNgYWb+nWmg5dkFdIwDm8EpeGYMekPMrngV3637lqnX0lbUcCtgibHTz6SEz7DAIjKvKDFYCnO1A==",
+ "license": "ISC",
+ "dependencies": {
+ "uuid": "8.3.2"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
"node_modules/node-gyp": {
"version": "10.2.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz",
diff --git a/package.json b/package.json
index 48d1fb6..2151bec 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"morgan": "^1.10.0",
"multer": "^1.4.5-lts.1",
"mysql2": "^3.11.4",
+ "node-cron": "^3.0.3",
"passport": "^0.7.0",
"passport-google-oauth20": "^2.0.0",
"sequelize": "^6.37.5",
diff --git a/routes/friend.js b/routes/friend.js
index 782540b..53145a9 100644
--- a/routes/friend.js
+++ b/routes/friend.js
@@ -9,7 +9,7 @@ router.use(isLoggedIn);
* 친구 요청 보내기
* POST /api/friend/request/:friendId
*/
-router.post('/request/:friendId', FriendController.sendRequest);
+router.post('/request/:friendId', FriendController.sendFriendRequest);
/**
* 받은 친구 요청 목록 조회
diff --git a/routes/index.js b/routes/index.js
deleted file mode 100644
index e69de29..0000000
diff --git a/routes/schedule.js b/routes/schedule.js
index 045bc48..35da45e 100644
--- a/routes/schedule.js
+++ b/routes/schedule.js
@@ -1,6 +1,6 @@
const express = require('express');
const router = express.Router();
-const { isLoggedIn } = require('../middleware/auth');
+const { isLoggedIn } = require('../middlewares/auth');
const ScheduleController = require('../controllers/scheduleController');
/**
--
GitLab