break matching-service into sub-services

CS3219-AY2425S1 · Oct 17, 2024 · 080d28a · 080d28a
1 parent 264d472
commit 080d28a
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 2,114 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -49,15 +49,15 @@ services:
     ports:
       - 27018:27017
 
-  matching-service:
-    build: ./matching-service
+  request-service:
+    build: ./matching-service/request-service
     ports:
       - 3002:3002
     depends_on:
       - user-service
       # - question-service # maybe to retrieve information on the questions difficulties/topics
     volumes:
-      - ./matching-service:/app
+      - ./matching-service/request-service:/app
       - /app/node_modules
 
 

diff --git a/frontend-service/src/pages/MatchingPage.tsx b/frontend-service/src/pages/MatchingPage.tsx
@@ -14,7 +14,7 @@ const MatchingPage: React.FC = () => {
   const handleMatchMe = () => {
     // TODO: Make a long-poll API request to `matching-service`
     const getMatchLongPoll = () => {
-      fetch("http://localhost:3002/match-me", {
+      fetch("http://localhost:3002/find-match", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",

diff --git a/matching-service/Dockerfile → matching-service/request-service/Dockerfile b/matching-service/Dockerfile → matching-service/request-service/Dockerfile
diff --git a/matching-service/index.ts → matching-service/request-service/index.ts b/matching-service/index.ts → matching-service/request-service/index.ts
diff --git a/matching-service/package-lock.json → ...service/request-service/package-lock.json b/matching-service/package-lock.json → ...service/request-service/package-lock.json
diff --git a/matching-service/package.json → ...hing-service/request-service/package.json b/matching-service/package.json → ...hing-service/request-service/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "matching-service",
+  "name": "request-service",
   "version": "1.0.0",
   "main": "index.ts",
   "scripts": {

diff --git a/matching-service/routes/matching-route.ts → .../request-service/routes/matching-route.ts b/matching-service/routes/matching-route.ts → .../request-service/routes/matching-route.ts
@@ -2,13 +2,13 @@ import { Router } from 'express';
 
 const router = Router();
 
-router.post('/match-me', async (req, res) => {
-    // TODO: Set matchStatus of this specific user
-    // TODO: Wait for the user to be matched
-    // TODO: Return match found information
+router.post('/find-match', async (req, res) => {
+    // console.log('Authorization Header:', req.headers.authorization);
+    // console.log('Request Body:', req.body);
 
-    console.log('Authorization Header:', req.headers.authorization);
-    console.log('Request Body:', req.body);
+    // TODO: Produce a `match-event`
+
+    // TODO: Consume a `match-found-event` ==> return match-found information
 
     // Temporary code to simulate long-polling API return
     const delay = 5000;
@@ -19,6 +19,10 @@ router.post('/match-me', async (req, res) => {
     }, delay);
 });
 
+router.post('/cancel-matching', async (req, res) => {
+    // TODO: Produce a `cancel-match-event`
+})
+
 router.get('/match-status', async (req, res) => {
     // TODO: Actually pull the correct match status instead of hardcoded
     res.json({

diff --git a/matching-service/tsconfig.json → ...ing-service/request-service/tsconfig.json b/matching-service/tsconfig.json → ...ing-service/request-service/tsconfig.json
diff --git a/user-service/Dockerfile b/user-service/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY package*.json ./
 
-RUN npm ci
+RUN npm install
 
 COPY . .
 

diff --git a/user-service/controller/auth-controller.js b/user-service/controller/auth-controller.js
@@ -1,4 +1,4 @@
-import bcrypt from "bcrypt";
+import bcrypt from "bcryptjs";
 import jwt from "jsonwebtoken";
 import { findUserByEmail as _findUserByEmail } from "../model/repository.js";
 import { formatUserResponse } from "./user-controller.js";

diff --git a/user-service/controller/user-controller.js b/user-service/controller/user-controller.js
@@ -1,4 +1,4 @@
-import bcrypt from "bcrypt";
+import bcrypt from "bcryptjs";
 import { isValidObjectId } from "mongoose";
 import {
   createUser as _createUser,