Refactored rank change logic

api/routes/ranks.js

@@ -1,20 +1,15 @@
 const express = require('express');
 const r = express.Router();
 const ur = express.Router();
-
+const { getAllRanks, insertMemberRank } = require('../services/rankService')
 const pool = require('../db');
 
 //insert a new latest rank for a user
-ur.post('/', async (req, res) => {
+ur.post('/', async (req, res) => {3
     try {
         const change = req.body?.change;
         console.log(change);
-
+        await insertMemberRank(change);
-        const sql = `INSERT INTO members_ranks (member_id, rank_id, event_date) VALUES (?, ?, ?);`;
-
-        const params = [change.member_id, change.rank_id, change.event_date]
-
-        await pool.query(sql, params);
 
         res.sendStatus(201);
     } catch (err) {
@@ -26,8 +21,9 @@ ur.post('/', async (req, res) => {
 //get all ranks
 r.get('/', async (req, res) => {
     try {
-        const result = await pool.query('SELECT id, name, short_name, sort_id FROM ranks;');
+        const ranks = await getAllRanks();
-        res.json(result);
+        console.log(ranks);
+        res.json(ranks);
     } catch (err) {
         console.error(err);
         res.status(500).json({ error: 'Internal server error' });

api/services/rankService.js

@@ -0,0 +1,23 @@
+const pool = require('../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 (?, ?, ?);
+    `;
+    console.log(change)
+    const params = [change.member_id, change.rank_id, change.event_date];
+    await pool.query(sql, params);
+}
+
+module.exports = {
+    getAllRanks,
+    insertMemberRank
+};

ui/src/api/rank.ts

@@ -20,13 +20,13 @@ export async function getRanks(): Promise<Rank[]> {
 }
 
 // Placeholder: submit a rank change
-export async function submitRankChange(memberId: number, rankId: number, date: string): Promise<{ ok: boolean }> {
+export async function submitRankChange(member_id: number, rank_id: number, date: string): Promise<{ ok: boolean }> {
-  const res = await fetch(`${addr}/rank`, {
+  const res = await fetch(`${addr}/memberRanks`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify({ memberId, rankId, date }),
+    body: JSON.stringify({ change: { member_id, rank_id, date } }),
   })
 
   if (res.ok) {