Browse Source

Fix prisma client initialization

pull/6764/head
Thomas Kaul 1 month ago
parent
commit
278357d524
  1. 24
      apps/api/src/app/admin/admin.service.ts

24
apps/api/src/app/admin/admin.service.ts

@ -36,7 +36,6 @@ import {
BadRequestException, BadRequestException,
HttpException, HttpException,
Injectable, Injectable,
Logger,
NotFoundException NotFoundException
} from '@nestjs/common'; } from '@nestjs/common';
import { import {
@ -44,7 +43,6 @@ import {
AssetSubClass, AssetSubClass,
DataSource, DataSource,
Prisma, Prisma,
PrismaClient,
Property, Property,
SymbolProfile SymbolProfile
} from '@prisma/client'; } from '@prisma/client';
@ -280,7 +278,6 @@ export class AdminService {
const extendedPrismaClient = this.getExtendedPrismaClient(); const extendedPrismaClient = this.getExtendedPrismaClient();
try {
const symbolProfileResult = await Promise.all([ const symbolProfileResult = await Promise.all([
extendedPrismaClient.symbolProfile.findMany({ extendedPrismaClient.symbolProfile.findMany({
skip, skip,
@ -392,9 +389,8 @@ export class AdminService {
SymbolProfileOverrides.assetSubClass ?? assetSubClass; SymbolProfileOverrides.assetSubClass ?? assetSubClass;
if ( if (
( (SymbolProfileOverrides.countries as unknown as Prisma.JsonArray)
SymbolProfileOverrides.countries as unknown as Prisma.JsonArray ?.length > 0
)?.length > 0
) { ) {
countriesCount = ( countriesCount = (
SymbolProfileOverrides.countries as unknown as Prisma.JsonArray SymbolProfileOverrides.countries as unknown as Prisma.JsonArray
@ -404,8 +400,8 @@ export class AdminService {
name = SymbolProfileOverrides.name ?? name; name = SymbolProfileOverrides.name ?? name;
if ( if (
(SymbolProfileOverrides.sectors as unknown as Sector[]) (SymbolProfileOverrides.sectors as unknown as Sector[])?.length >
?.length > 0 0
) { ) {
sectorsCount = ( sectorsCount = (
SymbolProfileOverrides.sectors as unknown as Prisma.JsonArray SymbolProfileOverrides.sectors as unknown as Prisma.JsonArray
@ -429,8 +425,7 @@ export class AdminService {
sectorsCount, sectorsCount,
activitiesCount: _count.activities, activitiesCount: _count.activities,
date: activities?.[0]?.date, date: activities?.[0]?.date,
isUsedByUsersWithSubscription: isUsedByUsersWithSubscription: await isUsedByUsersWithSubscription,
await isUsedByUsersWithSubscription,
watchedByCount: _count.watchedBy watchedByCount: _count.watchedBy
}; };
} }
@ -455,11 +450,6 @@ export class AdminService {
count, count,
marketData marketData
}; };
} finally {
await extendedPrismaClient.$disconnect();
Logger.debug('Disconnect extended prisma client', 'AdminService');
}
} }
public async getMarketDataBySymbol({ public async getMarketDataBySymbol({
@ -704,8 +694,6 @@ export class AdminService {
} }
private getExtendedPrismaClient() { private getExtendedPrismaClient() {
Logger.debug('Connect extended prisma client', 'AdminService');
const symbolProfileExtension = Prisma.defineExtension((client) => { const symbolProfileExtension = Prisma.defineExtension((client) => {
return client.$extends({ return client.$extends({
result: { result: {
@ -746,7 +734,7 @@ export class AdminService {
}); });
}); });
return new PrismaClient().$extends(symbolProfileExtension); return this.prismaService.$extends(symbolProfileExtension);
} }
private async getMarketDataForCurrencies(): Promise<AdminMarketData> { private async getMarketDataForCurrencies(): Promise<AdminMarketData> {

Loading…
Cancel
Save