From b921aa382f3e9aa9340b9d3706eaf8b5c7387bd1 Mon Sep 17 00:00:00 2001 From: Calvin Secrest Date: Sun, 31 Aug 2025 23:16:05 -0400 Subject: [PATCH] fix: remove top-level return and align federation sync --- .../federation/__tests__/federationSyncJob.test.js | 2 +- backend/federation/federationSyncJob.js | 2 +- backend/server.js | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/backend/federation/__tests__/federationSyncJob.test.js b/backend/federation/__tests__/federationSyncJob.test.js index ca76235..d4aa90f 100644 --- a/backend/federation/__tests__/federationSyncJob.test.js +++ b/backend/federation/__tests__/federationSyncJob.test.js @@ -7,7 +7,7 @@ jest.mock('../../lib/dynamodbClient', () => ({ const http = require('../../lib/httpClient'); const dynamodbClient = require('../../lib/dynamodbClient'); -const { runFederationSync } = require('../federationSyncJob'); +const runFederationSync = require('../federationSyncJob'); describe('runFederationSync', () => { beforeEach(() => { diff --git a/backend/federation/federationSyncJob.js b/backend/federation/federationSyncJob.js index 34bb283..4c1e748 100644 --- a/backend/federation/federationSyncJob.js +++ b/backend/federation/federationSyncJob.js @@ -47,4 +47,4 @@ const runFederationSync = async () => { // Run every 6 hours setInterval(runFederationSync, 6 * 60 * 60 * 1000); // 6 hours -module.exports = { runFederationSync }; +module.exports = runFederationSync; diff --git a/backend/server.js b/backend/server.js index f183f6b..7dcd167 100644 --- a/backend/server.js +++ b/backend/server.js @@ -2,7 +2,8 @@ let express, cors; try { express = require('express'); cors = require('cors'); -} catch (err) { +} catch (err) {} +if (!express) { const http = require('http'); try { require('dotenv').config(); } catch {} const server = http.createServer((req, res) => { @@ -17,10 +18,9 @@ try { const PORT = process.env.PORT || 5000; server.listen(PORT, () => console.log(`Server running on port ${PORT}`)); module.exports = { app: null, server }; - return; -} -const http = require('http'); -try { require('dotenv').config(); } catch {} +} else { + const http = require('http'); + try { require('dotenv').config(); } catch {} const path = require("path"); const authMiddleware = require("./middleware/authMiddleware"); @@ -210,3 +210,4 @@ if (require.main === module) { } module.exports = { app, server }; +}