Merge pull request #13 from ChangePlusPlusVandy/setup/dev-setup

Setup/dev setup

Author: ashrit-ram-anala

backend/__tests__/controllers/organizationController.test.ts

@@ -50,6 +50,10 @@ jest.mock('firebase-admin', () => ({
   }),
 }));
 
+jest.mock('../../config/prisma', () => ({
+  prisma: prismaMock,
+}));
+
 import {
   getAllOrganizations,
   registerOrganization,

backend/__tests__/setup/prisma-mock.ts

@@ -8,6 +8,10 @@ jest.mock('@prisma/client', () => ({
   PrismaClient: jest.fn().mockImplementation(() => prismaMock),
 }));
 
+jest.mock('../../config/prisma', () => ({
+  prisma: prismaMock,
+}));
+
 beforeEach(() => {
   mockReset(prismaMock);
 });

backend/app.ts

@@ -1,10 +1,9 @@
 import express from 'express';
 import cors from 'cors';
-import { PrismaClient } from '@prisma/client';
 import organizationRoutes from './routes/organizationRoutes';
+import { prisma } from './config/prisma';
 
 const app = express();
-const prisma = new PrismaClient();
 
 app.use(cors());
 app.use(express.json());

backend/config/database.ts

@@ -0,0 +1,8 @@
+import { PrismaClient } from '@prisma/client';
+
+const globalPrisma = global as unknown as { prisma: PrismaClient };
+export const prisma = globalPrisma.prisma || new PrismaClient();
+
+if (process.env.NODE_ENV !== 'production') {
+  globalPrisma.prisma = prisma;
+}

backend/config/prisma.ts

@@ -1,15 +1,13 @@
 import { Request, Response } from 'express';
 import {
-  PrismaClient,
   OrganizationRole,
   OrganizationStatus,
   TennesseeRegion,
   OrganizationSize,
 } from '@prisma/client';
 import { AuthenticatedRequest } from '../types/index.js';
 import admin from 'firebase-admin';
-
-const prisma = new PrismaClient();
+import { prisma } from '../config/prisma.js';
 
 /**
  * @desc    Get all organizations with optional search/filter

backend/config/sendgrid.ts

@@ -12,7 +12,7 @@ export default {
       },
     ],
   },
-  moduleNameMapping: {
+  moduleNameMapper: {
     '^(\\.{1,2}/.*)\\.js$': '$1',
   },
   setupFilesAfterEnv: ['<rootDir>/__tests__/setup/prisma-mock.ts'],

backend/controllers/organizationController.ts

@@ -4,10 +4,10 @@
   "type": "module",
   "main": "server.ts",
   "scripts": {
-    "dev": "tsx server.ts",
+    "dev": "NODE_ENV=development tsx server.ts",
     "build": "tsc",
-    "start": "node dist/server.js",
-    "test": "jest",
+    "start": "NODE_ENV=production node dist/server.js",
+    "test": "NODE_ENV=test jest",
     "format": "prettier --write \"**/*.{ts,tsx,js,json,md}\"",
     "format:check": "prettier --check \"**/*.{ts,tsx,js,json,md}\""
   },

backend/jest.config.js

@@ -1,3 +1 @@
-import { PrismaClient } from '@prisma/client';
-
-const prisma = new PrismaClient();
+import { prisma } from '../config/prisma';