Merge pull request #62 from CS3219-AY2425S1/feat/matching-service

Implement matching service

Author: Kurtyjlee

docker-compose.prod.yml

@@ -1,4 +1,11 @@
 services:
+  redis-server:
+    image: redis:latest
+    container_name: redis-server
+    ports:
+      - "6379:6379"
+    networks:
+      - peerprep-network
   frontend:
     image: asia-southeast1-docker.pkg.dev/cs3219-g11-peerprep/cs3219-g11-repo/peerprep-fe:latest
     platform: linux/amd64
@@ -38,6 +45,21 @@ services:
       - peerprep-network
     env_file:
       - ./user-service/.env
+  matching-service:
+    image: asia-southeast1-docker.pkg.dev/cs3219-g11-peerprep/cs3219-g11-repo/matching-svc:latest
+    build:
+      context: ./matching-service
+      dockerfile: Dockerfile
+      target: development
+    volumes:
+      - ./matching-service:/app
+      - ./matching-service/node_modules:/app/node_modules
+    ports:
+      - "5001:5001"
+    networks:
+      - peerprep-network
+    env_file:
+      - ./matching-service/.env.production
 networks:
   peerprep-network:
     driver: bridge

docker-compose.yml

@@ -1,4 +1,11 @@
 services:
+  redis-server:
+    image: redis:latest
+    container_name: redis-server
+    ports:
+      - "6379:6379"  # Expose Redis port
+    networks:
+      - peerprep-network
   frontend:
     image: asia-southeast1-docker.pkg.dev/cs3219-g11-peerprep/cs3219-g11-repo/peerprep-fe:latest
     build:
@@ -44,6 +51,21 @@ services:
       - peerprep-network
     env_file:
       - ./user-service/.env
+  matching-service:
+    image: asia-southeast1-docker.pkg.dev/cs3219-g11-peerprep/cs3219-g11-repo/matching-svc:latest
+    build:
+      context: ./matching-service
+      dockerfile: Dockerfile
+      target: development
+    volumes:
+      - ./matching-service:/app
+      - ./matching-service/node_modules:/app/node_modules
+    ports:
+      - "5001:5001"
+    networks:
+      - peerprep-network
+    env_file:
+      - ./matching-service/.env.dev
 networks:
   peerprep-network:
     driver: bridge

k8s/matching-service.yml

@@ -0,0 +1,69 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: matching-svc
+  labels:
+    type: backend
+    app: matching-svc
+spec:
+  selector:
+    matchLabels:
+      type: backend
+      app: matching-svc
+  template:
+    metadata:
+      name: matching-svc
+      labels:
+        type: backend
+        app: matching-svc
+    spec:
+      containers:
+        - name: matching-svc
+          image: asia-southeast1-docker.pkg.dev/cs3219-g11-peerprep/cs3219-g11-repo/matching-svc:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 5001
+          envFrom:
+            - secretRef:
+                name: matching-service-config
+          resources:
+            requests:
+              memory: "512Mi"
+              cpu: "500m"
+            limits:
+              memory: "1Gi"
+              cpu: "1"
+      dnsPolicy: ClusterFirst
+---
+# This is an internal service, not exposed
+apiVersion: v1
+kind: Service
+metadata:
+  name: matching-svc
+spec:
+  type: ClusterIP
+  ports:
+    - port: 5001
+      targetPort: 5001
+  selector:
+    type: backend
+    app: matching-svc
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: matching-svc
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: matching-svc
+  minReplicas: 1
+  maxReplicas: 5
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 80

k8s/redis-server.yml

@@ -0,0 +1,56 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis-server
+  labels:
+    app: redis-server
+spec:
+  selector:
+    matchLabels:
+      app: redis-server
+  template:
+    metadata:
+      labels:
+        app: redis-server
+    spec:
+      containers:
+        - name: redis-server
+          image: redis:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 6379
+      dnsPolicy: ClusterFirst
+
+---
+# This is an internal service, not exposed
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-server
+spec:
+  type: ClusterIP  # Internal service type
+  ports:
+    - port: 6379
+      targetPort: 6379
+  selector:
+    app: redis-server
+
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: redis-server
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: redis-server
+  minReplicas: 1
+  maxReplicas: 5
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 80

matching-service/.dockerignore

@@ -0,0 +1,5 @@
+Dockerfile
+.dockerignore
+node_modules
+npm-debug.log
+dist

matching-service/.gitignore

@@ -0,0 +1,17 @@
+# npm
+node_modules
+*.log
+*.gz
+
+# Coveralls
+.nyc_output
+coverage
+
+# Benchmarking
+benchmarks/graphs
+
+# ignore additional files using core.excludesFile
+# https://git-scm.com/docs/gitignore
+
+.env.*
+/dist

matching-service/Dockerfile

@@ -0,0 +1,36 @@
+# Base stage for both dev and prod
+FROM node:18-alpine AS base
+
+# Install pnpm globally
+RUN npm install -g pnpm
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy package.json and pnpm-lock.yaml
+COPY package.json ./
+
+RUN pnpm install
+
+# Development stage
+FROM base AS development
+
+COPY src ./src
+COPY tsconfig.json ./
+
+# Note: Don't expose ports here, Compose will handle that for us
+
+CMD ["pnpm", "dev"]
+
+
+# Production stage
+FROM base AS production
+ENV NODE_ENV=production
+ENV PORT=5001
+
+COPY src ./src
+COPY tsconfig.json ./
+
+EXPOSE ${PORT}
+
+CMD ["pnpm", "start"]

matching-service/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "matching-service",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "dev": "nodemon src/app.ts",
+    "start": "tsc && node dist/app.js",
+    "build": "tsc",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "pre-commit": "pnpm format && git add -u"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "amqplib": "^0.10.4",
+    "cors": "^2.8.5",
+    "dotenv": "^16.4.5",
+    "express": "^4.21.1",
+    "redis": "^4.7.0"
+  },
+  "devDependencies": {
+    "@types/amqplib": "^0.10.5",
+    "@types/cors": "^2.8.17",
+    "@types/express": "^5.0.0",
+    "nodemon": "^3.1.7",
+    "prettier": "^3.3.3",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.6.3"
+  }
+}