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

Added support for challenges and tweaked qual awarding rules

Browse Source
This commit is contained in:
ajdj100
2026-05-22 09:00:32 -04:00
parent 7532436b9a
commit f8b1811b74
10 changed files with 259 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/migrations/20260522120000-course-event-challenge.js
+45
View File
@@ -0,0 +1,45 @@
'use strict';
var dbm;
var type;
var seed;
var fs = require('fs');
var path = require('path');
var Promise;
exports.setup = function(options, seedLink) {
dbm = options.dbmigrate;
type = dbm.dataType;
seed = seedLink;
Promise = options.Promise;
};
exports.up = function(db) {
var filePath = path.join(__dirname, 'sqls', '20260522120000-course-event-challenge-up.sql');
return new Promise(function(resolve, reject) {
fs.readFile(filePath, { encoding: 'utf-8' }, function(err, data) {
if (err) return reject(err);
console.log('received data: ' + data);
resolve(data);
});
}).then(function(data) {
return db.runSql(data);
});
};
exports.down = function(db) {
var filePath = path.join(__dirname, 'sqls', '20260522120000-course-event-challenge-down.sql');
return new Promise(function(resolve, reject) {
fs.readFile(filePath, { encoding: 'utf-8' }, function(err, data) {
if (err) return reject(err);
console.log('received data: ' + data);
resolve(data);
});
}).then(function(data) {
return db.runSql(data);
});
};
exports._meta = {
version: 1,
};
api/migrations/sqls/20260522120000-course-event-challenge-down.sql
+2
View File
@@ -0,0 +1,2 @@
ALTER TABLE course_events
DROP COLUMN is_challenge;
api/migrations/sqls/20260522120000-course-event-challenge-up.sql
+2
View File
@@ -0,0 +1,2 @@
ALTER TABLE course_events
ADD COLUMN is_challenge TINYINT(1) NOT NULL DEFAULT 0 AFTER hasQual;
api/scripts/backfillQualifications.js
+88 -17
View File
@@ -104,36 +104,107 @@ function key(memberId, courseId) {
}
const scoped = buildScopeClause(args);
const evidenceScopedClauses = [];
const evidenceScopedParams = [];
if (args.courseId !== null) {
evidenceScopedClauses.push("e.course_id = ?");
evidenceScopedParams.push(args.courseId);
}
if (args.memberId !== null) {
evidenceScopedClauses.push("ca.attendee_id = ?");
evidenceScopedParams.push(args.memberId);
}
const evidenceScopedSql = evidenceScopedClauses.length
? ` AND ${evidenceScopedClauses.join(" AND ")}`
: "";
const passRows = await conn.query(
const evidenceRows = await conn.query(
`SELECT
ca.attendee_id AS member_id,
e.course_id,
e.id AS course_event_id,
e.event_date
e.event_date,
IFNULL(e.is_challenge, 0) AS is_challenge,
IFNULL(e.hasBookwork, 0) AS event_has_bookwork,
IFNULL(e.hasQual, 0) AS event_has_qual,
ca.passed_bookwork,
ca.passed_qual,
IFNULL(c.hasBookwork, 0) AS course_has_bookwork,
IFNULL(c.hasQual, 0) AS course_has_qual
FROM course_events e
INNER JOIN courses c ON c.id = e.course_id
INNER JOIN course_attendees ca ON ca.course_event_id = e.id
WHERE ca.attendee_role_id = 2
AND (e.deleted IS NULL OR e.deleted = 0)
AND (
(e.hasBookwork = 1 AND e.hasQual = 1 AND ca.passed_bookwork = 1 AND ca.passed_qual = 1)
OR (e.hasBookwork = 1 AND IFNULL(e.hasQual, 0) = 0 AND ca.passed_bookwork = 1)
OR (IFNULL(e.hasBookwork, 0) = 0 AND e.hasQual = 1 AND ca.passed_qual = 1)
)
${scoped.sql}
${evidenceScopedSql}
ORDER BY ca.attendee_id ASC, e.course_id ASC, e.event_date DESC, e.id DESC;`,
scoped.params
evidenceScopedParams
);
const latestByPair = new Map();
for (const row of passRows) {
const mapKey = key(Number(row.member_id), Number(row.course_id));
if (!latestByPair.has(mapKey)) {
latestByPair.set(mapKey, {
memberId: Number(row.member_id),
courseId: Number(row.course_id),
const aggregateByPair = new Map();
for (const row of evidenceRows) {
const memberId = Number(row.member_id);
const courseId = Number(row.course_id);
const mapKey = key(memberId, courseId);
const bookworkEvidence = Number(row.event_has_bookwork) === 1 && Number(row.passed_bookwork) === 1;
const qualEvidence = Number(row.event_has_qual) === 1 && Number(row.passed_qual) === 1;
const challengeQualEvidence = Number(row.is_challenge) === 1 && Number(row.event_has_qual) === 1 && Number(row.passed_qual) === 1;
const existing = aggregateByPair.get(mapKey) || {
memberId,
courseId,
courseHasBookwork: Number(row.course_has_bookwork) === 1,
courseHasQual: Number(row.course_has_qual) === 1,
hasBookworkPass: false,
hasQualPass: false,
hasChallengeQualPass: false,
latestEvidence: null,
};
existing.hasBookworkPass = existing.hasBookworkPass || bookworkEvidence;
existing.hasQualPass = existing.hasQualPass || qualEvidence;
existing.hasChallengeQualPass = existing.hasChallengeQualPass || challengeQualEvidence;
if (bookworkEvidence || qualEvidence || challengeQualEvidence) {
const nextLatest = {
courseEventId: Number(row.course_event_id),
eventDate: row.event_date,
};
if (!existing.latestEvidence) {
existing.latestEvidence = nextLatest;
} else {
const currentDate = new Date(existing.latestEvidence.eventDate).getTime();
const nextDate = new Date(nextLatest.eventDate).getTime();
if (nextDate > currentDate || (nextDate === currentDate && nextLatest.courseEventId > existing.latestEvidence.courseEventId)) {
existing.latestEvidence = nextLatest;
}
}
}
aggregateByPair.set(mapKey, existing);
}
const latestByPair = new Map();
for (const [mapKey, pair] of aggregateByPair.entries()) {
const hasBookwork = pair.courseHasBookwork;
const hasQual = pair.courseHasQual;
let qualifies = false;
if (hasBookwork && hasQual) {
qualifies = (pair.hasBookworkPass && pair.hasQualPass) || pair.hasChallengeQualPass;
} else if (hasBookwork && !hasQual) {
qualifies = pair.hasBookworkPass;
} else if (!hasBookwork && hasQual) {
qualifies = pair.hasQualPass;
}
if (qualifies && pair.latestEvidence) {
latestByPair.set(mapKey, {
memberId: pair.memberId,
courseId: pair.courseId,
courseEventId: pair.latestEvidence.courseEventId,
eventDate: pair.latestEvidence.eventDate,
});
}
}
@@ -164,7 +235,7 @@ function key(memberId, courseId) {
courseId: args.courseId,
},
actorId: args.actorId,
historicalPassingRows: passRows.length,
historicalPassingRows: evidenceRows.length,
activePairsComputed: latestByPair.size,
currentlyActivePairs: currentRows.length,
wouldDeactivate,
api/src/services/db/CourseSerivce.ts
+5 -3
View File
@@ -86,7 +86,7 @@ export async function insertCourseEvent(event: CourseEventDetails): Promise<numb
let course: Course = await getCourseByID(event.course_id);
await con.beginTransaction();
const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by, hasBookwork, hasQual) VALUES (?, ?, ?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by, course.hasBookwork, course.hasQual]);
const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by, hasBookwork, hasQual, is_challenge) VALUES (?, ?, ?, ?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by, course.hasBookwork, course.hasQual, event.is_challenge ? 1 : 0]);
var eventID: number = res.insertId;
for (const attendee of event.attendees) {
@@ -127,6 +127,7 @@ export async function getCourseEvents(sortDir: string, search: string = "", page
E.id AS event_id,
E.course_id,
E.event_date AS date,
IFNULL(E.is_challenge, 0) AS is_challenge,
E.created_by,
C.name AS course_name,
C.short_name AS course_shortname,
@@ -176,9 +177,10 @@ export async function updateCourseEvent(eventId: number, event: CourseEventDetai
event_date = ?,
remarks = ?,
hasBookwork = ?,
hasQual = ?
hasQual = ?,
is_challenge = ?
WHERE id = ?;`,
[event.course_id, toDateTime(event.event_date), event.remarks, course.hasBookwork, course.hasQual, eventId]
[event.course_id, toDateTime(event.event_date), event.remarks, course.hasBookwork, course.hasQual, event.is_challenge ? 1 : 0, eventId]
);
await con.query(`DELETE FROM course_attendees WHERE course_event_id = ?;`, [eventId]);
api/src/services/db/qualificationService.ts
+51 -24
View File
@@ -19,7 +19,7 @@ interface SyncOutcome {
async function getEventQualificationContext(con: any, courseEventId: number): Promise<EventQualificationContext | null> {
const eventRows = await con.query(
`SELECT e.event_date, e.hasBookwork, e.hasQual, c.id AS course_id
`SELECT e.event_date, c.hasBookwork, c.hasQual, c.id AS course_id
FROM course_events e
INNER JOIN courses c ON c.id = e.course_id
WHERE e.id = ?;`,
@@ -85,28 +85,49 @@ async function getEventQualificationContext(con: any, courseEventId: number): Pr
};
}
function attendeePassed(attendee: CourseAttendee, hasBookwork: boolean, hasQual: boolean): boolean {
if (attendee.attendee_role_id !== 2) {
return false;
async function getLatestPassingCourseEvent(
con: any,
memberId: number,
courseId: number,
hasBookwork: boolean,
hasQual: boolean
): Promise<{ course_event_id: number, event_date: Date } | null> {
const evidenceRows = await con.query(
`SELECT
MAX(CASE WHEN IFNULL(e.hasBookwork, 0) = 1 AND ca.passed_bookwork = 1 THEN 1 ELSE 0 END) AS has_bookwork_pass,
MAX(CASE WHEN IFNULL(e.hasQual, 0) = 1 AND ca.passed_qual = 1 THEN 1 ELSE 0 END) AS has_qual_pass,
MAX(CASE WHEN IFNULL(e.is_challenge, 0) = 1 AND IFNULL(e.hasQual, 0) = 1 AND ca.passed_qual = 1 THEN 1 ELSE 0 END) AS has_challenge_qual_pass
FROM course_events e
INNER JOIN course_attendees ca ON ca.course_event_id = e.id
WHERE e.course_id = ?
AND ca.attendee_id = ?
AND ca.attendee_role_id = 2
AND (e.deleted IS NULL OR e.deleted = 0);`,
[courseId, memberId]
);
if (!evidenceRows.length) {
return null;
}
const hasBookworkPass = Number(evidenceRows[0].has_bookwork_pass) === 1;
const hasQualPass = Number(evidenceRows[0].has_qual_pass) === 1;
const hasChallengeQualPass = Number(evidenceRows[0].has_challenge_qual_pass) === 1;
let hasPassingRecord = false;
if (hasBookwork && hasQual) {
return attendee.passed_bookwork && attendee.passed_qual;
hasPassingRecord = (hasBookworkPass && hasQualPass) || hasChallengeQualPass;
} else if (hasBookwork && !hasQual) {
hasPassingRecord = hasBookworkPass;
} else if (!hasBookwork && hasQual) {
hasPassingRecord = hasQualPass;
}
if (hasBookwork && !hasQual) {
return attendee.passed_bookwork;
if (!hasPassingRecord) {
return null;
}
if (!hasBookwork && hasQual) {
return attendee.passed_qual;
}
return false;
}
async function getLatestPassingCourseEvent(con: any, memberId: number, courseId: number): Promise<{ course_event_id: number, event_date: Date } | null> {
const rows = await con.query(
const latestRows = await con.query(
`SELECT e.id AS course_event_id, e.event_date
FROM course_events e
INNER JOIN course_attendees ca ON ca.course_event_id = e.id
@@ -115,22 +136,22 @@ async function getLatestPassingCourseEvent(con: any, memberId: number, courseId:
AND ca.attendee_role_id = 2
AND (e.deleted IS NULL OR e.deleted = 0)
AND (
(e.hasBookwork = 1 AND e.hasQual = 1 AND ca.passed_bookwork = 1 AND ca.passed_qual = 1)
OR (e.hasBookwork = 1 AND IFNULL(e.hasQual, 0) = 0 AND ca.passed_bookwork = 1)
OR (IFNULL(e.hasBookwork, 0) = 0 AND e.hasQual = 1 AND ca.passed_qual = 1)
(IFNULL(e.hasBookwork, 0) = 1 AND ca.passed_bookwork = 1)
OR (IFNULL(e.hasQual, 0) = 1 AND ca.passed_qual = 1)
OR (IFNULL(e.is_challenge, 0) = 1 AND IFNULL(e.hasQual, 0) = 1 AND ca.passed_qual = 1)
)
ORDER BY e.event_date DESC, e.id DESC
LIMIT 1;`,
[courseId, memberId]
);
if (!rows.length) {
if (!latestRows.length) {
return null;
}
return {
course_event_id: Number(rows[0].course_event_id),
event_date: new Date(rows[0].event_date),
course_event_id: Number(latestRows[0].course_event_id),
event_date: new Date(latestRows[0].event_date),
};
}
@@ -165,7 +186,7 @@ export async function syncQualificationsForCourseEvent(courseEventId: number, ac
const expectedMembers = new Set<number>();
for (const attendee of context.attendees) {
if (attendeePassed(attendee, context.hasBookwork, context.hasQual)) {
if (attendee.attendee_role_id === 2) {
expectedMembers.add(attendee.attendee_id);
}
}
@@ -191,7 +212,13 @@ export async function syncQualificationsForCourseEvent(courseEventId: number, ac
for (let i = 0; i < impactedList.length; i++) {
const memberId = impactedList[i];
const latestPass = await getLatestPassingCourseEvent(con, memberId, context.courseId);
const latestPass = await getLatestPassingCourseEvent(
con,
memberId,
context.courseId,
context.hasBookwork,
context.hasQual
);
if (latestPass) {
await con.query(