Merge pull request #152 from osstotalsoft/bugfix/fix-tenanct-cache-typo

fix prisma tenant cache typo + lint script
osstotalsoft · Jan 20, 2025 · 72c1aab · 72c1aab
2 parents 5694462 + 9886712
commit 72c1aab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/generators/app/templates/infrastructure/eslint.config.js b/generators/app/templates/infrastructure/eslint.config.js
@@ -1,4 +1,3 @@
-/* eslint-disable node/no-unpublished-require */
 const { fixupConfigRules } = require('@eslint/compat'),
   js = require('@eslint/js'),
   { FlatCompat } = require('@eslint/eslintrc')

diff --git a/generators/app/templates/infrastructure/package.json b/generators/app/templates/infrastructure/package.json
@@ -19,7 +19,7 @@
     "test:watchAll": "npm run test -- --watchAll",
     "test:watch": "npm run test -- --watch",
     "test:ci": "cross-env CI=true npm test -- --reporters=default --reporters=jest-junit --coverage --coverageReporters=cobertura --coverageReporters=lcov --coverageReporters=html",
-    "lint": "eslint --fix --ext .js .",
+    "lint": "eslint .",
     "prettier": "prettier --write **/*.{js,jsx,ts,tsx,css,md,json}",
     "prepack": "husky install",
     "prisma": "npx prisma db pull && npm run prisma:format && npx prisma generate",

diff --git a/generators/app/templates/infrastructure/src/prisma/client.js b/generators/app/templates/infrastructure/src/prisma/client.js
@@ -31,7 +31,7 @@ function prisma() {
       prismaClient = tenantFilterExtension(prismaClient, tenantId)
       cacheMap.set(tenantId, prismaClient)
     <%_} else { _%>
-      const connectionInfo = tenantConfiguration.getConnectionInfo(id, '<%= dbConnectionName %>')
+      const connectionInfo = tenantConfiguration.getConnectionInfo(tenantId, '<%= dbConnectionName %>')
       const { server, port, database, userName, password } = sanitizeConnectionInfo(connectionInfo)
       const url = PRISMA_DB_URL_PATTERN.replace('{server}', server)
         .replace('{port}', port)
@@ -40,7 +40,7 @@ function prisma() {
         .replace('{password}', password)
 
       prismaClient = new PrismaClient({ ...prismaOptions, datasources: { db: { url } } })
-      cacheMap.set(id, prismaClient)
+      cacheMap.set(tenantId, prismaClient)
     <%_}_%>
     } else {
       if (cacheMap.has('default')) return cacheMap.get('default')