Attempt to fix some issues

Matching service still seems unable to talk to redis

Author: alvinlim277

compose.yaml

@@ -62,6 +62,12 @@ services:
     ports:
       - "9100:5672"
       - "9101:15672"
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 10s
 
   matching-service:
     build: matching-service
@@ -74,9 +80,10 @@ services:
         - action: rebuild
           path: matching-service
           target: matching-service/app
+    # TODO for some reason healthcheck doesnt really work, still ahve to manually start them
     depends_on:
-      - rabbitmq
-      - redis
+      rabbitmq:
+        condition: service_healthy
 
   matching-service-api:
     build: matching-service-api
@@ -92,7 +99,8 @@ services:
           path: matching-service
           target: matching-service/app
     depends_on:
-      - rabbitmq
+      rabbitmq:
+        condition: service_healthy
 
   storage-blob-api:
     build: storage-blob-api

matching-service/.env.example

@@ -1,3 +1,9 @@
 RABBIT_URI="amqp://grp14:grp14@localhost:9100/"
 
 REDIS_URI="localhost:9190"
+
+# dockerised
+
+RABBIT_URI="amqp://grp14:grp14@rabbitmq/"
+
+REDIS_URI="redis:9190"

matching-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23
+FROM golang:1.20
 
 WORKDIR /matching-service
 

peerprep/.env.example

@@ -1,7 +1,8 @@
-NEXT_PUBLIC_QUESTION_SERVICE=
-NEXT_PUBLIC_USER_SERVICE=
-NEXT_PUBLIC_MATCHING_SERVICE=
-NEXT_PUBLIC_STORAGE_BLOB=
+NEXT_PUBLIC_BASE_URL=http://host.docker.internal:80
+NEXT_PUBLIC_QUESTION_SERVICE=http://backend:9090
+NEXT_PUBLIC_USER_SERVICE=http://user-service:3001
 # note NGINX will currently point to itself.
-NEXT_PUBLIC_NGINX=
-DEV_ENV=
+NEXT_PUBLIC_NGINX=http://localhost:3000
+DEV_ENV=not
+NEXT_PUBLIC_MATCHING_SERVICE=http://matching-service-api:9200
+NEXT_PUBLIC_STORAGE_BLOB=http://storage-blob-api:9300

peerprep/components/questionpage/Matchmaking.tsx

@@ -54,15 +54,25 @@ const Matchmaking = () => {
   const { userid } = useUserInfo();
   const timeout = useRef<NodeJS.Timeout>();
 
+  const stopTimer = () => {
+    // if user manually stopped it clear timeout
+    if (timeout.current) {
+      console.debug("Match request timeout stopped");
+      clearTimeout(timeout.current);
+    }
+  };
+
   const handleMatch = async () => {
     if (!isMatching) {
+      setIsMatching(true);
+
       // start 30s timeout
       timeout.current = setTimeout(() => {
         setIsMatching(false);
         console.log("Match request timed out after 30s");
       }, TIMEOUT_MILLISECONDS);
 
-      setIsMatching(true);
+      // assemble the match request
       const matchRequest: MatchRequest = {
         userId: userid,
         difficulty: difficulty,
@@ -72,19 +82,17 @@ const Matchmaking = () => {
       console.log("Match attempted");
       console.debug(matchRequest);
 
+      // send match request
       const status = await findMatch(matchRequest);
       if (status.error) {
+        stopTimer();
         console.log("Failed to find match. Cancel matching.");
         setIsMatching(false);
         return;
       }
       console.log(`Started finding match.`);
     } else {
-      // if user manually stopped it clear timeout
-      if (timeout.current) {
-        clearTimeout(timeout.current);
-      }
-
+      stopTimer();
       setIsMatching(false);
       console.log("User stopped matching");
     }

peerprep/components/questionpage/QuestionList.tsx

@@ -34,6 +34,7 @@ const QuestionList: React.FC = () => {
         new Set(data.flatMap((question) => question.topicTags))
       ).sort();
       setTopicsList(["all", ...uniqueTopics]);
+      setTopics(["all", ...uniqueTopics]);
     };
 
     fetchQuestions();

peerprep/middleware.ts

@@ -15,10 +15,10 @@ function isSession(request: NextRequest): boolean {
 }
 
 export function middleware(request: NextRequest) {
-  // TODO DELETE THIS LATER
-  if (process.env.NEXT_BYPASS_LOGIN === "yesplease") {
-    return NextResponse.next();
-  }
+  // // UNCOMMENT AND ADD TO ENV IF JUST TESTING FRONTEND STUFF
+  // if (process.env.NEXT_BYPASS_LOGIN === "yesplease") {
+  //   return NextResponse.next();
+  // }
 
   if (isNoSession(request)) {
     return NextResponse.redirect(new URL("/questions", request.url));

storage-blob-api/.env.example

@@ -1,2 +1,6 @@
 PORT=:9300
 REDIS_URI="localhost:9190"
+
+# dockerised
+PORT=:9300
+REDIS_URI="redis:6379"

storage-blob-api/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23
+FROM golang:1.2
 
 WORKDIR /storage-blob-api
 

user-service/Dockerfile

@@ -4,7 +4,8 @@ WORKDIR /user-service
 # TODO: don't include the .env file in the COPY
 # TODO: multistage build
 COPY package*.json ./
-RUN npm install --verbose
+# why did it only work with --force
+RUN npm install --force --verbose
 RUN npm rebuild bcrypt --build-from-source
 COPY . .
 EXPOSE 3001