finalized application acceptance system and started making types shared across front and backend

api/src/services/applicationService.ts

@@ -0,0 +1,71 @@
+import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
+import pool from "../db";
+
+export async function createApplication(memberID: number, appVersion: number, app: string) {
+  const sql = `INSERT INTO applications (member_id, app_version, app_data) VALUES (?, ?, ?);`;
+  const params = [memberID, appVersion, JSON.stringify(app)]
+  return await pool.query(sql, params);
+}
+
+export async function getMemberApplication(memberID: number): Promise<ApplicationRow> {
+  const sql = `SELECT app.*,
+          member.name AS member_name
+      FROM applications AS app
+          INNER JOIN members AS member ON member.id = app.member_id
+      WHERE app.member_id = ?;`;
+
+  let app: ApplicationRow[] = await pool.query(sql, [memberID]);
+  return app[0];
+}
+
+export async function getApplicationByID(appID: number): Promise<ApplicationRow> {
+  const sql =
+    `SELECT app.*,
+          member.name AS member_name
+      FROM applications AS app
+          INNER JOIN members AS member ON member.id = app.member_id
+      WHERE app.id = ?;`;
+  let app: ApplicationRow[] = await pool.query(sql, [appID]);
+  return app[0];
+}
+
+export async function getApplicationList(): Promise<ApplicationListRow[]> {
+  const sql = `SELECT
+      member.name AS member_name,
+      app.id,
+      app.member_id,
+      app.submitted_at,
+      app.app_status
+    FROM applications AS app
+    LEFT JOIN members AS member
+      ON member.id = app.member_id;`
+
+  const rows: ApplicationListRow[] = await pool.query(sql);
+  return rows;
+}
+
+export async function approveApplication(id) {
+  const sql = `
+      UPDATE applications
+         SET approved_at = NOW()
+       WHERE id = ?
+        AND approved_at IS NULL
+        AND denied_at IS NULL
+      `;
+
+  const result = await pool.execute(sql, id);
+  return result;
+}
+
+export async function getApplicationComments(appID: number): Promise<CommentRow[]> {
+  return await pool.query(`SELECT app.id AS comment_id,
+          app.post_content,
+          app.poster_id,
+          app.post_time,
+          app.last_modified,
+          member.name AS poster_name
+        FROM application_comments AS app
+          INNER JOIN members AS member ON member.id = app.poster_id
+        WHERE app.application_id = ?;`,
+    [appID]);
+}

api/src/services/memberService.ts

@@ -1,8 +1,23 @@
 import pool from "../db";
 
+export enum MemberState {
+    Guest = "guest",
+    Applicant = "applicant",
+    Member = "member",
+    Retired = "retired",
+    Banned = "banned",
+    Denied = "denied"
+}
+
 export async function getUserData(userID: number) {
     const sql = `SELECT * FROM members WHERE id = ?`;
     const res = await pool.query(sql, [userID]);
     return res[0] ?? null;
 }
 
+export async function setUserState(userID: number, state: MemberState) {
+    const sql = `UPDATE members
+        SET state = ?
+        WHERE id = ?;`;
+    return await pool.query(sql, [state, userID]);
+}

api/src/services/rankService.js

@@ -1,22 +0,0 @@
-import pool from "../db";
-
-async function getAllRanks() {
-    const rows = await pool.query(
-        'SELECT id, name, short_name, sort_id FROM ranks;'
-    );
-    return rows;
-}
-
-async function insertMemberRank(change) {
-    const sql = `
-        INSERT INTO members_ranks (member_id, rank_id, event_date)
-        VALUES (?, ?, ?);
-    `;
-    const params = [change.member_id, change.rank_id, change.date];
-    await pool.query(sql, params);
-}
-
-module.exports = {
-    getAllRanks,
-    insertMemberRank
-};

api/src/services/rankService.ts

@@ -0,0 +1,32 @@
+import pool from "../db";
+
+export async function getAllRanks() {
+    const rows = await pool.query(
+        'SELECT id, name, short_name, sort_id FROM ranks;'
+    );
+    return rows;
+}
+
+export async function getRankByName(name: string) {
+    const rows = await pool.query(`SELECT id, name, short_name, sort_id FROM ranks WHERE name = ?`, [name]);
+
+    if (rows.length === 0)
+        throw new Error("Could not find rank: " + name);
+
+    return rows[0];
+}
+
+export async function insertMemberRank(member_id: number, rank_id: number, date: Date): Promise<void>;
+export async function insertMemberRank(member_id: number, rank_id: number): Promise<void>;
+
+export async function insertMemberRank(member_id: number, rank_id: number, date?: Date): Promise<void> {
+    const sql = date
+        ? `INSERT INTO members_ranks (member_id, rank_id, event_date) VALUES (?, ?, ?);`
+        : `INSERT INTO members_ranks (member_id, rank_id, event_date) VALUES (?, ?, NOW());`;
+
+    const params = date
+        ? [member_id, rank_id, date]
+        : [member_id, rank_id];
+
+    await pool.query(sql, params);
+}

api/src/services/statusService.ts

@@ -0,0 +1,6 @@
+import pool from "../db"
+
+export async function assignUserToStatus(userID: number, statusID: number) {
+    const sql = `INSERT INTO members_statuses (member_id, status_id, event_date) VALUES (?, ?, NOW())`
+    await pool.execute(sql, [userID, statusID]);
+}