Update database configuration in .env.example and refactor Database i…

…nitialization to support JAWSDB_URL
austenstone · Nov 27, 2024 · d08a169 · d08a169
1 parent 9a8c2c3
commit d08a169
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/backend/src/app.ts b/backend/src/app.ts
@@ -123,13 +123,7 @@ const e = express();
 const app = new App(
   e,
   port,
-  new Database({
-    dialect: 'mysql',
-    logging: (sql) => logger.debug(sql),
-    timezone: '+00:00', // Force UTC timezone
-    dialectOptions: {
-      timezone: '+00:00' // Force UTC for MySQL connection
-    },
+  new Database(process.env.JAWSDB_URL ? process.env.JAWSDB_URL : {
     host: process.env.MYSQL_HOST,
     port: Number(process.env.MYSQL_PORT) || 3306,
     username: process.env.MYSQL_USER,

diff --git a/backend/src/database.ts b/backend/src/database.ts
@@ -14,11 +14,11 @@ class Database {
   sequelize?: Sequelize;
   options: Options = {
     dialect: 'mysql',
-    logging: (...sql) => logger.debug(sql),
+    logging: (sql) => logger.debug(sql),
     timezone: '+00:00', // Force UTC timezone
     dialectOptions: {
       timezone: '+00:00' // Force UTC for MySQL connection
-    }
+    },
   }
   input: string | Options;
 

diff --git a/backend/src/services/copilot.seats.service.ts b/backend/src/services/copilot.seats.service.ts
@@ -31,8 +31,7 @@ class SeatsService {
       attributes: [[Sequelize.fn('MAX', Sequelize.col('queryAt')), 'queryAt']],
       where: {
         ...(org ? { org } : {}),
-      },
-      raw: true
+      }
     });
 
     return Seat.findAll({