Merge branch 'development' into frontend

backend/package.json

@@ -1,34 +1,34 @@
 {
-    "name": "ddara-backend",
-    "private": true,
-    "workspaces": [
-      "frontend",
-      "backend"
-    ],
-    "version": "0.0.0",
-    "type": "module",
-    "description": "따라따라의 선따라길따라 BackEnd 코드",
-    "main": "index.js",
-    "scripts": {
-      "dev": "node src/index.js",
-      "test": "vitest",
-      "test:watch": "vitest --watch",
-      "test:coverage": "vitest run --coverage",
-      "lint": "pnpm lint-staged"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-      "bcrypt": "^5.1.1",
-      "dotenv": "^16.4.5",
-      "express": "^4.21.1",
-      "express-validator": "^7.2.0",
-      "jsonwebtoken": "^9.0.2",
-      "pg": "^8.13.1",
-      "swagger-jsdoc": "^6.2.8",
-      "swagger-ui-express": "^5.0.1",
-      "uuid": "^11.0.3",
-      "ws": "^8.11.0"
-    }
-  }
+  "name": "ddara-backend",
+  "private": true,
+  "workspaces": [
+    "frontend",
+    "backend"
+  ],
+  "version": "0.0.0",
+  "type": "module",
+  "description": "따라따라의 선따라길따라 BackEnd 코드",
+  "main": "index.js",
+  "scripts": {
+    "dev": "node src/index.js",
+    "test": "vitest",
+    "test:watch": "vitest --watch",
+    "test:coverage": "vitest run --coverage",
+    "lint": "pnpm lint-staged"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "bcrypt": "^5.1.1",
+    "dotenv": "^16.4.5",
+    "express": "^4.21.1",
+    "express-validator": "^7.2.0",
+    "jsonwebtoken": "^9.0.2",
+    "pg": "^8.13.1",
+    "swagger-jsdoc": "^6.2.8",
+    "swagger-ui-express": "^5.0.1",
+    "uuid": "^11.0.3",
+    "ws": "^8.11.0"
+  }
+}

backend/src/controllers/authController.js

@@ -1,16 +1,44 @@
-import { loginUser } from '../services/authService.js';
+import { loginUser, registerUser } from '../services/authService.js';
 
-export const login = async (req, res) => {
+/**
+ * @description 로그인 컨트롤러
+ */
+export const loginController = async (req, res) => {
   const { id, password } = req.body;
 
   try {
     const token = await loginUser(id, password);
     if (!token) {
-      return res.status(401).json({ message: 'Invalid ID or password' });
+      return res.status(401).json({ success: false, message: 'Invalid ID or password' });
     }
-    return res.status(200).json({ token });
+    return res.status(201).json({
+      success: true,
+      message: 'Login successfully',
+      data: token,
+    });
   } catch (error) {
     console.error('Login error:', error);
-    return res.status(500).json({ message: 'Server error occurred' });
+    return res.status(500).json({ success: false, message: 'Server error occurred' });
+  }
+};
+
+/**
+ * @description 회원가입 컨트롤러
+ */
+export const registerUserController = async (req, res) => {
+  try {
+    const { id, name, password, email } = req.body;
+    const newUser = await registerUser(id, name, password, email);
+    return res.status(201).json({
+      success: true,
+      message: 'Login successfully',
+      data: newUser,
+    });
+  } catch (error) {
+    if (error.message === 'User ID already exists') {
+      return res.status(409).json({ error: 'User ID already exists' });
+    }
+    console.error('User registration error:', error);
+    res.status(500).json({ error: 'Server error' });
   }
 };

backend/src/controllers/channelController.js

@@ -0,0 +1,126 @@
+import {
+  addGuestService,
+  createChannelService,
+  getChannelByIdService,
+  getChannelGuestInfoService,
+  getUserChannels,
+} from '../services/channelService.js';
+
+/**
+ * @description 채널 생성 컨트롤러
+ */
+export const createChannelController = async (req, res) => {
+  try {
+    const { name, host_id, guests } = req.body;
+
+    const channel = await createChannelService(name, host_id, guests);
+
+    return res.status(201).json({
+      success: true,
+      message: 'Channel created successfully',
+      data: channel,
+    });
+  } catch (err) {
+    console.error(err);
+    return res.status(500).json({
+      success: false,
+      message: 'Server error',
+    });
+  }
+};
+
+/**
+ * @description 채널에 게스트 추가 컨트롤러
+ */
+export const addGuestController = async (req, res) => {
+  try {
+    const { channelId } = req.params;
+    const { guests } = req.body;
+
+    const updatedChannel = await addGuestService(channelId, guests);
+
+    if (!updatedChannel) {
+      return res.status(404).json({
+        success: false,
+        message: 'Channel not found',
+      });
+    }
+
+    return res.status(200).json({
+      success: true,
+      message: 'Guests added successfully',
+    });
+  } catch (err) {
+    console.error(err);
+    return res.status(500).json({
+      success: false,
+      message: 'Server error',
+    });
+  }
+};
+
+/**
+ * @description 채널 정보 조회 컨트롤러
+ */
+export const getChannelInfoController = async (req, res) => {
+  const { id } = req.params;
+
+  try {
+    const channel = await getChannelByIdService(id);
+    if (!channel) {
+      return res.status(404).json({ success: false, message: 'Channel not found' });
+    }
+    return res.status(200).json({
+      success: true,
+      message: 'Get channel successfully',
+      data: channel,
+    });
+  } catch (err) {
+    console.error(err);
+    return res.status(500).json({ success: false, message: 'Server error' });
+  }
+};
+
+/**
+ * @description 채널에 특정 게스트 정보 조회 컨트롤러
+ */
+export const getChannelGuestInfoController = async (req, res) => {
+  const { channelId, guestId } = req.params;
+  try {
+    const result = await getChannelGuestInfoService(channelId, guestId);
+    if (result) {
+      res.status(200).json({
+        success: true,
+        message: 'Get guest data successfully',
+        data: result,
+      });
+    } else {
+      res.status(404).json({ success: false, message: 'Channel or guest not found' });
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ success: false, message: 'Server error' });
+  }
+};
+
+/**
+ * @description 사용자의 채널 리스트 조회 컨트롤러
+ */
+export const getUserChannelsController = async (req, res) => {
+  const { userId } = req.params;
+
+  try {
+    const channels = await getUserChannels(userId);
+    if (!channels.length) {
+      return res.status(404).json({ success: false, message: 'No channels found for this user.' });
+    }
+    res.status(200).json({
+      success: true,
+      message: 'Get channels successfully',
+      data: channels,
+    });
+  } catch (error) {
+    console.error(error);
+    return res.status(500).json({ success: false, message: 'Server error' });
+  }
+};

backend/src/index.js

@@ -2,33 +2,18 @@ import express from 'express';
 import swaggerUi from 'swagger-ui-express';
 import http from 'http';
 import { specs } from '../swaggerConfig.js';
-import { pool } from './db/db.js';
 import { PORT } from './constants/constants.js';
 import { initializeWebSocketServer } from './websocketServer.js';
 import { authRouter } from './routes/authRouter.js';
+import { channelRouter } from './routes/channelRouter.js';
 
 const app = express();
 app.use(express.json());
 
 app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(specs));
 
 app.use('/api/auth', authRouter);
-
-// TODO: 데이터베이스에서 데이터 가져오기 예시
-app.get('/guests', async (req, res) => {
-  try {
-    const result = await pool.query('SELECT * FROM guest');
-    res.json(result.rows);
-  } catch (err) {
-    console.error(err);
-    res.status(500).send('서버 오류');
-  }
-});
-
-// TODO: 예제 라우터 (추가 예정인 라우터의 주석을 Swagger 주석 형식으로 문서화)
-app.get('/example', (req, res) => {
-  res.send('Hello World');
-});
+app.use('/api/channel', channelRouter);
 
 // HTTP 서버 생성
 const server = http.createServer(app);