Add: DB connection and service

backend/src/data/articleService.js

+import Article from '../models/article.js';
+
+const articleService = {
+  async createArticle(articleData) {
+    try {
+      const article = new Article(articleData);
+      await article.save();
+      return article;
+    } catch (err) {
+      throw err;
+    }
+  },
+
+  async findArticleById(articleId) {
+    try {
+
+    } catch (err) {
+      throw err;
+    }
+  }
+};
+
+export default articleService;
\ No newline at end of file

backend/src/data/userService.js

+import User from '../models/User.js';
+
+const userService = {
+  async createUser(userData) {
+    try {
+      const user = new User(userData);
+      await user.save();
+      return user;
+    } catch (err) {
+      throw err;
+    }
+  },
+
+  async findUserByEmail(email) {
+    try {
+      const user = await User.findOne({ email });
+      return user;
+    } catch (err) {
+      throw err;
+    }
+  },
+};
+
+export default userService;
\ No newline at end of file

backend/src/db.js

-import dotenv from "dotenv";
-import mongoose from "mongoose";
+import dotenv from 'dotenv';
+import mongoose from 'mongoose';
 
 dotenv.config();
 
-const GoogleProviderSchema = new mongoose.Schema({
-  id: {
-    type: String,
-    required: true,
-    //unique: true,
-  },
-  profileUrl: {
-    type: String,
-  },
-});
+// const GoogleProviderSchema = new mongoose.Schema({
+//   id: {
+//     type: String,
+//     required: true,
+//     //unique: true,
+//   },
+//   profileUrl: {
+//     type: String,
+//   },
+// });
 
-const UserSchema = new mongoose.Schema({
-  user_id: {
-    type: String,
-    required: true,
-    //unique: true,
-  },
-  nickname: {
-    type: String,
-  },
-  email: {
-    type: String,
-    //unique: true,
-  },
-  google: {
-    type: GoogleProviderSchema,
-  }
-});
+// const UserSchema = new mongoose.Schema({
+//   nickname: {
+//     type: String,
+//   },
+//   email: {
+//     type: String,
+//     //unique: true,
+//   },
+//   google: {
+//     type: GoogleProviderSchema,
+//   }
+// });
 
 
-const UserModel = mongoose.model("User", UserSchema);
+// const UserModel = mongoose.model("User", UserSchema);
 
-const CommentSchema = new mongoose.Schema({
-	/*
-  commentId: {
-    type: String,
-    required: true,
-    unique: false,
-  },	
-	*/
-  content: {
-    type: String,
-    required: true,
-  },
-  author: {
-    type: UserSchema,
-    required: true,
-  },
-  createdAt: {
-    type: Date,
-    default: Date.now,
-  },
-});
-CommentSchema.index( { commentId: 1 } , { sparse: true } )
+// const CommentSchema = new mongoose.Schema({
+//   content: {
+//     type: String,
+//     required: true,
+//   },
+//   author: {
+//     type: UserSchema,
+//     required: true,
+//   },
+//   createdAt: {
+//     type: Date,
+//     default: Date.now,
+//   },
+// });
+// CommentSchema.index( { commentId: 1 } , { sparse: true } )
 
-const ArticleSchema = new mongoose.Schema({
-  title: {
-    type: String,
-    required: true,
-  },
-  /*
-   articleId: {
-    type: String,
-	unique: true,
-  }, 
-  */
-  content: {
-    type: String,
-    required: true,
-  },
-  imageUrls: {
-    type: [String],
-  },
-  author: {
-    type: UserSchema,
-    required: true,
-  },
-  comments: {
-    type: [CommentSchema],
-	unique: false,
-  },
-  likes: {
-    type: [UserSchema],
-  },
-  createdAt: {
-    type: Date,
-    default: Date.now,
-  },
-});
+// const ArticleSchema = new mongoose.Schema({
+//   title: {
+//     type: String,
+//     required: true,
+//   },
+//   content: {
+//     type: String,
+//     required: true,
+//   },
+//   imageUrls: {
+//     type: [String],
+//   },
+//   author: {
+//     type: UserSchema,
+//     required: true,
+//   },
+//   comments: {
+//     type: [CommentSchema],
+// 	unique: false,
+//   },
+//   likes: {
+//     type: [UserSchema],
+//   },
+//   createdAt: {
+//     type: Date,
+//     default: Date.now,
+//   },
+// });
 
-ArticleSchema.index({articleId:1}, { sparse: true })
-const ArticleModel = mongoose.model("Article", ArticleSchema);
+// ArticleSchema.index({articleId:1}, { sparse: true })
+// const ArticleModel = mongoose.model("Article", ArticleSchema);
 
 const connectDB = async () => {
   const url = process.env.MONGODB_URI;
-  let db;
   try {
-    db = await mongoose.connect(url, { useNewUrlParser: true, useUnifiedTopology: true });
+    await mongoose.connect(url, { useNewUrlParser: true, useUnifiedTopology: true });
+    console.log('Database connected');
   } catch (error) {
-    console.error(error);
+    console.error('Database connection failed',error);
   }
-  return db;
-}
+};
 
-export default { connectDB, UserModel, ArticleModel }
+export default connectDB;
\ No newline at end of file

backend/src/index.js

-import express from "express"
-import cors from 'cors'
-import path from 'path'
-import process from 'process'
+import express from 'express';
+import cors from 'cors';
+import path from 'path';
+import process from 'process';
 import moment from 'moment';
 import cookieParser from 'cookie-parser';
 import session from 'express-session';
-import db from './db.js'
+import connectDB from './db.js';
+import userService from './data/userService.js';
+import articleService from './data/articleService.js';
 
 const app = express();
 const PORT = 8080;
 
-db.connectDB();
+connectDB();
 
 app.use(express.static(path.join(process.cwd(), '../frontend/build')));
 
@@ -62,23 +64,20 @@ app.post('/login', async (req, res) => {
 	TODO: 토큰의 무결성 체크
 	토큰이 이상이 없다면, 로그인/회원가입 로직을 수행 후 jwt 쿠키를 보낸다.
 	*/
-	const expires =  moment().add('60','m').toDate()
+	const expires =  moment().add('60','m').toDate();
 
 	// 정보가 없다면 회원 가입 (강제?)
-	const user = await db.UserModel.find({ user_id: req.body.email });
-	if (!user.length) { // 유저가 없다면 회원 가입 후 세션 생성
-		
-		let userProfilePicture = req.body.picture || null
-		const userModel = new db.UserModel({
-			user_id: req.body.email,
-			nickname: req.body.name,
-			email: req.body.email,
-			google: {
-				id: req.body.sub,
-				profileUrl: userProfilePicture,
-			},
-		});	
-		await userModel.save();	
+  const user = await userService.findUserByEmail(req.body.email);
+	if (!user) { // 유저가 없다면 회원 가입 후 세션 생성
+		let userProfilePicture = req.body.picture || null;
+    await userService.createUser({
+      nickname: req.body.name,
+      email: req.body.email,
+      google: {
+        id: req.body.sub,
+        profileUrl: userProfilePicture,
+      },
+    });
 		console.log('new user saved!')
 	}
 	console.log('login done')
@@ -127,16 +126,15 @@ app.post("/post", async (req, res) => {
 	const inputContent = req.body.content
 	const inputImage = []
 	const useremail = req.session.sessionid.email
-	const author = await db.UserModel.find({ user_id: useremail });
-	const articleModel = new db.ArticleModel({
+  const author = await userService.findUserByEmail(useremail);
+  await articleService.createArticle({
 		title: inputTitle,
 		content: inputContent,
 		imageUrls: inputImage,
 		author: author[0],
 		comments: [],
 		likes: []
-	});		
-	await articleModel.save();	
+	});
 	console.log('saved.')
 	res.send();
 });

backend/src/models/article.js

+import mongoose from 'mongoose';
+import UserSchema from './User.js';
+
+const CommentSchema = new mongoose.Schema({
+  content: {
+    type: String,
+    required: true,
+  },
+  author: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User',
+    required: true,
+  },
+  createdAt: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+const ArticleSchema = new mongoose.Schema({
+  title: {
+    type: String,
+    required: true,
+  },
+  content: {
+    type: String,
+    required: true,
+  },
+  imageUrls: {
+    type: [String],
+  },
+  author: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User',
+    required: true,
+  },
+  comments: {
+    type: [CommentSchema],
+	unique: false,
+  },
+  likes: [{
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User',
+  }],
+  createdAt: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+const Article = mongoose.model("Article", ArticleSchema);
+
+export default Article;
\ No newline at end of file

backend/src/models/user.js

+import mongoose from 'mongoose';
+
+const GoogleProviderSchema = new mongoose.Schema({
+  id: {
+    type: String,
+    required: true,
+    //unique: true,
+  },
+  profileUrl: {
+    type: String,
+  },
+});
+
+const UserSchema = new mongoose.Schema({
+  nickname: {
+    type: String,
+  },
+  email: {
+    type: String,
+    //unique: true,
+  },
+  google: {
+    type: GoogleProviderSchema,
+  }
+});
+
+const User = mongoose.model("User", UserSchema);
+
+export default User;
\ No newline at end of file