fixed issues

backend/replace_logger.cjs

@@ -0,0 +1,42 @@
+const fs = require("fs");
+const path = require("path");
+
+const files = [
+  "src/services/sorobanService.ts",
+  "src/controllers/loanController.ts",
+  "src/services/notificationService.ts",
+  "src/services/eventIndexer.ts",
+  "src/controllers/indexerController.ts",
+  "src/services/webhookService.ts",
+  "src/services/defaultChecker.ts",
+  "src/services/scoreReconciliationService.ts",
+  "src/services/eventStreamService.ts",
+  "src/services/cacheService.ts",
+  "src/services/webhookRetryScheduler.ts",
+  "src/services/indexerManager.ts",
+  "src/services/webhookRetryProcessor.ts",
+  "src/services/scoresService.ts",
+  "src/services/remittanceService.ts",
+  "src/services/rateLimitService.ts",
+  "src/controllers/remittanceController.ts",
+  "src/controllers/poolController.ts",
+  "src/controllers/eventStreamController.ts",
+  "src/controllers/notificationController.ts",
+];
+
+for (const file of files) {
+  const filePath = path.join(__dirname, file);
+  if (!fs.existsSync(filePath)) {
+    console.error(`File not found: ${filePath}`);
+    continue;
+  }
+  let content = fs.readFileSync(filePath, "utf8");
+  // replace logger.info( -> logger.withContext().info(
+  // and so on for warn, error
+  content = content.replace(
+    /\blogger\.(info|warn|error)\s*\(/g,
+    "logger.withContext().$1(",
+  );
+  fs.writeFileSync(filePath, content, "utf8");
+  console.log(`Updated ${file}`);
+}

backend/src/__tests__/eventIndexer.test.ts

@@ -28,7 +28,9 @@ const mockLogger = {
   info: jest.fn(),
   warn: jest.fn(),
   error: jest.fn(),
+  withContext: jest.fn(),
 };
+mockLogger.withContext.mockImplementation(() => mockLogger);
 const supportedWebhookEventTypes = [
   "LoanRequested",
   "LoanApproved",

backend/src/__tests__/requestId.test.ts

@@ -1,5 +1,10 @@
 import request from "supertest";
 import app from "../app.js";
+import logger from "../utils/logger.js";
+import { jest } from "@jest/globals";
+
+import express from "express";
+import { requestIdMiddleware } from "../middleware/requestId.js";
 
 describe("Request ID middleware", () => {
   it("adds x-request-id when missing", async () => {
@@ -20,4 +25,28 @@
     expect(response.status).toBe(200);
     expect(response.headers["x-request-id"]).toBe(requestId);
   });
+
+  it("correlates logger requestId with x-request-id via withContext", async () => {
+    const tempApp = express();
+    tempApp.use(requestIdMiddleware);
+    tempApp.get("/test", (req, res) => {
+      logger.withContext().info("Testing withContext correlation");
+      res.sendStatus(200);
+    });
+
+    const infoSpy = jest
+      .spyOn(logger, "info")
+      .mockImplementation(() => logger as any);
+
+    const response = await request(tempApp).get("/test");
+    const requestId = response.headers["x-request-id"];
+
+    expect(response.status).toBe(200);
+    expect(infoSpy).toHaveBeenCalledWith(
+      "Testing withContext correlation",
+      expect.objectContaining({ requestId }),
+    );
+
+    infoSpy.mockRestore();
+  });
 });

backend/src/controllers/eventStreamController.ts

@@ -108,7 +108,9 @@ export const streamEvents = asyncHandler(
           );
         }
       } catch (err) {
-        logger.error("SSE replay fetch error", { borrower, lastEventId, err });
+        logger
+          .withContext()
+          .error("SSE replay fetch error", { borrower, lastEventId, err });
       }
 
       unsubscribe = eventStreamService.subscribeAddress(userKey, borrower, res);
@@ -135,7 +137,9 @@ export const streamEvents = asyncHandler(
           }
         }
       } catch (err) {
-        logger.error("SSE admin replay fetch error", { lastEventId, err });
+        logger
+          .withContext()
+          .error("SSE admin replay fetch error", { lastEventId, err });
       }
 
       const counts = eventStreamService.getConnectionCount();