Merge pull request #11 from yale-swe/anna-dev

Added routes to server.js; debugged data model imports and exports
yale-swe · Oct 28, 2023 · 0d1c56d · 0d1c56d
2 parents 49e053b + 56fcbde
commit 0d1c56d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 20 deletions.
diff --git a/server/controllers/auth.js b/server/controllers/auth.js
@@ -1,4 +1,4 @@
-import User from "../models/User.js";
+import UserModel from "../models/User.js";
 import { handleServerError, handleSuccess } from "../utils/handlers.js";
 
 export const register = async (req, res) => {
@@ -8,7 +8,7 @@ export const register = async (req, res) => {
 		const salt = await bcrypt.genSalt(10);
 		const passwordHash = await bcrypt.hash(password, salt);
 
-		const newUser = new User({
+		const newUser = new UserModel({
 			userName,
 			firstName,
 			lastName,

diff --git a/server/controllers/message.js b/server/controllers/message.js
@@ -1,4 +1,4 @@
-const MessageModel = require('../models/Message.js');
+import MessageModel from "../models/Message.js";
 import { handleServerError, handleSuccess } from '../utils/handlers.js';
 
 // Post message

diff --git a/server/controllers/reply.js b/server/controllers/reply.js
@@ -1,4 +1,4 @@
-const ReplyModel = require('../models/Reply.js');
+import ReplyModel from "../models/Reply.js";
 import { handleServerError, handleSuccess } from '../utils/handlers.js';
 
 // Reply to a message

diff --git a/server/controllers/user.js b/server/controllers/user.js
@@ -1,9 +1,9 @@
-import User from "../models/User.js";
+import UserModel from "../models/User.js";
 import { handleBadRequest } from "../utils/handlers.js";
 
 export const getUserById = async (req, res) => {
 	try {
-		const user = await User.findById(req.params.userId);
+		const user = await UserModel.findById(req.params.userId);
 
 		if (!user) {
 			return handleNotFound(res, "User not found");
@@ -19,7 +19,7 @@ export const getUserByEmailOrUsername = async (req, res) => {
 	try {
 		const { emailOrUsername } = req.params;
 
-		const user = await User.findOne({
+		const user = await UserModel.findOne({
 			$or: [{ email: emailOrUsername }, { userName: emailOrUsername }],
 		});
 
@@ -36,7 +36,7 @@ export const getUserByEmailOrUsername = async (req, res) => {
 export const getUserFriends = async (req, res) => {
 	try {
 		const userId = req.params.userId;
-		const user = await User.findById(userId);
+		const user = await UserModel.findById(userId);
 
 		if (!user) {
 			return handleNotFound(res, "User not found");
@@ -57,8 +57,8 @@ export const addUserFriend = async (req, res) => {
 			return handleBadRequest(res, "You can't friend yourself!");
 		}
 
-		const user = await User.findById(userId);
-		const friend = await User.findById(friendId);
+		const user = await UserModel.findById(userId);
+		const friend = await UserModel.findById(friendId);
 
 		if (!user) {
 			return handleNotFound(res, "User not found");
@@ -88,8 +88,8 @@ export const removeUserFriend = async (req, res) => {
 	const { friendId } = req.body;
 
 	try {
-		const user = await User.findById(userId);
-		const friend = await User.findById(friendId);
+		const user = await UserModel.findById(userId);
+		const friend = await UserModel.findById(friendId);
 
 		if (!user) {
 			return handleNotFound(res, "User not found");
@@ -115,7 +115,7 @@ export const getUserMessages = async (req, res) => {
 	try {
 		const { userId } = req.params;
 
-		const user = await User.findById(userId);
+		const user = await UserModel.findById(userId);
 
 		if (!user) {
 			return handleNotFound(res, "User not found");
@@ -131,7 +131,7 @@ export const deleteUser = async (req, res) => {
 	try {
 		const { userId } = req.params;
 
-		const user = await User.findById(userId);
+		const user = await UserModel.findById(userId);
 
 		if (!user) {
 			return handleNotFound(res, "User not found");
@@ -149,7 +149,7 @@ export const toggleNotifyFriends = async (req, res) => {
 	try {
 		const { userId } = req.params;
 
-		const user = await User.findById(userId);
+		const user = await UserModel.findById(userId);
 
 		if (!user) {
 			return handleNotFound(res, "User not found");
@@ -169,7 +169,7 @@ export const updateUserProfile = async (req, res) => {
 		const { userName, password, firstName, lastName, email, avatar } =
 			req.body;
 
-		const user = await User.findById(userId);
+		const user = await UserModel.findById(userId);
 
 		if (!user) {
 			return handleNotFound(res, "User not found.");

diff --git a/server/models/Message.js b/server/models/Message.js
@@ -40,4 +40,5 @@ export const MessageSchema = new Schema({
     replies: [ReplySchema],
 });
 
-export const MessageModel = mongoose.model("Message", MessageSchema);
+const MessageModel = mongoose.model("Message", MessageSchema);
+export default MessageModel;
diff --git a/server/models/Reply.js b/server/models/Reply.js
@@ -17,4 +17,5 @@ export const ReplySchema = new Schema({
     },
 });
 
-export const ReplyModel = mongoose.model("Reply", ReplySchema);
+const ReplyModel = mongoose.model("Reply", ReplySchema);
+export default ReplyModel;
diff --git a/server/models/User.js b/server/models/User.js
@@ -54,5 +54,5 @@ export const UserSchema = new Schema({
 	},
 });
 
-const User = mongoose.model("User", UserSchema);
-export default User;
+const UserModel = mongoose.model("User", UserSchema);
+export default UserModel;
diff --git a/server/server.js b/server/server.js
@@ -5,6 +5,9 @@ import dotenv from "dotenv";
 import cors from "cors";
 import { connectDB } from "./db.js";
 import authRoutes from "./routes/auth.js";
+import messageRoutes from "./routes/message.js";
+import replyRoutes from "./routes/reply.js";
+import userRoutes from "./routes/user.js";
 
 // run and set env variables
 dotenv.config();
@@ -24,7 +27,12 @@ app.use(
 app.use(helmet());
 app.use(helmet.crossOriginResourcePolicy({ policy: "cross-origin" }));
 
+// Add backend routes
 app.use("/auth", authRoutes);
+app.use("/message", messageRoutes);
+app.use("/reply", replyRoutes);
+app.use("/user", userRoutes);
+
 
 const server = app.listen(PORT, console.log(`Server running on port ${PORT}`));