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

finished hooking up promotion history

Browse Source
This commit is contained in:
ajdj100
2025-12-17 22:36:51 -05:00
parent 6d83a2d342
commit 00f8d583cc
5 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
api/src/services/rankService.ts
View File

@@ -1,5 +1,5 @@
import { BatchPromotion, BatchPromotionMember } from "@app/shared/schemas/promotionSchema";
import { PromotionSummary } from "@app/shared/types/rank"
import { PromotionDetails, PromotionSummary } from "@app/shared/types/rank"
import pool from "../db";
import { PagedData } from "@app/shared/types/pagination";
import { toDateTime } from "@app/shared/utils/time";
@@ -61,6 +61,7 @@ export async function getPromotionHistorySummary(page: number = 1, pageSize: num
DATE(start_date) AS entry_day
FROM
members_ranks
WHERE reason = 'Rank Change'
GROUP BY
entry_day
ORDER BY
@@ -75,6 +76,7 @@ export async function getPromotionHistorySummary(page: number = 1, pageSize: num
(
SELECT DISTINCT DATE(start_date)
FROM members_ranks
WHERE reason = 'Rank Change'
) AS grouped_days;`))[0]);
console.log(loaCount);
@@ -84,28 +86,23 @@ export async function getPromotionHistorySummary(page: number = 1, pageSize: num
return output;
}
export async function getPromotionsOnDay(day: Date): Promise<BatchPromotion[]> {
export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]> {
// 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];
const dayString = toDateTime(day);
// 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;
SELECT
mr.member_id,
mr.created_by_id,
r.short_name
FROM members_ranks AS mr
LEFT JOIN ranks AS r ON r.id = mr.rank_id
WHERE DATE(mr.start_date) = ? && mr.reason = 'Rank Change'
ORDER BY mr.start_date ASC;
`;
let batchPromotion = await pool.query(sql, [dayString]) as BatchPromotion[];
let batchPromotion = await pool.query(sql, [dayString]) as PromotionDetails[];
return batchPromotion;
}