Skip to content

🧹 [Code Health] Refactor duplicate house invite processing logic #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deitaur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🧹 [Code Health] Refactor duplicate house invite processing logic #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"passport": "^0.7.0",
"passport-google-oauth20": "^2.0.0",
"pg": "^8.16.3",
"supertest": "^7.1.4"
"supertest": "^7.2.2"
}
}
49 changes: 22 additions & 27 deletions routes/houses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,29 +63,38 @@ module.exports = (pool, ensureAuthenticated) => {
}
});

// POST /api/houses/:id/join
router.post('/:id/join', ensureAuthenticated, async (req, res) => {
const houseId = Number(req.params.id);
const token = req.body.token;
if (!token) return res.status(400).json({ error: 'Токен обязателен' });
// Shared logic for processing a house join invite
async function processInvite(req, res, invite) {
try {
const q = await pool.query('SELECT * FROM house_invites WHERE house_id=$1 AND token=$2 AND (expires_at IS NULL OR expires_at > now())', [houseId, token]);
if (q.rowCount === 0) return res.status(404).json({ error: 'Приглашение не найдено или просрочено' });
const invite = q.rows[0];
await pool.query(
`INSERT INTO house_memberships(house_id, user_id, role, created_at)
VALUES($1,$2,$3,now())
ON CONFLICT (house_id,user_id) DO UPDATE SET role = EXCLUDED.role`,
[houseId, req.user.id, invite.role]
[invite.house_id, req.user.id, invite.role]
);
await pool.query('UPDATE house_invites SET used = true WHERE id=$1', [invite.id]);
if (invite.created_by) {
const msg = `${req.user.name || req.user.email || 'Пользователь'} присоединился к дому (role=${invite.role})`;
await pool.query('INSERT INTO notifications(user_id, payload, message, created_at) VALUES($1,$2,$3,now())',
[invite.created_by, JSON.stringify({ type: 'house_join', house_id: houseId, user_id: req.user.id, role: invite.role }), msg]);
[invite.created_by, JSON.stringify({ type: 'house_join', house_id: invite.house_id, user_id: req.user.id, role: invite.role }), msg]);
}
const r = await pool.query('SELECT id, name FROM houses WHERE id=$1', [houseId]);
return res.json({ success:true, house_id: houseId, house_name: r.rows[0] ? r.rows[0].name : null, role: invite.role });
const r = await pool.query('SELECT id, name FROM houses WHERE id=$1', [invite.house_id]);
return res.json({ success:true, house_id: invite.house_id, house_name: r.rows[0] ? r.rows[0].name : null, role: invite.role });
} catch (err) {
console.error(err);
return res.status(500).json({ error: 'server error' });
}
}

// POST /api/houses/:id/join
router.post('/:id/join', ensureAuthenticated, async (req, res) => {
const houseId = Number(req.params.id);
const token = req.body.token;
if (!token) return res.status(400).json({ error: 'Токен обязателен' });
try {
const q = await pool.query('SELECT * FROM house_invites WHERE house_id=$1 AND token=$2 AND (expires_at IS NULL OR expires_at > now())', [houseId, token]);
if (q.rowCount === 0) return res.status(404).json({ error: 'Приглашение не найдено или просрочено' });
return await processInvite(req, res, q.rows[0]);
} catch (err) {
console.error(err);
return res.status(500).json({ error: 'server error' });
Expand All @@ -99,21 +108,7 @@ module.exports = (pool, ensureAuthenticated) => {
try {
const q = await pool.query('SELECT * FROM house_invites WHERE token=$1 AND (expires_at IS NULL OR expires_at > now())', [token]);
if (q.rowCount === 0) return res.status(404).json({ error: 'Приглашение не найдено' });
const invite = q.rows[0];
await pool.query(
`INSERT INTO house_memberships(house_id, user_id, role, created_at)
VALUES($1,$2,$3,now())
ON CONFLICT (house_id,user_id) DO UPDATE SET role = EXCLUDED.role`,
[invite.house_id, req.user.id, invite.role]
);
await pool.query('UPDATE house_invites SET used = true WHERE id=$1', [invite.id]);
if (invite.created_by) {
const msg = `${req.user.name || req.user.email || 'Пользователь'} присоединился к дому (role=${invite.role})`;
await pool.query('INSERT INTO notifications(user_id, payload, message, created_at) VALUES($1,$2,$3,now())',
[invite.created_by, JSON.stringify({ type: 'house_join', house_id: invite.house_id, user_id: req.user.id, role: invite.role }), msg]);
}
const r = await pool.query('SELECT id, name FROM houses WHERE id=$1', [invite.house_id]);
return res.json({ success:true, house_id: invite.house_id, house_name: r.rows[0] ? r.rows[0].name : null, role: invite.role });
return await processInvite(req, res, q.rows[0]);
} catch (err) {
console.error(err);
return res.status(500).json({ error: 'server error' });
Expand Down