refactor: usersControl

This commit is contained in:
Takeshi Kimata
2024-07-18 10:39:07 +09:00
parent 7e05eda259
commit aab9f91156
8 changed files with 118 additions and 115 deletions

View File

@@ -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');