Began implementation for getting promotion history

This commit is contained in:
2025-12-16 22:28:32 -05:00
parent f9e5dacda8
commit 278690e094
8 changed files with 462 additions and 275 deletions

View File

@@ -1,6 +1,7 @@
import { MemberState } from "@app/shared/types/member";
import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
import { getAllRanks, insertMemberRank } from "../services/rankService";
import { batchInsertMemberRank, getAllRanks, getPromotionHistorySummary, getPromotionsOnDay, insertMemberRank } from "../services/rankService";
import { BatchPromotion, BatchPromotionMember } from '@app/shared/schemas/promotionSchema'
import express = require('express');
const r = express.Router();
@@ -11,11 +12,13 @@ r.use(requireLogin)
ur.use(requireLogin)
//insert a new latest rank for a user
ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), requireMemberState(MemberState.Member)], async (req, res) => {
3
ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), requireMemberState(MemberState.Member)], async (req: express.Request, res: express.Response) => {
try {
const change = req.body?.change;
await insertMemberRank(change.member_id, change.rank_id, change.date);
const change = req.body.promotions as BatchPromotionMember[];
const author = req.user.id;
if (!change) res.sendStatus(400);
await batchInsertMemberRank(change, author);
res.sendStatus(201);
} catch (err) {
@@ -24,6 +27,31 @@ ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), re
}
});
ur.get('/', async (req: express.Request, res: express.Response) => {
try {
const promos = await getPromotionHistorySummary();
console.log(promos);
res.status(200).json(promos);
} catch (err) {
console.error(err);
res.status(500).json({ error: 'Internal server error' });
}
});
ur.get('/:day', async (req: express.Request, res: express.Response) => {
try {
if (!req.params.day) res.sendStatus(400);
let day = new Date(req.params.day)
const promos = await getPromotionsOnDay(day);
console.log(promos);
res.status(200).json(promos);
} catch (err) {
console.error(err);
res.status(500).json({ error: 'Internal server error' });
}
})
//get all ranks
r.get('/', async (req, res) => {
try {

View File

@@ -1,4 +1,8 @@
import { BatchPromotion, BatchPromotionMember } from "@app/shared/schemas/promotionSchema";
import { PromotionSummary } from "@app/shared/types/rank"
import pool from "../db";
import { PagedData } from "@app/shared/types/pagination";
import { toDateTime } from "@app/shared/utils/time";
export async function getAllRanks() {
const rows = await pool.query(
@@ -30,3 +34,78 @@ export async function insertMemberRank(member_id: number, rank_id: number, date?
await pool.query(sql, params);
}
export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number) {
try {
var con = await pool.getConnection();
console.log(promos);
promos.forEach(p => {
con.query(`CALL sp_update_member_rank(?, ?, ?, ?, ?, ?)`, [p.member_id, p.rank_id, author, author, "Rank Change", toDateTime(new Date(p.start_date))])
});
con.commit();
return
} catch (error) {
throw error; //pass it up
} finally {
con.release();
}
}
export async function getPromotionHistorySummary(page: number = 1, pageSize: number = 15): Promise<PagedData<PromotionSummary>> {
const offset = (page - 1) * pageSize;
let sql = `SELECT
DATE(start_date) AS entry_day
FROM
members_ranks
GROUP BY
entry_day
ORDER BY
entry_day DESC
LIMIT ? OFFSET ?;`
let promoList: PromotionSummary[] = await pool.query(sql, [pageSize, offset]) as PromotionSummary[];
let loaCount = Number((await pool.query(`SELECT
COUNT(*) AS total_grouped_days_count
FROM
(
SELECT DISTINCT DATE(start_date)
FROM members_ranks
) AS grouped_days;`))[0]);
console.log(loaCount);
let pageCount = loaCount / pageSize;
let output: PagedData<PromotionSummary> = { data: promoList, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
return output;
}
export async function getPromotionsOnDay(day: Date): Promise<BatchPromotion[]> {
// Convert the Date object to a 'YYYY-MM-DD' string for the SQL filter
// This assumes pool.query is used with a database that accepts this format for comparison.
const dayString = day.toISOString().split('T')[0];
// SQL query to fetch all records from members_unit for the specified day
let sql = `
SELECT
member_id,
unit_id AS rank_id, -- Using unit_id as a proxy for rank_id based on the data structure
start_date
FROM
members_unit
WHERE
DATE(start_date) = ?
ORDER BY
start_date ASC;
`;
let batchPromotion = await pool.query(sql, [dayString]) as BatchPromotion[];
return batchPromotion;
}