From c4c903afc92a127f674116a7de1759314b5bd434 Mon Sep 17 00:00:00 2001
From: tpgus2603 <kakaneymar2424@gmail.com>
Date: Fri, 29 Nov 2024 19:31:17 +0900
Subject: [PATCH 1/2] =?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/Friend.js | 2 +-
models/Invite.js | 1 +
models/meeting.js | 2 +-
models/schedule.js | 2 +-
models/user.js | 2 +-
passport/googleStrategy.js | 2 +-
passport/index.js | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/models/Friend.js b/models/Friend.js
index ed09212..02cea3e 100644
--- a/models/Friend.js
+++ b/models/Friend.js
@@ -1,4 +1,4 @@
-// models/Friend.js
+//models/friend.js
const { DataTypes } = require('sequelize');
const sequelize = require('../config/sequelize');
diff --git a/models/Invite.js b/models/Invite.js
index 4eaa66a..d7d05bd 100644
--- a/models/Invite.js
+++ b/models/Invite.js
@@ -1,4 +1,5 @@
// models/invite.js
+
const { DataTypes } = require('sequelize');
const sequelize = require('../config/sequelize');
diff --git a/models/meeting.js b/models/meeting.js
index 8eecaab..6ba8738 100644
--- a/models/meeting.js
+++ b/models/meeting.js
@@ -1,4 +1,4 @@
-// models/Meeting.js
+// models/meeting.js
const { DataTypes } = require('sequelize');
const sequelize = require('../config/sequelize');
const User = require('./user');
diff --git a/models/schedule.js b/models/schedule.js
index 48dcec4..7a07df8 100644
--- a/models/schedule.js
+++ b/models/schedule.js
@@ -1,4 +1,4 @@
-// models/Schedule.js
+// models/schedule.js
const { DataTypes } = require('sequelize');
const sequelize = require('../config/sequelize');
const User = require('./user');
diff --git a/models/user.js b/models/user.js
index 7ed6043..b7aecfa 100644
--- a/models/user.js
+++ b/models/user.js
@@ -1,4 +1,4 @@
-// models/User.js
+// models/user.js
const { DataTypes } = require('sequelize');
const sequelize = require('../config/sequelize');
diff --git a/passport/googleStrategy.js b/passport/googleStrategy.js
index c5964ef..7acaf17 100644
--- a/passport/googleStrategy.js
+++ b/passport/googleStrategy.js
@@ -1,7 +1,7 @@
// passport/googleStrategy.js
const { Strategy: GoogleStrategy } = require('passport-google-oauth20');
-const User = require('../models/User');
+const User = require('../models/user');
module.exports = new GoogleStrategy(
{
diff --git a/passport/index.js b/passport/index.js
index 6f12584..5b6eb76 100644
--- a/passport/index.js
+++ b/passport/index.js
@@ -1,7 +1,7 @@
// passport/index.js
const passport = require('passport');
-const User = require('../models/User');
+const User = require('../models/user');
// 吏곷젹��
passport.serializeUser((user, done) => {
--
GitLab
From bf61b46fec0cced955ffa4a983299e34d7654856 Mon Sep 17 00:00:00 2001
From: tpgus2603 <kakaneymar2424@gmail.com>
Date: Sat, 30 Nov 2024 17:53:47 +0900
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20db=EC=97=B0=EA=B2=B0=EC=98=A4?=
=?UTF-8?q?=EB=A5=98=20=EB=B0=8F=20=EB=A1=9C=EA=B9=85=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.js | 9 +++++----
models/Friend.js | 2 +-
models/Invite.js | 2 +-
schemas/ChatRooms.js | 1 +
sync.js | 4 ----
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/app.js b/app.js
index d4f4514..952e375 100644
--- a/app.js
+++ b/app.js
@@ -9,9 +9,13 @@ const { initScheduleCleaner } = require('./utils/scheduler');
const connectMongoDB = require('./config/mongoose'); // MongoDB �곌껐
const { sequelize } = require('./config/sequelize'); // Sequelize �곌껐
const cors = require('cors');
+const morgan = require('morgan');
const syncRdb = require('./sync'); // Import the syncDatabase function
const app = express();
+
+
+app.use(morgan('dev')); //濡쒓퉭��
// CORS �ㅼ젙
app.use(
cors({
@@ -72,14 +76,11 @@ const PORT = process.env.PORT || 3000;
try {
// MongoDB �곌껐
await connectMongoDB();
- //console.log('�� MongoDB �곌껐 �깃났');
- console.log('MongoDB URI:', process.env.MONGO_URI);
// MySQL �곌껐 �뺤씤
await syncRdb();
-
// �쒕쾭 �쒖옉
app.listen(PORT, () => {
- console.log(`Server is running on http://localhost:${PORT}`);
+ console.log(`Server is running on ${PORT}`);
});
} catch (error) {
console.error('�� �쒕쾭 �쒖옉 以� �ㅻ쪟 諛쒖깮:', error);
diff --git a/models/Friend.js b/models/Friend.js
index 02cea3e..21ef4aa 100644
--- a/models/Friend.js
+++ b/models/Friend.js
@@ -1,4 +1,4 @@
-//models/friend.js
+// models/friend.js
const { DataTypes } = require('sequelize');
const sequelize = require('../config/sequelize');
diff --git a/models/Invite.js b/models/Invite.js
index d7d05bd..d4e6105 100644
--- a/models/Invite.js
+++ b/models/Invite.js
@@ -1,4 +1,4 @@
-// models/invite.js
+//models/invite.js
const { DataTypes } = require('sequelize');
const sequelize = require('../config/sequelize');
diff --git a/schemas/ChatRooms.js b/schemas/ChatRooms.js
index b214fe9..1c2001c 100644
--- a/schemas/ChatRooms.js
+++ b/schemas/ChatRooms.js
@@ -1,3 +1,4 @@
+// schemas/chatRooms.js
const mongoose = require('mongoose');
// MongoDB 梨꾪똿諛� �ㅽ궎留� �섏젙 (FCM �좏겙�� 諛곗뿴濡� 愿�由�)
diff --git a/sync.js b/sync.js
index 615e537..84cfdef 100644
--- a/sync.js
+++ b/sync.js
@@ -14,10 +14,6 @@ async function syncRdb() {
// 紐⑤뱺 紐⑤뜽 �숆린��
await sequelize.sync({ force: true });
console.log('紐⑤뱺 紐⑤뜽�� �깃났�곸쑝濡� �숆린�붾릺�덉뒿�덈떎.');
-
- // �곌껐 醫낅즺
- await sequelize.close();
- console.log('Rdb�곗씠�곕쿋�댁뒪 �곌껐�� 醫낅즺�섏뿀�듬땲��.');
} catch (error) {
console.error('Rdb�곗씠�곕쿋�댁뒪 �곌껐 �ㅽ뙣:', error);
}
--
GitLab