Merge pull request #89 from nicolelim02/chore/refactor

Shift code into src

Author: guanquann

backend/collab-service/package.json

@@ -4,8 +4,8 @@
   "main": "server.ts",
   "type": "module",
   "scripts": {
-    "start": "tsx server.ts",
-    "dev": "tsx watch server.ts",
+    "start": "tsx src/server.ts",
+    "dev": "tsx watch src/server.ts",
     "test": "cross-env NODE_ENV=test && jest",
     "test:watch": "cross-env NODE_ENV=test && jest --watch",
     "lint": "eslint ."

backend/collab-service/app.ts renamed to backend/collab-service/src/app.ts

@@ -5,7 +5,7 @@ import yaml from "yaml";
 import swaggerUi from "swagger-ui-express";
 import cors from "cors";
 
-import collabRoutes from "./src/routes/collabRoutes.ts";
+import collabRoutes from "./routes/collabRoutes.ts";
 
 dotenv.config();
 

backend/collab-service/config/redis.ts renamed to backend/collab-service/src/config/redis.ts

@@ -1,6 +1,6 @@
 import { Socket } from "socket.io";
-import { io } from "../../server";
-import redisClient from "../../config/redis";
+import { io } from "../server";
+import redisClient from "../config/redis";
 
 enum CollabEvents {
   // Receive

backend/collab-service/src/handlers/websocketHandler.ts

@@ -1,6 +1,6 @@
 import http from "http";
 import app, { allowedOrigins } from "./app.ts";
-import { handleWebsocketCollabEvents } from "./src/handlers/websocketHandler";
+import { handleWebsocketCollabEvents } from "./handlers/websocketHandler.ts";
 import { Server } from "socket.io";
 import { connectRedis } from "./config/redis.ts";
 

backend/collab-service/server.ts renamed to backend/collab-service/src/server.ts

@@ -4,8 +4,8 @@
   "main": "server.ts",
   "type": "module",
   "scripts": {
-    "start": "tsx server.ts",
-    "dev": "tsx watch server.ts",
+    "start": "tsx src/server.ts",
+    "dev": "tsx watch src/server.ts",
     "test": "cross-env NODE_ENV=test && jest",
     "test:watch": "cross-env NODE_ENV=test && jest --watch",
     "lint": "eslint ."

backend/matching-service/package.json

@@ -5,7 +5,7 @@ import yaml from "yaml";
 import fs from "fs";
 import cors from "cors";
 
-import matchingRoutes from "./src/routes/matchingRoutes.ts";
+import matchingRoutes from "./routes/matchingRoutes.ts";
 
 dotenv.config();
 

backend/matching-service/app.ts renamed to backend/matching-service/src/app.ts

@@ -1,8 +1,8 @@
 import amqplib, { Connection } from "amqplib";
 import dotenv from "dotenv";
-import { matchUsers } from "../src/utils/mq_utils";
-import { MatchRequestItem } from "../src/handlers/matchHandler";
-import { Complexities, Categories, Languages } from "../src/utils/constants";
+import { matchUsers } from "../utils/mq_utils";
+import { MatchRequestItem } from "../handlers/matchHandler";
+import { Complexities, Categories, Languages } from "../utils/constants";
 
 dotenv.config();
 

backend/matching-service/config/rabbitmq.ts renamed to backend/matching-service/src/config/rabbitmq.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from "uuid";
-import { sendToQueue } from "../../config/rabbitmq";
+import { sendToQueue } from "../config/rabbitmq";
 import { sendMatchFound } from "./websocketHandler";
 
 interface Match {

backend/matching-service/src/handlers/matchHandler.ts

@@ -9,7 +9,7 @@ import {
   getMatchByUid,
   getMatchById,
 } from "./matchHandler";
-import { io } from "../../server";
+import { io } from "../server";
 import { v4 as uuidv4 } from "uuid";
 import { questionService } from "../utils/api";