Skip to content
Draft
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ storybook-static/
# Automatically generated files
apollo/generated/
server/database/generated/
server/database/local/

scripts/journal-data/

Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"@azure/core-rest-pipeline": "1.22.2",
"@azure/static-web-apps-cli": "2.0.8",
"@chromatic-com/storybook": "5.0.1",
"@electric-sql/pglite": "0.3.16",
"@graphql-codegen/add": "6.0.0",
"@graphql-codegen/cli": "6.1.2",
"@graphql-codegen/client-preset": "^5.1.2",
Expand Down Expand Up @@ -133,6 +134,7 @@
"nuxt-auth-utils": "0.5.29",
"nuxt-graphql-server": "3.1.6",
"oxlint": "1.51.0",
"pglite-prisma-adapter": "0.7.2",
"postinstall-postinstall": "2.1.0",
"prettier": "3.8.1",
"prettier-plugin-organize-imports": "4.3.0",
Expand Down
142 changes: 86 additions & 56 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

13 changes: 4 additions & 9 deletions server/tsyringe.config.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,24 @@
import { PrismaPg } from '@prisma/adapter-pg'
import type { Config } from '~/config'
import { PrismaClient } from './database'
import * as DocumentResolvers from './documents/resolvers'
import { UserDocumentService } from './documents/user.document.service'
import * as GroupResolvers from './groups/resolvers'
import { GroupService } from './groups/service'
import { JournalService } from './journals/journal.service'
import * as JournalResolvers from './journals/resolvers'
import { instanceCachingFactory, register } from './tsyringe'
import { register } from './tsyringe'
import { AuthService } from './user/auth.service'
import * as UserResolvers from './user/resolvers'
import { createEmailService } from './utils/email.service'
import { createRedisClient } from './utils/services.factory'
import { createPrismaClient, createRedisClient } from './utils/services.factory'

export function configure() {
export async function configure() {
const config = useRuntimeConfig() as Config
register('Config', {
useValue: config,
})
// Tools
register('PrismaClient', {
useFactory: instanceCachingFactory(() => {
const adapter = new PrismaPg({ connectionString: config.databaseUrl })
return new PrismaClient({ adapter })
}),
useValue: await createPrismaClient(config),
})
register('RedisClient', {
useValue: createRedisClient(config),
Expand Down
21 changes: 19 additions & 2 deletions server/utils/services.factory.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
import { Environment, type Config } from '~/config'

import { PrismaPg } from '@prisma/adapter-pg'
import { createStorage, type Storage } from 'unstorage'
import memoryDriver from 'unstorage/drivers/memory'
import redisDriver from 'unstorage/drivers/redis'
import { Environment, type Config } from '~/config'
import { PrismaClient } from '~/server/database'

export async function createPrismaClient(config: Config) {
let adapter
if (config.public.environment === Environment.LocalDevelopment) {
// Use in memory database for local development
const { PGlite } = await import('@electric-sql/pglite')
const { PrismaPGlite } = await import('pglite-prisma-adapter')
const client = new PGlite('./server/database/local')
// TOOD: Create database schema and seed data
// @ts-expect-error: type mismatch
adapter = new PrismaPGlite(client)
} else {
adapter = new PrismaPg({ connectionString: config.databaseUrl })
}
return new PrismaClient({ adapter })
}

export function createRedisClient(config: Config): Storage {
if (
Expand Down
12 changes: 6 additions & 6 deletions test/global.setup.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { PrismaPg } from '@prisma/adapter-pg'
import 'dotenv/config'
import 'json-bigint-patch'
import 'reflect-metadata'
import { beforeAll, expect } from 'vitest'
import { constructConfig } from '~/config'
import { PrismaClient } from '~/server/database'
import { register } from '~/server/tsyringe'
import { registerClasses } from '~/server/tsyringe.config'
import { EmailServiceMock } from '~/server/utils/email.service'
import { createRedisClient } from '~/server/utils/services.factory'
import {
createPrismaClient,
createRedisClient,
} from '~/server/utils/services.factory'
import { GraphqlSerializer } from './snapshot.graphql'

// Register custom graphql serializer
Expand All @@ -21,7 +22,7 @@ globalThis.Reflect = Reflect
registerClasses()

// Setup services for tests
beforeAll((context) => {
beforeAll(async (context) => {
register('EmailService', { useValue: new EmailServiceMock() })

const isIntegrationTest = context.file.filepath.endsWith(
Expand All @@ -44,8 +45,7 @@ beforeAll((context) => {
useValue: redisClient,
})

const adapter = new PrismaPg({ connectionString: config.databaseUrl })
const prismaClient = new PrismaClient({ adapter })
const prismaClient = await createPrismaClient(config)
register('PrismaClient', {
useValue: prismaClient,
})
Expand Down
Loading