Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Outbox prisma adapter #231

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0353847
AP-5046 WIP prisma adapter.
kamilwylegala Sep 9, 2024
14fbfba
WIP prisma adapter.
kamilwylegala Sep 9, 2024
d55405e
Working test.
kamilwylegala Sep 11, 2024
e93bdad
WIP
kamilwylegala Sep 11, 2024
963014a
Working test for saving outbox entries.
kamilwylegala Nov 26, 2024
7444fab
failing test for updating.
kamilwylegala Nov 26, 2024
9c971fc
Bulk update + insert.
kamilwylegala Nov 27, 2024
5ad155f
Failed entries handling.
kamilwylegala Nov 27, 2024
d9e3d41
fetching entries up to the retry count limit.
kamilwylegala Nov 27, 2024
c61533d
Narrowed down types.
kamilwylegala Nov 27, 2024
552e0b6
lint fix
kamilwylegala Nov 27, 2024
f143384
Use generated db client from test dir.
kamilwylegala Nov 27, 2024
432875b
Build includes building test prisma client.
kamilwylegala Nov 27, 2024
ccf29a6
Fixed import.
kamilwylegala Nov 27, 2024
3f39f92
prisma main dependency.
kamilwylegala Nov 27, 2024
0b7d718
prisma client dev dependency.
kamilwylegala Nov 27, 2024
c2108e3
Build before lint.
kamilwylegala Nov 28, 2024
a7a9cb0
Ignore db client in biome.
kamilwylegala Nov 28, 2024
1b3c72c
Peer prisma.
kamilwylegala Nov 28, 2024
77b1d26
inferred type
kamilwylegala Nov 28, 2024
856ee17
debugging ci
kamilwylegala Nov 28, 2024
45d7310
keep prisma outside test folder in root
kamilwylegala Nov 28, 2024
00ca6d0
Fixed import in spec.
kamilwylegala Nov 28, 2024
33b954b
temp ts ignore.
kamilwylegala Nov 28, 2024
829c9ac
wait for db.
kamilwylegala Nov 28, 2024
1f39dbf
wait for db.
kamilwylegala Nov 28, 2024
8b818c1
wait for db.
kamilwylegala Nov 28, 2024
ab58167
Redundant docker start.
kamilwylegala Nov 28, 2024
ed4ce02
Simplified outbox entry.
kamilwylegala Jan 23, 2025
bc80d7d
Fixed tests to new version of outbox entry.
kamilwylegala Jan 23, 2025
55bdd41
Working on ModelDelegate
kamilwylegala Jan 24, 2025
01975c0
Fixed model delegate.
kamilwylegala Jan 24, 2025
0fc3e7f
Type fix.
kamilwylegala Jan 24, 2025
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
4 changes: 4 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,9 @@ jobs:
run: |
npm install --ignore-scripts

- name: Build
run: |
npm run build

- name: Run lint
run: npm run lint
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,6 @@ dist
.pnp.*
/.idea
/package-lock.json

# prisma
db-client
23 changes: 13 additions & 10 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"extends": ["./node_modules/@kibertoad/biome-config/configs/biome-package.json"],
"linter": {
"rules": {
"performance": {
"noBarrelFile": "off",
"noReExportAll": "off"
}
}
}
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"extends": ["./node_modules/@kibertoad/biome-config/configs/biome-package.json"],
"linter": {
"rules": {
"performance": {
"noBarrelFile": "off",
"noReExportAll": "off"
}
}
},
"files": {
"ignore": ["db-client"]
}
}
3 changes: 1 addition & 2 deletions packages/outbox-core/lib/objects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ export type OutboxEntryStatus = 'CREATED' | 'ACKED' | 'SUCCESS' | 'FAILED'

export type OutboxEntry<SupportedEvent extends CommonEventDefinition> = {
id: string
event: SupportedEvent
data: Omit<CommonEventDefinitionPublisherSchemaType<SupportedEvent>, 'type'>
event: CommonEventDefinitionPublisherSchemaType<SupportedEvent>
precedingMessageMetadata?: Partial<ConsumerMessageMetadataType>
status: OutboxEntryStatus
created: Date
Expand Down
13 changes: 8 additions & 5 deletions packages/outbox-core/lib/outbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
ConsumerMessageMetadataType,
DomainEventEmitter,
} from '@message-queue-toolkit/core'
import { enrichMessageSchemaWithBase } from '@message-queue-toolkit/schemas'
import { PromisePool } from '@supercharge/promise-pool'
import { uuidv7 } from 'uuidv7'
import type { OutboxAccumulator } from './accumulators'
Expand Down Expand Up @@ -50,7 +51,11 @@ export class OutboxProcessor<SupportedEvents extends CommonEventDefinition[]> {
.withConcurrency(this.outboxProcessorConfiguration.emitBatchSize)
.process(async (entry) => {
try {
await eventEmitter.emit(entry.event, entry.data, entry.precedingMessageMetadata)
const event = entry.event

const schema = { ...enrichMessageSchemaWithBase(event.type, event.payload) }

await eventEmitter.emit(schema, entry.event, entry.precedingMessageMetadata)
await outboxAccumulator.add(entry)
} catch (e) {
context.logger.error({ error: e }, 'Failed to process outbox entry.')
Expand Down Expand Up @@ -133,14 +138,12 @@ export class OutboxEventEmitter<SupportedEvents extends CommonEventDefinition[]>
* @param precedingMessageMetadata
*/
public async emit<SupportedEvent extends SupportedEvents[number]>(
supportedEvent: SupportedEvent,
data: Omit<CommonEventDefinitionPublisherSchemaType<SupportedEvent>, 'type'>,
data: CommonEventDefinitionPublisherSchemaType<SupportedEvent>,
precedingMessageMetadata?: Partial<ConsumerMessageMetadataType>,
) {
await this.storage.createEntry({
id: uuidv7(),
event: supportedEvent,
data,
event: data,
precedingMessageMetadata,
status: 'CREATED',
created: new Date(),
Expand Down
2 changes: 1 addition & 1 deletion packages/outbox-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@message-queue-toolkit/outbox-core",
"version": "0.1.0",
"version": "0.2.0",
"private": false,
"license": "MIT",
"description": "Outbox pattern implementation for message queue toolkit",
Expand Down
10 changes: 5 additions & 5 deletions packages/outbox-core/test/outbox.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ describe('outbox', () => {
})

it('saves outbox entry to storage', async () => {
await outboxEventEmitter.emit(TestEvents.created, createdEventPayload, {
await outboxEventEmitter.emit(createdEventPayload, {
correlationId: randomUUID(),
})

Expand All @@ -101,7 +101,7 @@ describe('outbox', () => {
})

it('saves outbox entry and process it', async () => {
await outboxEventEmitter.emit(TestEvents.created, createdEventPayload, {
await outboxEventEmitter.emit(createdEventPayload, {
correlationId: randomUUID(),
})

Expand Down Expand Up @@ -140,7 +140,7 @@ describe('outbox', () => {
}),
)

await outboxEventEmitter.emit(TestEvents.created, createdEventPayload, {
await outboxEventEmitter.emit(createdEventPayload, {
correlationId: randomUUID(),
})

Expand Down Expand Up @@ -184,7 +184,7 @@ describe('outbox', () => {
})

//Persist the event
await outboxEventEmitter.emit(TestEvents.created, createdEventPayload, {
await outboxEventEmitter.emit(createdEventPayload, {
correlationId: randomUUID(),
})

Expand Down Expand Up @@ -229,7 +229,7 @@ describe('outbox', () => {
it("doesn't emit event again if it's already present in accumulator", async () => {
const mockedEventEmitter = vi.spyOn(eventEmitter, 'emit')

await outboxEventEmitter.emit(TestEvents.created, createdEventPayload, {
await outboxEventEmitter.emit(createdEventPayload, {
correlationId: randomUUID(),
})

Expand Down
18 changes: 18 additions & 0 deletions packages/outbox-prisma-adapter/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# outbox-prisma-adapter

This package provides a Prisma adapter for the Outbox pattern.

### Development

#### Tests

To run the tests, you need to have a PostgreSQL database running. You can use the following command to start a PostgreSQL database using Docker:

```sh
docker-compose up -d
```

Then update Prisma client:
```sh
npx prisma generate --schema=./test/schema.prisma
```
10 changes: 10 additions & 0 deletions packages/outbox-prisma-adapter/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
services:

postgres:
image: postgres:16.2
environment:
POSTGRES_USER: prisma
POSTGRES_PASSWORD: prisma
POSTGRES_DB: prisma
ports:
- 5432:5432
1 change: 1 addition & 0 deletions packages/outbox-prisma-adapter/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './lib/outbox-prisma-adapter'
190 changes: 190 additions & 0 deletions packages/outbox-prisma-adapter/lib/outbox-prisma-adapter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
import type {
OutboxAccumulator,
OutboxEntry,
OutboxStorage,
} from '@message-queue-toolkit/outbox-core'
import type { CommonEventDefinition } from '@message-queue-toolkit/schemas'
import type { Prisma, PrismaClient } from '@prisma/client'

export type EnrichedOutboxEntry<Event extends CommonEventDefinition> = OutboxEntry<Event> & {
type: string
}

type ModelDelegate<Event extends CommonEventDefinition> = {
create: (args: { data: EnrichedOutboxEntry<Event> }) => Promise<EnrichedOutboxEntry<Event>>
findMany: (args: {
where:
| Partial<EnrichedOutboxEntry<Event>>
| {
id?: Prisma.StringFilter
retryCount?: Prisma.IntFilter
}
}) => Promise<EnrichedOutboxEntry<Event>[]>
createMany: (args: { data: EnrichedOutboxEntry<Event>[] }) => Promise<void>
updateMany: (args: {
where: {
id: {
in: string[]
}
}
data:
| Partial<OutboxEntry<Event>>
| {
retryCount?: number | Prisma.IntFieldUpdateOperationsInput
}
}) => Promise<void>
}

export class OutboxPrismaAdapter<
SupportedEvents extends CommonEventDefinition[],
ModelName extends keyof PrismaClient & string,
> implements OutboxStorage<SupportedEvents>
{
constructor(
private readonly prisma: PrismaClient,
private readonly modelName: ModelName,
) {}
Comment on lines +38 to +46
Copy link
Collaborator

@CarlosGamero CarlosGamero Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 I remember having issue with passing PrismaClient directly as a parameter on prima-utils package, I don't remember exactly the reason, but it was because the object we are using is the autogenerate one and not the default coming from the Prisma package. I fixed it by doing something like:

export class OutboxPrismaAdapter<
  SupportedEvents extends CommonEventDefinition[],
  Prisma extends PrismaClient,
  ...
> implements OutboxStorage<SupportedEvents>
{
  constructor(
    private readonly prisma: Prisma,
    private readonly modelName: ModelName,
  ) {}
...
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I am not sure if the definition of the Model name will work to have IDE autocompletion, wondering if we can make it a but more specific with something like:

type PrismaModelName<T extends PrismaClient> = {
  [K in keyof T]: T[K] extends { create: Function; findMany: Function } ? K : never
}[keyof T]

export class OutboxPrismaAdapter<
  SupportedEvents extends CommonEventDefinition[],
  Prisma extends PrismaClient,
  ModelName extends PrismaModelName<Prisma>,
> implements OutboxStorage<SupportedEvents>
{
  constructor(
    private readonly prisma: Prisma,
    private readonly modelName: ModelName,
  ) {}


createEntry(
outboxEntry: OutboxEntry<SupportedEvents[number]>,
): Promise<OutboxEntry<SupportedEvents[number]>> {
const prismaModel = this.prisma[this.modelName] as unknown as ModelDelegate<
SupportedEvents[number]
>

return prismaModel.create({
data: {
id: outboxEntry.id,
type: outboxEntry.event.type,
created: outboxEntry.created,
updated: outboxEntry.updated,
event: outboxEntry.event,
status: outboxEntry.status,
retryCount: outboxEntry.retryCount,
},
})
}

async flush(outboxAccumulator: OutboxAccumulator<SupportedEvents>): Promise<void> {
const entries = await outboxAccumulator.getEntries()
const failedEntries = await outboxAccumulator.getFailedEntries()
const prismaModel = this.prisma[this.modelName] as unknown as ModelDelegate<
SupportedEvents[number]
>

const existingEntries = await prismaModel.findMany({
where: {
id: {
in: [...entries.map((entry) => entry.id), ...failedEntries.map((entry) => entry.id)],
},
},
})

await this.prisma.$transaction(async (prisma) => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 What do you think about using prismaTransaction (from @lokalise/prisma-utils) here so we can benefit from teh retry mechanism implemented there

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I discussed it with Igor, it's kibertoad namespace, so the preference is to not depend on any lokalise pacakges.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember this conversation, but if it happened, then I disagree with Igor from the past. We use lokalise-namespaced packages liberally in node-service-template, there is nothing wrong with it, and I don't think that @lokalise/prisma-utils is coupled to our internal specifics - as long as it supports key DBs (PostgreSQL and MySQL), it should be fine to use it.
Since this is a dedicated package for prisma adapter, having prisma-related dependencies in it should be fine

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, let's use prisma utils.

Back then, it was about using @lokalise/id-utils:

#204 (comment)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, it was a slightly different case, we only needed a subset of the library, of which our id-utils is basically an opinionated wrapper

const prismaModel = prisma[this.modelName] as unknown as ModelDelegate<
SupportedEvents[number]
>
await this.handleSuccesses(prismaModel, entries, existingEntries)
await this.handleFailures(prismaModel, failedEntries, existingEntries)
})
}

private async handleSuccesses(
prismaModel: ModelDelegate<SupportedEvents[number]>,
entries: OutboxEntry<SupportedEvents[number]>[],
existingEntries: OutboxEntry<SupportedEvents[number]>[],
) {
const toCreate = entries.filter(
(entry) => !existingEntries.some((existingEntry) => existingEntry.id === entry.id),
)
const toUpdate = entries.filter((entry) =>
existingEntries.some((existingEntry) => existingEntry.id === entry.id),
)

if (toCreate.length > 0) {
await prismaModel.createMany({
data: toCreate.map((entry) => ({
id: entry.id,
type: entry.event.type,
created: entry.created,
updated: new Date(),
event: entry.event,
status: 'SUCCESS',
retryCount: entry.retryCount,
})),
})
}

if (toUpdate.length > 0) {
await prismaModel.updateMany({
where: {
id: {
in: toUpdate.map((entry) => entry.id),
},
},
data: {
status: 'SUCCESS',
updated: new Date(),
},
})
}
}

private async handleFailures(
prismaModel: ModelDelegate<SupportedEvents[number]>,
entries: OutboxEntry<SupportedEvents[number]>[],
existingEntries: OutboxEntry<SupportedEvents[number]>[],
) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 This method is almost the same as handleSuccesses wondering if we can combine them by adding another param like isSuccess

const toCreate = entries.filter(
(entry) => !existingEntries.some((existingEntry) => existingEntry.id === entry.id),
)
const toUpdate = entries.filter((entry) =>
existingEntries.some((existingEntry) => existingEntry.id === entry.id),
)

if (toCreate.length > 0) {
await prismaModel.createMany({
data: toCreate.map((entry) => ({
id: entry.id,
type: entry.event.type,
created: entry.created,
updated: new Date(),
event: entry.event,
status: 'FAILED',
retryCount: 1,
})),
})
}

if (toUpdate.length > 0) {
await prismaModel.updateMany({
where: {
id: {
in: toUpdate.map((entry) => entry.id),
},
},
data: {
status: 'FAILED',
updated: new Date(),
retryCount: {
increment: 1,
},
},
})
}
}

getEntries(maxRetryCount: number): Promise<OutboxEntry<SupportedEvents[number]>[]> {
const prismaModel = this.prisma[this.modelName] as unknown as ModelDelegate<
SupportedEvents[number]
>

return prismaModel.findMany({
where: {
retryCount: {
lte: maxRetryCount,
},
},
})
}
}
Loading
Loading