2 DBs at the same time

max-ostapenko · max-ostapenko · commit eaab1bc69699 · 2025-06-03T23:47:08.000+02:00
diff --git a/src/__tests__/routes.test.js b/src/__tests__/routes.test.js
@@ -3,7 +3,7 @@ const { app } = require('../index');
 
 // Mock Firestore
 jest.mock('../utils/db', () => {
-  return {
+  const mockFirestoreInstance = {
     collection: jest.fn().mockReturnThis(),
     where: jest.fn().mockReturnThis(),
     orderBy: jest.fn().mockReturnThis(),
@@ -44,6 +44,11 @@ jest.mock('../utils/db', () => {
       }]
     })
   };
+
+  return {
+    firestore: mockFirestoreInstance,
+    firestoreOld: mockFirestoreInstance
+  };
 });
 
 describe('API Routes', () => {
diff --git a/src/controllers/adoptionController.js b/src/controllers/adoptionController.js
@@ -1,4 +1,6 @@
-const firestore = require('../utils/db');
+const { firestoreOld } = require('../utils/db');
+const firestore = firestoreOld;
+
 const { createSuccessResponse } = require('../utils/helpers');
 const {
   REQUIRED_PARAMS,
diff --git a/src/controllers/categoriesController.js b/src/controllers/categoriesController.js
@@ -1,4 +1,4 @@
-const firestore = require('../utils/db');
+const { firestore } = require('../utils/db');
 const { createSuccessResponse } = require('../utils/helpers');
 const { applyArrayFilter, selectFields, handleControllerError } = require('../utils/controllerHelpers');
 
diff --git a/src/controllers/cwvtechController.js b/src/controllers/cwvtechController.js
@@ -1,4 +1,6 @@
-const firestore = require('../utils/db');
+const { firestoreOld } = require('../utils/db');
+const firestore = firestoreOld;
+
 const { createSuccessResponse } = require('../utils/helpers');
 const {
   REQUIRED_PARAMS,
diff --git a/src/controllers/geosController.js b/src/controllers/geosController.js
@@ -1,4 +1,4 @@
-const firestore = require('../utils/db');
+const { firestore } = require('../utils/db');
 const { createSuccessResponse } = require('../utils/helpers');
 const { handleControllerError } = require('../utils/controllerHelpers');
 
diff --git a/src/controllers/lighthouseController.js b/src/controllers/lighthouseController.js
@@ -1,4 +1,6 @@
-const firestore = require('../utils/db');
+const { firestoreOld } = require('../utils/db');
+const firestore = firestoreOld;
+
 const { createSuccessResponse } = require('../utils/helpers');
 const {
   REQUIRED_PARAMS,
diff --git a/src/controllers/pageWeightController.js b/src/controllers/pageWeightController.js
@@ -1,4 +1,6 @@
-const firestore = require('../utils/db');
+const { firestoreOld } = require('../utils/db');
+const firestore = firestoreOld;
+
 const { createSuccessResponse } = require('../utils/helpers');
 const {
   REQUIRED_PARAMS,
diff --git a/src/controllers/ranksController.js b/src/controllers/ranksController.js
@@ -1,4 +1,4 @@
-const firestore = require('../utils/db');
+const { firestore } = require('../utils/db');
 const { createSuccessResponse } = require('../utils/helpers');
 const { handleControllerError } = require('../utils/controllerHelpers');
 
diff --git a/src/controllers/technologiesController.js b/src/controllers/technologiesController.js
@@ -1,4 +1,4 @@
-const firestore = require('../utils/db');
+const { firestore } = require('../utils/db');
 const { createSuccessResponse } = require('../utils/helpers');
 const { applyArrayFilter, selectFields, handleControllerError } = require('../utils/controllerHelpers');
 
diff --git a/src/controllers/versionsController.js b/src/controllers/versionsController.js
@@ -1,4 +1,4 @@
-const firestore = require('../utils/db');
+const { firestore } = require('../utils/db');
 const { createSuccessResponse } = require('../utils/helpers');
 const { applyArrayFilter, handleControllerError } = require('../utils/controllerHelpers');
 
diff --git a/src/package.json b/src/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "start": "node index.js",
-    "start:functions": "export DATABASE=tech-report-apis-prod && functions-framework --target=app",
+    "start:functions": "export DATABASE=tech-report-api-prod && functions-framework --target=app",
     "dev": "nodemon index.js",
     "test": "jest",
     "test:live": "bash ../test-api.sh"
diff --git a/src/utils/db.js b/src/utils/db.js
@@ -1,6 +1,6 @@
 const { Firestore } = require('@google-cloud/firestore');
 
-// Initialize Firestore with basic optimizations
+// Initialize Firestore with basic optimizations (default connection using env variables)
 const firestore = new Firestore({
   projectId: process.env.PROJECT,
   databaseId: process.env.DATABASE,
@@ -14,4 +14,22 @@ const firestore = new Firestore({
   }
 });
 
-module.exports = firestore;
+// Initialize production Firestore connection with hardcoded database
+const firestoreOld = new Firestore({
+  projectId: process.env.PROJECT,
+  databaseId: 'tech-report-apis-prod',
+  settings: {
+    // Enable connection pooling
+    maxIdleChannels: 10,
+    // Enable keepalive to reduce connection overhead
+    keepaliveTime: 30000,
+    keepaliveTimeout: 5000,
+    keepalivePermitWithoutCalls: true
+  }
+});
+
+// Export both connections - maintain backward compatibility
+module.exports = {
+  firestore,
+  firestoreOld
+};
diff --git a/terraform/dev/variables.tf b/terraform/dev/variables.tf
@@ -15,7 +15,7 @@ variable "environment" {
 variable "project_database" {
   type        = string
   description = "The database name"
-  default     = "tech-report-apis-prod" // TODO: Update this to the DEV database name
+  default     = "tech-report-api-prod" // TODO: Update this to the DEV database name
 }
 
 variable "google_service_account_cloud_functions" {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const firestore = require('../utils/db');`
	`1`	`+const { firestore } = require('../utils/db');`
`2`	`2`	`const { createSuccessResponse } = require('../utils/helpers');`
`3`	`3`	`const { applyArrayFilter, selectFields, handleControllerError } = require('../utils/controllerHelpers');`
`4`	`4`