Merge pull request 'database-view-updates' (#67) from database-view-updates into main

Reviewed-on: #67

api/src/routes/members.js

@@ -27,7 +27,7 @@ router.get('/', async (req, res) => {
                     AND UTC_TIMESTAMP() BETWEEN l.start_date AND l.end_date
                 ) THEN 1 ELSE 0
             END AS on_loa
-            FROM view_member_rank_status_all v;`);
+            FROM view_member_rank_unit_status_latest v;`);
         return res.status(200).json(result);
     } catch (err) {
         console.error('Error fetching users:', err);
@@ -63,7 +63,7 @@ router.get('/me', async (req, res) => {
 router.get('/:id', async (req, res) => {
     try {
         const userId = req.params.id;
-        const result = await pool.query('SELECT * FROM view_member_rank_status_all WHERE id = $1;', [userId]);
+        const result = await pool.query('SELECT * FROM view_member_rank_unit_status_latest WHERE id = $1;', [userId]);
         if (result.rows.length === 0) {
             return res.status(404).json({ error: 'User not found' });
         }

api/src/routes/roles.js

@@ -49,7 +49,7 @@ r.get('/', async (req, res) => {
         const membersRoles = await con.query(`
             SELECT mr.role_id, v.*
             FROM members_roles mr
-            JOIN view_member_rank_status_all v ON mr.member_id = v.member_id
+            JOIN view_member_rank_unit_status_latest v ON mr.member_id = v.member_id
             `);
 
 

api/src/services/rankService.ts

@@ -21,8 +21,8 @@ export async function insertMemberRank(member_id: number, rank_id: number): Prom
 
 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, start_date) VALUES (?, ?, ?);`
-        : `INSERT INTO members_ranks (member_id, rank_id, event_date) VALUES (?, ?, NOW());`;
+        : `INSERT INTO members_ranks (member_id, rank_id, start_date) VALUES (?, ?, NOW());`;
 
     const params = date
         ? [member_id, rank_id, date]

api/src/services/statusService.ts

@@ -1,6 +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())`
+    const sql = `INSERT INTO members_statuses (member_id, status_id, start_date) VALUES (?, ?, NOW())`
     await pool.execute(sql, [userID, statusID]);
 }

ui/src/api/member.ts

@@ -3,6 +3,8 @@ export type Member = {
     member_name: string;
     rank: string | null;
     rank_date: string | null;
+    unit: string | null;
+    unit_date: string | null;
     status: string | null;
     status_date: string | null;
     on_loa: boolean | null;

ui/src/pages/memberList.vue

@@ -65,6 +65,7 @@ const searchedMembers = computed(() => {
                         Member
                     </TableHead>
                     <TableHead>Rank</TableHead>
+                    <TableHead>Unit</TableHead>
                     <TableHead>Status</TableHead>
                 </TableRow>
             </TableHeader>
@@ -75,6 +76,7 @@ const searchedMembers = computed(() => {
                         {{ member.member_name }}
                     </TableCell>
                     <TableCell>{{ member.rank }}</TableCell>
+                    <TableCell>{{ member.unit }}</TableCell>
                     <TableCell>{{ member.status }}</TableCell>
                     <TableCell><Badge v-if="member.on_loa">On LOA</Badge></TableCell>
                     <TableCell @click.stop="" class="text-right">