Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/db/migration-state-queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ export async function backfillMigrationState(
client: ClientBase,
platformMembershipId: string,
bungieMembershipId: number | undefined,
state: MigrationState = MigrationState.Postgres,
): Promise<MigrationState> {
const result = await client.query<{ state: MigrationState }>({
name: 'backfill_migration_state',
text: `insert into migration_state (platform_membership_id, membership_id, state) VALUES ($1, $2, $3)
on conflict (platform_membership_id) do update set state = migration_state.state returning state`,
values: [platformMembershipId, bungieMembershipId, MigrationState.Postgres],
values: [platformMembershipId, bungieMembershipId, state],
});

return result.rows[0].state;
Expand Down Expand Up @@ -116,7 +117,7 @@ export async function getMigrationState(
return {
bungieMembershipId: undefined,
platformMembershipId,
state: MigrationState.Stately,
state: MigrationState.Postgres,
lastStateChangeAt: 0,
attemptCount: 0,
};
Expand Down
9 changes: 7 additions & 2 deletions api/stately/init/stately-backfill.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import fs from 'node:fs/promises';
import { DatabaseError } from 'pg-protocol';
import { closeDbPool, transaction } from '../../db/index.js';
import { addLoadoutShareIgnoring } from '../../db/loadout-share-queries.js';
import { backfillMigrationState } from '../../db/migration-state-queries.js';
import { backfillMigrationState, MigrationState } from '../../db/migration-state-queries.js';
import { getSettings, replaceSettings } from '../../db/settings-queries.js';
import { Loadout } from '../../shapes/loadouts.js';
import { defaultSettings } from '../../shapes/settings.js';
Expand Down Expand Up @@ -312,7 +312,12 @@ async function runSegment(segmentIndex: number, totalSegments: number, workerCou
await withRetry(`${logPrefix} Backfill migration states`, async () => {
await transaction(async (pgClient) => {
for (const profileId of items) {
await backfillMigrationState(pgClient, profileId.toString(), undefined);
await backfillMigrationState(
pgClient,
profileId.toString(),
undefined,
MigrationState.Stately,
);
}
});
});
Expand Down
Loading