Merge pull request #262 from map-of-pi/sync-pict-changes

Self approved; retrofit Docker/ BE version changes by PiCT Tate.

Author: swoocn

.env.development

@@ -11,6 +11,9 @@ ADMIN_API_USERNAME="ADD YOUR ADMIN API USERNAME"
 ADMIN_API_PASSWORD="ADD YOUR ADMIN API PASSWORD"
 
 MONGODB_URL=mongodb://localhost:27017/demoDB
+MONGODB_MIN_POOL_SIZE=1
+MONGODB_MAX_POOL_SIZE=5
+
 SENTRY_DSN="ADD YOUR SENTRY DSN"
 
 PORT=8001

src/config/dbConnection.ts

@@ -6,10 +6,13 @@ import { env } from "../utils/env";
 export const connectDB = async () => {
   try {
     // Only log the MongoDB URL in non-production environments
-    if (process.env.NODE_ENV !== 'production') {
+    if (env.NODE_ENV !== 'production') {
       logger.info(`Connecting to MongoDB with URL: ${env.MONGODB_URL}`);
     }
-    await mongoose.connect(env.MONGODB_URL);
+    await mongoose.connect(env.MONGODB_URL, {
+      minPoolSize: env.MONGODB_MIN_POOL_SIZE,
+      maxPoolSize: env.MONGODB_MAX_POOL_SIZE
+    });
     logger.info("Successful connection to MongoDB.");
   } catch (error) {
     logger.error('Failed connection to MongoDB:', error);

src/models/Seller.ts

@@ -70,13 +70,11 @@ const sellerSchema = new Schema<ISeller>(
 );
 
 // Creating a text index on the 'name' and 'description' fields
-sellerSchema.index({ name: "text", description: "text" });
+sellerSchema.index({ 'name': 'text', 'description': 'text' });
 
 // Creating a 2dsphere index for the sell_map_center field
 sellerSchema.index({ 'sell_map_center.coordinates': '2dsphere' });
-sellerSchema.index(
-  { 'updatedAt': -1, 'sell_map_center.coordinates': '2dsphere' }
-);
+sellerSchema.index({ 'sell_map_center': '2dsphere', 'updatedAt': -1 });
 
 // Creating the Seller model from the schema
 const Seller = mongoose.model<ISeller>("Seller", sellerSchema);

src/utils/app.ts

@@ -33,9 +33,6 @@ app.use(cookieParser());
 
 // serve static files for Swagger documentation
 app.use('/api/docs', express.static(path.join(__dirname, '../config/docs')));
-app.use('/api/docs/enum', express.static(path.join(__dirname, '../config/docs/enum')));
-// Serve Swagger UI static files
-app.use('/api/docs/swagger-ui', express.static(path.join(__dirname, '../node_modules/swagger-ui-dist')));
 
 // Swagger OpenAPI documentation
 app.use("/api/docs", docRouter);

src/utils/env.ts

@@ -13,6 +13,8 @@ export const env = {
   ADMIN_API_PASSWORD: process.env.ADMIN_API_PASSWORD || '',
   UPLOAD_PATH: process.env.UPLOAD_PATH || '',
   MONGODB_URL: process.env.MONGODB_URL || '',
+  MONGODB_MIN_POOL_SIZE: Number(process.env.MONGODB_MIN_POOL_SIZE) || 1,
+  MONGODB_MAX_POOL_SIZE: Number(process.env.MONGODB_MAX_POOL_SIZE) || 5,
   SENTRY_DSN: process.env.SENTRY_DSN || '',
   CLOUDINARY_CLOUD_NAME: process.env.CLOUDINARY_CLOUD_NAME || '',
   CLOUDINARY_API_KEY: process.env.CLOUDINARY_API_KEY || '',

test/services/report.service.spec.ts

@@ -9,14 +9,15 @@ jest.mock('../../src/helpers/location', () => ({
 
 describe('reportSanctionedSellers function', () => {
   it('should build sanctioned sellers report for affected sellers', async () => {
-    ( reverseLocationDetails as jest.Mock)
+    (reverseLocationDetails as jest.Mock)
       .mockResolvedValueOnce({ data: { display_name: 'Cuba' } })
       .mockResolvedValueOnce({ data: { display_name: 'Iran' } })
       .mockResolvedValueOnce({ data: { display_name: 'North Korea' } })
       .mockResolvedValueOnce({ data: { display_name: 'Syria' } })
       .mockResolvedValueOnce({ data: { display_name: 'Republic of Crimea' } })
       .mockResolvedValueOnce({ data: { display_name: 'Donetsk Oblast' } })
-      .mockResolvedValueOnce({ data: { display_name: 'Luhansk Oblast' } });
+      .mockResolvedValueOnce({ data: { display_name: 'Luhansk Oblast' } })
+      .mockResolvedValue({ data: { display_name: 'Russia' } });
 
     const sanctionedSellers = await reportSanctionedSellers();