add mock for typeormAnalyzer

b310-digital · Dec 23, 2024 · dc68bc1 · dc68bc1
1 parent 9ecabd9
commit dc68bc1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/teammapper-backend/src/database/typeorm-analyzer.ts b/teammapper-backend/src/database/typeorm-analyzer.ts
@@ -81,13 +81,8 @@ Query Patterns:
 
         // Analyze query patterns
         const queryPatterns = new Map<string, number>();
-        this.queryLog.forEach(log => {
-            // Simplify query by removing specific values
-            const pattern = log.query.replace(/\b\d+\b/g, 'N')
-                                  .replace(/'[^']*'/g, '?')
-                                  .replace(/"[^"]*"/g, '?');
-
-            queryPatterns.set(pattern, (queryPatterns.get(pattern) || 0) + 1);
+        this.queryLog.forEach(log => {            
+            queryPatterns.set(log.query, (queryPatterns.get(log.query) || 0) + 1);
         });
 
         // Sort patterns by frequency

diff --git a/teammapper-backend/src/map/services/maps.service.spec.ts b/teammapper-backend/src/map/services/maps.service.spec.ts
@@ -14,18 +14,23 @@ import {
 import { mapMmpNodeToClient } from '../utils/clientServerMapping'
 import { truncateDatabase } from 'test/helper'
 import { jest } from '@jest/globals'
+import { TypeORMAnalyzerService } from 'src/database/typeorm-analyzer.service'
 
 describe('MapsController', () => {
   let mapsService: MapsService
   let nodesRepo: Repository<MmpNode>
   let mapsRepo: Repository<MmpMap>
   let moduleFixture: TestingModule
+  let typeormAnalyzer: jest.Mocked<TypeORMAnalyzerService>
 
   beforeAll(async () => {
     // Calling advanceTimers here is very important, as otherwise async ops like await will hang indefinitely
     // Ref: https://jestjs.io/docs/jest-object#jestusefaketimersfaketimersconfig
     jest.useFakeTimers({ advanceTimers: true })
 
+    typeormAnalyzer = {
+    } as jest.Mocked<TypeORMAnalyzerService>
+
     moduleFixture = await Test.createTestingModule({
       imports: [
         ConfigModule,
@@ -41,7 +46,7 @@ describe('MapsController', () => {
       getRepositoryToken(MmpNode)
     )
 
-    mapsService = new MapsService(nodesRepo, mapsRepo)
+    mapsService = new MapsService(nodesRepo, mapsRepo, typeormAnalyzer)
   })
 
   afterAll(async () => {

diff --git a/teammapper-backend/src/map/services/maps.service.ts b/teammapper-backend/src/map/services/maps.service.ts
@@ -294,6 +294,8 @@ export class MapsService {
         await callbacks[key](changes);
       }
     }));
+
+    this.typeormAnalyzer.logAnalysis();
   }
 
   async updateMapOptions(
-Original file line number
+Diff line change
@@ Expand Up / @@ -294,6 +294,8 @@ export class MapsService { @@
             await callbacks[key](changes);
           }
         }));
+        this.typeormAnalyzer.logAnalysis();
       }
       async updateMapOptions(
@@ Expand Down @@