blaisadmin/Arsenal_IQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chanmged app.ts based on Onyxoasis's recommendations

Browse Source
This commit is contained in:
Corey Blais
2026-04-14 14:41:13 -04:00
parent 40e43c01b1
commit be4e7e9a63
2 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/app.ts
-50
View File
@@ -172,57 +172,7 @@ const decodeJwtPayload = (token: string) => {
}; };
const ensureProfileDefaults = async (profileId: string) => { const ensureProfileDefaults = async (profileId: string) => {
<<<<<<< HEAD
await pool.query(
`UPDATE calibers
SET name = '12 Gauge - Sporting',
is_default = TRUE
WHERE profile_id = $1
AND name = '12 Gauge'
AND NOT EXISTS (
SELECT 1
FROM calibers existing
WHERE existing.profile_id = $1
AND existing.name = '12 Gauge - Sporting'
)`,
[profileId],
);
await pool.query(
`UPDATE calibers
SET name = '12 Gauge - Sporting',
is_default = TRUE
WHERE profile_id = $1
AND name = '12 Gauge Sporting'
AND NOT EXISTS (
SELECT 1
FROM calibers existing
WHERE existing.profile_id = $1
AND existing.name = '12 Gauge - Sporting'
)`,
[profileId],
);
for (const caliber of defaultCalibers) {
const caliberResult = await pool.query<CaliberRow>(
`INSERT INTO calibers (profile_id, name, is_default, is_active)
VALUES ($1, $2, TRUE, TRUE)
ON CONFLICT (profile_id, name) DO UPDATE
SET is_default = TRUE
RETURNING id, name, is_default, is_active`,
[profileId, caliber],
);
await pool.query(
`INSERT INTO ammo_inventory (profile_id, caliber_id, rounds_on_hand, cost_per_round)
VALUES ($1, $2, 0, 0)
ON CONFLICT (profile_id, caliber_id) DO NOTHING`,
[profileId, caliberResult.rows[0].id],
);
}
=======
await db.ensureProfileDefaults(profileId, defaultCalibers); await db.ensureProfileDefaults(profileId, defaultCalibers);
>>>>>>> bcd4459 (chanmged app.ts based on Onyxoasis's recommendations)
}; };
const getUserProfiles = async (userId: string) => db.getUserProfiles(userId); const getUserProfiles = async (userId: string) => db.getUserProfiles(userId);
backend/src/clients/arsenalIqClient.ts
+30
View File
@@ -243,6 +243,36 @@ export class ArsenalIqClient {
} }
async ensureProfileDefaults(profileId: string, defaultCalibers: string[]) { async ensureProfileDefaults(profileId: string, defaultCalibers: string[]) {
await this.pool.query(
`UPDATE calibers
SET name = '12 Gauge - Sporting',
is_default = TRUE
WHERE profile_id = $1
AND name = '12 Gauge'
AND NOT EXISTS (
SELECT 1
FROM calibers existing
WHERE existing.profile_id = $1
AND existing.name = '12 Gauge - Sporting'
)`,
[profileId],
);
await this.pool.query(
`UPDATE calibers
SET name = '12 Gauge - Sporting',
is_default = TRUE
WHERE profile_id = $1
AND name = '12 Gauge Sporting'
AND NOT EXISTS (
SELECT 1
FROM calibers existing
WHERE existing.profile_id = $1
AND existing.name = '12 Gauge - Sporting'
)`,
[profileId],
);
for (const caliber of defaultCalibers) { for (const caliber of defaultCalibers) {
const caliberResult = await this.pool.query<CaliberRow>( const caliberResult = await this.pool.query<CaliberRow>(
`INSERT INTO calibers (profile_id, name, is_default, is_active) `INSERT INTO calibers (profile_id, name, is_default, is_active)