17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 38 Pull Requests 1 Actions 3 Packages Projects 1 Releases 14 Wiki Activity

Merge pull request 'Role-Management-Overhaul' (#122) from Role-Management-Overhaul into main
All checks were successful
Continuous Integration / Update Development (push) Successful in 1m52s
Details

Browse Source 
Reviewed-on: #122
This commit was merged in pull request #122.
This commit is contained in:
Ajdj100
2025-12-30 20:54:50 -06:00
parent 7fb8852ac0 8903baef52
commit eb92dcafda
15 changed files with 473 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
api/src/routes/roles.ts
View File

@@ -5,7 +5,8 @@ const ur = express.Router();
import { MemberState } from '@app/shared/types/member';
import pool from '../db';
import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
import { assignUserGroup, createGroup } from '../services/rolesService';
import { assignUserGroup, createGroup, getAllRoles, getRole, getUsersWithRole } from '../services/rolesService';
import { Request, Response } from 'express';
r.use(requireLogin)
ur.use(requireLogin)
@@ -15,10 +16,16 @@ ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administ
try {
const body = req.body;
assignUserGroup(body.member_id, body.role_id);
await assignUserGroup(body.member_id, body.role_id);
res.sendStatus(201);
} catch (err) {
if (err?.code === 'ER_DUP_ENTRY') {
return res.status(400).json({
error: 'Member already has this role',
});
}
console.error('Insert failed:', err);
res.status(500).json({ error: 'Failed to add to group' });
}
@@ -44,45 +51,39 @@ ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Admini
//get all roles
r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
try {
var con = await pool.getConnection();
// Get all roles
const roles = await con.query('SELECT * FROM roles;');
// Get all members for each role
const membersRoles = await con.query(`
SELECT mr.role_id, v.*
FROM members_roles mr
JOIN view_member_rank_unit_status_latest v ON mr.member_id = v.member_id
`);
// Group members by role_id
const roleIdToMembers = {};
for (const row of membersRoles) {
if (!roleIdToMembers[row.role_id]) roleIdToMembers[row.role_id] = [];
// Remove role_id from member object
const { role_id, ...member } = row;
roleIdToMembers[role_id].push(member);
}
// Attach members to each role
const result = roles.map(role => ({
...role,
members: roleIdToMembers[role.id] || []
}));
res.json(result);
const roles = await getAllRoles();
res.status(200).json(roles);
} catch (err) {
console.error(err);
res.status(500).json({ error: 'Internal server error' });
} finally {
con.release();
res.sendStatus(500);
}
});
r.get('/:id/members', [requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
try {
const members = await getUsersWithRole(Number(req.params.id));
res.status(200).json(members);
} catch (err) {
console.error(err);
res.sendStatus(500);
}
})
r.get('/:id', [requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
try {
const role = await getRole(Number(req.params.id));
res.status(200).json(role);
} catch (err) {
console.error(err);
res.sendStatus(500);
}
})
//create a new role
r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
try {
const { name, color, description } = req.body;
if (!name || !color) {
@@ -103,7 +104,7 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administr
}
})
r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
try {
const id = req.params.id;