refactor: usersControl

backend/index.js

@@ -31,13 +31,13 @@ app.use('/', indexRoute);
 
 // "users"
 const usersIndexRoute = require('./routes/users/index')(sequelize);
-const usersShowRoute = require('./routes/users/show')(sequelize);
 const usersFindRoute = require('./routes/users/find')(sequelize);
+const usersSearchRoute = require('./routes/users/search')(sequelize);
 const signUpRoute = require('./routes/users/signup')(sequelize);
 const signInRoute = require('./routes/users/signin')(sequelize);
 app.use('/users', usersIndexRoute);
-app.use('/users', usersShowRoute);
 app.use('/users', usersFindRoute);
+app.use('/users', usersSearchRoute);
 app.use('/users', signUpRoute);
 app.use('/users', signInRoute);
 

backend/routes/users/find.js

@@ -1,39 +1,31 @@
 const express = require('express');
 const router = express.Router();
 const defineUser = require('../../models/users');
-const defineMember = require('../../models/members');
-const { DataTypes, Op } = require('sequelize');
+const { DataTypes } = require('sequelize');
 
 module.exports = function (sequelize) {
   const { verifySignedIn } = require('../../middleware/auth')(sequelize);
   const User = defineUser(sequelize, DataTypes);
-  const Member = defineMember(sequelize, DataTypes);
 
-  router.get('/find', verifySignedIn, async (req, res) => {
+  router.get('/find/:userId', verifySignedIn, async (req, res) => {
     try {
-      const { projectId, search } = req.query;
-      if (!projectId || !search) {
-        return res.status(400).json({ error: 'projectId and search text are required' });
+      const userId = req.params.userId;
+      if (!userId) {
+        return res.status(400).json({ error: 'userId is required' });
       }
 
-      let where = {
-        [Op.or]: [{ email: { [Op.like]: `%${search}%` } }, { username: { [Op.like]: `%${search}%` } }],
-      };
-
-      let excludeIdArray = [];
-      const members = await Member.findAll({
-        where: { projectId },
-        attributes: ['userId'],
-      });
-      excludeIdArray = members.map((member) => member.userId);
-      excludeIdArray.push(req.userId);
-      where.id = { [Op.notIn]: excludeIdArray };
-
-      const users = await User.findAll({
-        where,
-        limit: 7,
-      });
-      res.json(users);
+      try {
+        const user = await User.findByPk(userId, {
+          attributes: ['id', 'username', 'role', 'avatarPath'],
+        });
+        if (!user) {
+          return res.status(404).send('User not found');
+        }
+        res.json(user);
+      } catch (error) {
+        console.error(error);
+        res.status(500).send('Internal Server Error');
+      }
     } catch (error) {
       console.error(error);
       res.status(500).send('Internal Server Error');

backend/routes/users/search.js

@@ -0,0 +1,44 @@
+const express = require('express');
+const router = express.Router();
+const defineUser = require('../../models/users');
+const defineMember = require('../../models/members');
+const { DataTypes, Op } = require('sequelize');
+
+module.exports = function (sequelize) {
+  const { verifySignedIn } = require('../../middleware/auth')(sequelize);
+  const User = defineUser(sequelize, DataTypes);
+  const Member = defineMember(sequelize, DataTypes);
+
+  router.get('/search', verifySignedIn, async (req, res) => {
+    try {
+      const { projectId, search } = req.query;
+      if (!projectId || !search) {
+        return res.status(400).json({ error: 'projectId and search text are required' });
+      }
+
+      let where = {
+        [Op.or]: [{ email: { [Op.like]: `%${search}%` } }, { username: { [Op.like]: `%${search}%` } }],
+      };
+
+      let excludeIdArray = [];
+      const members = await Member.findAll({
+        where: { projectId },
+        attributes: ['userId'],
+      });
+      excludeIdArray = members.map((member) => member.userId);
+      excludeIdArray.push(req.userId);
+      where.id = { [Op.notIn]: excludeIdArray };
+
+      const users = await User.findAll({
+        where,
+        limit: 7,
+      });
+      res.json(users);
+    } catch (error) {
+      console.error(error);
+      res.status(500).send('Internal Server Error');
+    }
+  });
+
+  return router;
+};

backend/routes/users/show.js

@@ -1,36 +0,0 @@
-const express = require('express');
-const router = express.Router();
-const defineUser = require('../../models/users');
-const { DataTypes } = require('sequelize');
-
-module.exports = function (sequelize) {
-  const { verifySignedIn } = require('../../middleware/auth')(sequelize);
-  const User = defineUser(sequelize, DataTypes);
-
-  router.get('/:userId', verifySignedIn, async (req, res) => {
-    try {
-      const userId = req.params.userId;
-      if (!userId) {
-        return res.status(400).json({ error: 'userId is required' });
-      }
-
-      try {
-        const user = await User.findByPk(userId, {
-          attributes: ['id', 'username', 'role', 'avatarPath'],
-        });
-        if (!user) {
-          return res.status(404).send('User not found');
-        }
-        res.json(user);
-      } catch (error) {
-        console.error(error);
-        res.status(500).send('Internal Server Error');
-      }
-    } catch (error) {
-      console.error(error);
-      res.status(500).send('Internal Server Error');
-    }
-  });
-
-  return router;
-};