wrap database insertion into transactions

This commit is contained in:
2023-08-13 11:43:46 +02:00
parent 5e854191d7
commit c5051e5387
2 changed files with 160 additions and 129 deletions
+8 -13
View File
@@ -140,26 +140,21 @@ router.post(
} }
let attacker_loadout: number | undefined; let attacker_loadout: number | undefined;
let victim_loadout: number | undefined; let victim_loadout: number | undefined;
await db.transaction().execute(async (trx) => {
await checkUpdateOrCreatePlayer( await checkUpdateOrCreatePlayer(
{ id: attacker_id, name: attackerData.name }, { id: attacker_id, name: attackerData.name });
trx
);
await checkUpdateOrCreatePlayer( await checkUpdateOrCreatePlayer(
{ id: victim_id, name: victimData.name }, { id: victim_id, name: victimData.name }
trx
); );
await checkOrCreateWeapon(cause_of_death, trx); await checkOrCreateWeapon(cause_of_death);
await checkOrCreateWeapon(attackerData.current_weapon.id, trx); await checkOrCreateWeapon(attackerData.current_weapon.id);
await checkOrCreateWeapon(victimData.current_weapon.id, trx); await checkOrCreateWeapon(victimData.current_weapon.id);
await checkOrCreateLoadout(attackerData.loadout, trx).then( await checkOrCreateLoadout(attackerData.loadout).then(
(e) => (attacker_loadout = e) (e) => (attacker_loadout = e)
); );
await checkOrCreateLoadout(victimData.loadout, trx).then( await checkOrCreateLoadout(victimData.loadout).then(
(e) => (victim_loadout = e) (e) => (victim_loadout = e)
); );
});
if (attacker_loadout === undefined) { if (attacker_loadout === undefined) {
throw new Error("attacker_loadout is undefined"); throw new Error("attacker_loadout is undefined");
} }
+52 -16
View File
@@ -1,12 +1,16 @@
import { Kysely, Transaction } from 'kysely'; import { Kysely, Transaction } from "kysely";
import db from "./db"; import db from "./db";
import Database from './db/model'; import Database from "./db/model";
import { LoadoutKillData } from "./types"; import { LoadoutKillData } from "./types";
export async function checkUpdateOrCreatePlayer(data: { export async function checkUpdateOrCreatePlayer(data: {
id: number; id: number;
name: string; name: string;
}, trx : Kysely<Database> | Transaction<Database>) { }) {
await db
.transaction()
.setIsolationLevel("serializable")
.execute(async (trx) => {
const player = await trx const player = await trx
.selectFrom("ToneAPI_v3.player") .selectFrom("ToneAPI_v3.player")
.select(["player_name"]) .select(["player_name"])
@@ -27,9 +31,14 @@ export async function checkUpdateOrCreatePlayer(data: {
.where("ToneAPI_v3.player.player_id", "=", data.id) .where("ToneAPI_v3.player.player_id", "=", data.id)
.execute(); .execute();
} }
});
} }
export async function checkOrCreateWeapon(weapon_id: string, trx : Kysely<Database> | Transaction<Database>) { export async function checkOrCreateWeapon(weapon_id: string) {
await db
.transaction()
.setIsolationLevel("serializable")
.execute(async (trx) => {
const weapon = await trx const weapon = await trx
.selectFrom("ToneAPI_v3.weapon") .selectFrom("ToneAPI_v3.weapon")
.select("ToneAPI_v3.weapon.weapon_id") .select("ToneAPI_v3.weapon.weapon_id")
@@ -43,13 +52,18 @@ export async function checkOrCreateWeapon(weapon_id: string, trx : Kysely<Databa
}) })
.execute(); .execute();
} }
});
} }
export async function checkOrCreateWeaponMods(weapon_mods: { export async function checkOrCreateWeaponMods(weapon_mods: {
id: string; id: string;
mods: number; mods: number;
}, trx : Kysely<Database> | Transaction<Database>) { }) {
await checkOrCreateWeapon(weapon_mods.id, trx); await checkOrCreateWeapon(weapon_mods.id);
await db
.transaction()
.setIsolationLevel("serializable")
.execute(async (trx) => {
const weaponMods = await trx const weaponMods = await trx
.selectFrom("ToneAPI_v3.mods_on_weapon") .selectFrom("ToneAPI_v3.mods_on_weapon")
.select("ToneAPI_v3.mods_on_weapon.mod_id") .select("ToneAPI_v3.mods_on_weapon.mod_id")
@@ -66,12 +80,17 @@ export async function checkOrCreateWeaponMods(weapon_mods: {
}) })
.execute(); .execute();
} }
});
} }
export async function checkOrCreateTitan(titan_id: string | null, trx : Kysely<Database> | Transaction<Database>) { export async function checkOrCreateTitan(titan_id: string | null) {
if (titan_id == null) { if (titan_id == null) {
return; return;
} }
await db
.transaction()
.setIsolationLevel("serializable")
.execute(async (trx) => {
const titan = await trx const titan = await trx
.selectFrom("ToneAPI_v3.titan_chassis") .selectFrom("ToneAPI_v3.titan_chassis")
.select("ToneAPI_v3.titan_chassis.titan_id") .select("ToneAPI_v3.titan_chassis.titan_id")
@@ -85,9 +104,14 @@ export async function checkOrCreateTitan(titan_id: string | null, trx : Kysely<D
}) })
.execute(); .execute();
} }
});
} }
export async function checkOrCreateLoadout(loadoutData: LoadoutKillData, trx : Kysely<Database> | Transaction<Database>) { export async function checkOrCreateLoadout(loadoutData: LoadoutKillData) {
const loadout = await db
.transaction()
.setIsolationLevel("serializable")
.execute(async (trx) => {
let loadout = await trx let loadout = await trx
.selectFrom("ToneAPI_v3.loadout") .selectFrom("ToneAPI_v3.loadout")
.select("ToneAPI_v3.loadout.loadout_id") .select("ToneAPI_v3.loadout.loadout_id")
@@ -97,26 +121,34 @@ export async function checkOrCreateLoadout(loadoutData: LoadoutKillData, trx : K
.where("secondary_mod_id", "=", loadoutData.secondary?.mods ?? null) .where("secondary_mod_id", "=", loadoutData.secondary?.mods ?? null)
.where("anti_titan_weapon", "=", loadoutData.anti_titan?.id ?? null) .where("anti_titan_weapon", "=", loadoutData.anti_titan?.id ?? null)
.where("anti_titan_mod_id", "=", loadoutData.anti_titan?.mods ?? null) .where("anti_titan_mod_id", "=", loadoutData.anti_titan?.mods ?? null)
.where("ToneAPI_v3.loadout.ordnance", "=", loadoutData.ordnance?.id ?? null) .where(
.where("ToneAPI_v3.loadout.tactical", "=", loadoutData.tactical?.id ?? null) "ToneAPI_v3.loadout.ordnance",
"=",
loadoutData.ordnance?.id ?? null
)
.where(
"ToneAPI_v3.loadout.tactical",
"=",
loadoutData.tactical?.id ?? null
)
.where("ToneAPI_v3.loadout.pilot_passive_1", "=", loadoutData.passive1) .where("ToneAPI_v3.loadout.pilot_passive_1", "=", loadoutData.passive1)
.where("ToneAPI_v3.loadout.pilot_passive_2", "=", loadoutData.passive2) .where("ToneAPI_v3.loadout.pilot_passive_2", "=", loadoutData.passive2)
.where("ToneAPI_v3.loadout.titan_id", "=", loadoutData.titan) .where("ToneAPI_v3.loadout.titan_id", "=", loadoutData.titan)
.executeTakeFirst(); .executeTakeFirst();
if (!loadout) { if (!loadout) {
if (loadoutData.primary !== null) { if (loadoutData.primary !== null) {
await checkOrCreateWeaponMods(loadoutData.primary, trx); await checkOrCreateWeaponMods(loadoutData.primary);
} }
if (loadoutData.secondary !== null) { if (loadoutData.secondary !== null) {
await checkOrCreateWeaponMods(loadoutData.secondary, trx); await checkOrCreateWeaponMods(loadoutData.secondary);
} }
if (loadoutData.anti_titan !== null) { if (loadoutData.anti_titan !== null) {
await checkOrCreateWeaponMods(loadoutData.anti_titan, trx); await checkOrCreateWeaponMods(loadoutData.anti_titan);
} }
if (loadoutData.ordnance !== null) { if (loadoutData.ordnance !== null) {
await checkOrCreateWeapon(loadoutData.ordnance.id, trx); await checkOrCreateWeapon(loadoutData.ordnance.id);
} }
await checkOrCreateTitan(loadoutData.titan, trx); await checkOrCreateTitan(loadoutData.titan);
const result = await trx const result = await trx
.insertInto("ToneAPI_v3.loadout") .insertInto("ToneAPI_v3.loadout")
.values({ .values({
@@ -134,7 +166,11 @@ export async function checkOrCreateLoadout(loadoutData: LoadoutKillData, trx : K
}) })
.returning("ToneAPI_v3.loadout.loadout_id") .returning("ToneAPI_v3.loadout.loadout_id")
.executeTakeFirstOrThrow(); .executeTakeFirstOrThrow();
return result.loadout_id; return result;
}
});
if (!loadout) {
throw Error("loadout is undefined");
} }
return loadout.loadout_id; return loadout.loadout_id;
} }