Bugfix/prisma client initialization in admin service (#6764)

* Fix prisma client initialization

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

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

package-lock.json

@@ -40097,6 +40097,15 @@
         "sax": "^1.2.4"
       }
     },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",