Merge pull request #10 from PFConnect/main

Added vatsim rating display

Author: 1ceit

.env.example

@@ -14,4 +14,9 @@ JWT_SECRET=
 CEPHIE_API_KEY=
 
 DEBUG=true
-PORT=9901
+PORT=9901
+
+# VATSIM OAuth
+VATSIM_CLIENT_ID=
+VATSIM_CLIENT_SECRET=
+VATSIM_REDIRECT_URI=http://localhost:5173/login/vatsim/callback

public/assets/images/vatsim.svg

@@ -1044,6 +1044,11 @@ export async function getPublicPilotProfile(username) {
             u.discriminator,
             u.avatar,
             u.roblox_username,
+            u.roblox_user_id,
+            u.vatsim_cid,
+            u.vatsim_rating_id,
+            u.vatsim_rating_short,
+            u.vatsim_rating_long,
             u.created_at
         FROM users u
         WHERE LOWER(u.username) = LOWER($1)
@@ -1055,6 +1060,16 @@ export async function getPublicPilotProfile(username) {
 
     const user = userResult.rows[0];
 
+    // Fallback: derive short rating from numeric id if not stored as text
+    let vatsimShort = user.vatsim_rating_short;
+    if (!vatsimShort && (typeof user.vatsim_rating_id === 'number' || typeof user.vatsim_rating_id === 'string')) {
+        const ratingIdNum = typeof user.vatsim_rating_id === 'number' ? user.vatsim_rating_id : parseInt(user.vatsim_rating_id, 10);
+        const map = { 0: 'OBS', 1: 'S1', 2: 'S2', 3: 'S3', 4: 'C1', 5: 'C2', 6: 'C3', 7: 'I1', 8: 'I2', 9: 'I3', 10: 'SUP', 11: 'ADM' };
+        if (Number.isFinite(ratingIdNum) && Object.prototype.hasOwnProperty.call(map, ratingIdNum)) {
+            vatsimShort = map[ratingIdNum];
+        }
+    }
+
     const rolesResult = await pool.query(`
         SELECT r.id, r.name, r.description, r.color, r.icon, r.priority
         FROM roles r
@@ -1102,6 +1117,10 @@ export async function getPublicPilotProfile(username) {
             discriminator: user.discriminator,
             avatar: user.avatar,
             roblox_username: user.roblox_username,
+            roblox_user_id: user.roblox_user_id,
+            vatsim_cid: user.vatsim_cid,
+            vatsim_rating_short: vatsimShort,
+            vatsim_rating_long: user.vatsim_rating_long,
             member_since: user.created_at,
             is_admin: isAdmin(user.id),
             roles: rolesResult.rows,

server/db/logbook.js

@@ -30,10 +30,21 @@ async function initializeUsersTable() {
                     settings_updated_at TIMESTAMP DEFAULT NOW(),
                     total_sessions_created INTEGER DEFAULT 0,
                     total_minutes INTEGER DEFAULT 0,
+                    -- VATSIM linkage
+                    vatsim_cid VARCHAR(16),
+                    vatsim_rating_id INTEGER,
+                    vatsim_rating_short VARCHAR(8),
+                    vatsim_rating_long VARCHAR(32),
                     created_at TIMESTAMP DEFAULT NOW(),
                     updated_at TIMESTAMP DEFAULT NOW()
                 )
             `);
+        } else {
+            // Ensure VATSIM columns exist on existing installations
+            await pool.query("ALTER TABLE users ADD COLUMN IF NOT EXISTS vatsim_cid VARCHAR(16)");
+            await pool.query("ALTER TABLE users ADD COLUMN IF NOT EXISTS vatsim_rating_id INTEGER");
+            await pool.query("ALTER TABLE users ADD COLUMN IF NOT EXISTS vatsim_rating_short VARCHAR(8)");
+            await pool.query("ALTER TABLE users ADD COLUMN IF NOT EXISTS vatsim_rating_long VARCHAR(32)");
         }
     } catch (error) {
         console.error('Error initializing users table:', error);
@@ -310,7 +321,12 @@ export async function getUserById(id) {
             roleName: user.role_name,
             rolePermissions: rolePermissions,
             robloxUserId: user.roblox_user_id,
-            robloxUsername: user.roblox_username
+            robloxUsername: user.roblox_username,
+            // VATSIM linkage
+            vatsimCid: user.vatsim_cid,
+            vatsimRatingId: user.vatsim_rating_id,
+            vatsimRatingShort: user.vatsim_rating_short,
+            vatsimRatingLong: user.vatsim_rating_long
         };
     } catch (error) {
         console.error('Error fetching user:', error);
@@ -406,6 +422,44 @@ export async function unlinkRobloxAccount(userId) {
     }
 }
 
+export async function updateVatsimAccount(userId, { vatsimCid, ratingId, ratingShort, ratingLong }) {
+    try {
+        await pool.query(`
+            UPDATE users SET
+                vatsim_cid = $2,
+                vatsim_rating_id = $3,
+                vatsim_rating_short = $4,
+                vatsim_rating_long = $5,
+                updated_at = NOW()
+            WHERE id = $1
+        `, [userId, vatsimCid, ratingId, ratingShort, ratingLong]);
+
+        return await getUserById(userId);
+    } catch (error) {
+        console.error('Error updating VATSIM account:', error);
+        throw error;
+    }
+}
+
+export async function unlinkVatsimAccount(userId) {
+    try {
+        await pool.query(`
+            UPDATE users SET
+                vatsim_cid = NULL,
+                vatsim_rating_id = NULL,
+                vatsim_rating_short = NULL,
+                vatsim_rating_long = NULL,
+                updated_at = NOW()
+            WHERE id = $1
+        `, [userId]);
+
+        return await getUserById(userId);
+    } catch (error) {
+        console.error('Error unlinking VATSIM account:', error);
+        throw error;
+    }
+}
+
 initializeUsersTable();
 
-export { initializeUsersTable };
+export { initializeUsersTable };