fix(cards): prevent concurrent default card race condition (#344) #385
+185
−54
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1,174 @@ | ||
| import type { Prisma } from '@prisma/client'; | ||
| import type { FastifyInstance } from 'fastify'; | ||
|
|
||
| type CardLinkResponse = { platformLink: unknown }; | ||
| type RawCard = { id: string; title: string; isDefault: boolean; cardLinks: CardLinkResponse[] }; | ||
| type CardResponse = { id: string; title: string; isDefault: boolean; links: unknown[] }; | ||
|
|
||
| function mapCard(card: RawCard): CardResponse { | ||
| return { | ||
| id: card.id, | ||
| title: card.title, | ||
| isDefault: card.isDefault, | ||
| links: card.cardLinks.map((cardLink) => cardLink.platformLink), | ||
| }; | ||
| } | ||
|
|
||
| export async function listCards(app: FastifyInstance, userId: string): Promise<CardResponse[]> { | ||
| const cards = (await app.prisma.card.findMany({ | ||
| where: { userId }, | ||
| take: 50, | ||
| include: { cardLinks: { include: { platformLink: true }, orderBy: { displayOrder: 'asc' } } }, | ||
| orderBy: { createdAt: 'asc' }, | ||
| })) as unknown as RawCard[]; | ||
|
|
||
| return cards.map(mapCard); | ||
| } | ||
|
|
||
| export async function createCard(app: FastifyInstance, userId: string, body: { title: string; linkIds: string[] }): Promise<CardResponse> { | ||
| if (body.linkIds.length > 0) { | ||
| const ownedLinks = await app.prisma.platformLink.findMany({ | ||
| where: { id: { in: body.linkIds }, userId }, | ||
| select: { id: true }, | ||
| }); | ||
|
|
||
| if (ownedLinks.length !== body.linkIds.length) { | ||
| throw Object.assign(new Error('Link ownership mismatch'), { code: 'OWNERSHIP' }); | ||
| } | ||
| } | ||
|
|
||
| const maxRetries = 3; | ||
| for (let attempt = 1; attempt <= maxRetries; attempt++) { | ||
| try { | ||
| const card = (await app.prisma.$transaction( | ||
| async (tx: Prisma.TransactionClient) => { | ||
| const cardCount = await tx.card.count({ where: { userId } }); | ||
|
|
||
| return tx.card.create({ | ||
| data: { | ||
| userId, | ||
| title: body.title, | ||
| isDefault: cardCount === 0, | ||
| cardLinks: { | ||
| create: body.linkIds.map((linkId, index) => ({ platformLinkId: linkId, displayOrder: index })), | ||
| }, | ||
| }, | ||
| include: { cardLinks: { include: { platformLink: true }, orderBy: { displayOrder: 'asc' } } }, | ||
| }); | ||
| }, | ||
| { | ||
| isolationLevel: 'Serializable', | ||
| }, | ||
| )) as unknown as RawCard; | ||
|
|
||
| return mapCard(card); | ||
| } catch (error: unknown) { | ||
| if ( | ||
| typeof error === 'object' && | ||
| error !== null && | ||
| 'code' in error && | ||
| (error as { code: string }).code === 'P2034' && | ||
| attempt < maxRetries | ||
| ) { | ||
| continue; | ||
| } | ||
|
|
||
| app.log.error(error); | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| throw new Error('Failed to create card after retrying serialization conflicts'); | ||
| } | ||
|
|
||
| export async function updateCard( | ||
| app: FastifyInstance, | ||
| userId: string, | ||
| id: string, | ||
| body: { title?: string; linkIds?: string[] }, | ||
| ): Promise<CardResponse | null> { | ||
| const existing = await app.prisma.card.findFirst({ where: { id, userId } }); | ||
| if (!existing) { | ||
| return null; | ||
| } | ||
|
|
||
| if (body.title) { | ||
| await app.prisma.card.update({ where: { id }, data: { title: body.title } }); | ||
| } | ||
|
|
||
| if (body.linkIds) { | ||
| if (body.linkIds.length > 0) { | ||
| const ownedLinks = await app.prisma.platformLink.findMany({ | ||
| where: { id: { in: body.linkIds }, userId }, | ||
| select: { id: true }, | ||
| }); | ||
|
|
||
| if (ownedLinks.length !== body.linkIds.length) { | ||
| throw Object.assign(new Error('Link ownership mismatch'), { code: 'OWNERSHIP' }); | ||
| } | ||
| } | ||
|
|
||
| const linkIds = body.linkIds; | ||
| await app.prisma.$transaction(async (tx: Prisma.TransactionClient) => { | ||
| await tx.cardLink.deleteMany({ where: { cardId: id } }); | ||
| if (linkIds.length > 0) { | ||
| await tx.cardLink.createMany({ | ||
| data: linkIds.map((linkId, index) => ({ cardId: id, platformLinkId: linkId, displayOrder: index })), | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| const updated = (await app.prisma.card.findUnique({ | ||
| where: { id }, | ||
| include: { cardLinks: { include: { platformLink: true }, orderBy: { displayOrder: 'asc' } } }, | ||
| })) as unknown as RawCard | null; | ||
|
|
||
| if (!updated) { | ||
| return null; | ||
| } | ||
|
|
||
| return mapCard(updated); | ||
| } | ||
|
|
||
| export async function deleteCard(app: FastifyInstance, userId: string, id: string): Promise<null> { | ||
| return await app.prisma.$transaction(async (tx: Prisma.TransactionClient) => { | ||
| const existing = await tx.card.findFirst({ where: { id, userId } }); | ||
| if (!existing) { | ||
| return Object.assign(new Error('NotFound'), { code: 'NOT_FOUND' }); | ||
| } | ||
|
|
||
| const userCardCount = await tx.card.count({ where: { userId } }); | ||
| if (userCardCount <= 1) { | ||
| return Object.assign(new Error('Cannot delete last card'), { code: 'LAST_CARD' }); | ||
| } | ||
|
|
||
| if (existing.isDefault) { | ||
| const oldestRemainingCard = await tx.card.findFirst({ | ||
| where: { userId, id: { not: id } }, | ||
| orderBy: { createdAt: 'asc' }, | ||
| }); | ||
|
|
||
| if (oldestRemainingCard) { | ||
| await tx.card.update({ where: { id: oldestRemainingCard.id }, data: { isDefault: true } }); | ||
| } | ||
| } | ||
|
|
||
| await tx.card.delete({ where: { id } }); | ||
| return null; | ||
| }); | ||
| } | ||
|
|
||
| export async function setDefaultCard(app: FastifyInstance, userId: string, id: string): Promise<{ message: string } | null> { | ||
| const existing = await app.prisma.card.findFirst({ where: { id, userId } }); | ||
| if (!existing) { | ||
| return null; | ||
| } | ||
|
|
||
| await app.prisma.$transaction(async (tx: Prisma.TransactionClient) => { | ||
| await tx.card.updateMany({ where: { userId }, data: { isDefault: false } }); | ||
| await tx.card.update({ where: { id }, data: { isDefault: true } }); | ||
| }); | ||
|
|
||
| return { message: 'Default card updated' }; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add
app.log.errorhereThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in the latest update.
Added app.log.error(error) before rethrowing unexpected failures while preserving the existing retry flow for P2034 serialization conflicts.