feat: grpc client-server connection

Author: tituschewxj

apps/matching-service/handlers/responses.go

@@ -28,7 +28,7 @@ func sendRejectionResponse(ws *websocket.Conn) {
 }
 
 // Send message to matched user
-func sendMatchFoundResponse(ws *websocket.Conn, username string, result models.MatchFound) {
+func sendMatchFoundResponse(ws *websocket.Conn, username string, result models.MatchQuestionFound) {
 	if err := ws.WriteJSON(result); err != nil {
 		log.Printf("Error sending message to user %s: %v\n", username, err)
 	}

apps/matching-service/handlers/websocket.go

@@ -139,7 +139,7 @@ func waitForResult(ws *websocket.Conn, userCtx, timeoutCtx context.Context, matc
 		if !ok {
 			return
 		}
-		var result models.MatchFound
+		var result models.MatchQuestionFound
 		// Unmarshal the JSON message into the struct
 		err := json.Unmarshal([]byte(msg.Payload), &result)
 		if err != nil {

apps/matching-service/processes/findmatches.go

@@ -85,7 +85,7 @@ func foundMatch(tx *redis.Tx, ctx context.Context, currentUser *models.MatchRequ
 	for _, topic := range currentUser.Difficulties {
 		for _, otherTopic := range matchedUser.Difficulties {
 			if topic == otherTopic {
-				matchedTopics = append(matchedTopics, topic)
+				matchedDifficulties = append(matchedDifficulties, topic)
 			}
 		}
 	}

apps/question-service/handlers/findmatchingquestion.go

@@ -0,0 +1,16 @@
+package handlers
+
+import (
+	"context"
+	pb "proto/questionmatching"
+)
+
+func (s *GrpcServer) FindMatchingQuestion(ctx context.Context, req *pb.MatchQuestionRequest) (*pb.QuestionFound, error) {
+	// STUB
+	return &pb.QuestionFound{
+		QuestionId:         1,
+		QuestionName:       "abc",
+		QuestionDifficulty: "Easy",
+		QuestionTopics:     []string{"Algorithms", "Arrays"},
+	}, nil
+}

apps/question-service/handlers/types.go

@@ -1,7 +1,15 @@
 package handlers
 
-import "cloud.google.com/go/firestore"
+import (
+	pb "proto/questionmatching"
+
+	"cloud.google.com/go/firestore"
+)
 
 type Service struct {
 	Client *firestore.Client
 }
+
+type GrpcServer struct {
+	pb.UnimplementedQuestionMatchingServiceServer // Embed the unimplemented service
+}

apps/question-service/main.go

@@ -24,21 +24,6 @@ import (
 	"google.golang.org/grpc"
 )
 
-// initFirestore initializes the Firestore client
-func initFirestore(ctx context.Context, credentialsPath string) (*firestore.Client, error) {
-	opt := option.WithCredentialsFile(credentialsPath)
-	app, err := firebase.NewApp(ctx, nil, opt)
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize Firebase App: %v", err)
-	}
-
-	client, err := app.Firestore(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get Firestore client: %v", err)
-	}
-	return client, nil
-}
-
 func main() {
 	// Load .env file
 	err := godotenv.Load()
@@ -67,7 +52,26 @@ func main() {
 
 	go initGrpcServer()
 
-	// Set up chi router
+	r := initChiRouter(service)
+	initRestServer(r)
+}
+
+// initFirestore initializes the Firestore client
+func initFirestore(ctx context.Context, credentialsPath string) (*firestore.Client, error) {
+	opt := option.WithCredentialsFile(credentialsPath)
+	app, err := firebase.NewApp(ctx, nil, opt)
+	if err != nil {
+		return nil, fmt.Errorf("failed to initialize Firebase App: %v", err)
+	}
+
+	client, err := app.Firestore(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get Firestore client: %v", err)
+	}
+	return client, nil
+}
+
+func initChiRouter(service *handlers.Service) *chi.Mux {
 	r := chi.NewRouter()
 	r.Use(middleware.Logger)
 	r.Use(middleware.Timeout(60 * time.Second))
@@ -84,7 +88,12 @@ func main() {
 		MaxAge:           300, // Maximum value not ignored by any of major browsers
 	}))
 
-	// Register routes
+	registerRoutes(r, service)
+
+	return r
+}
+
+func registerRoutes(r *chi.Mux, service *handlers.Service) {
 	r.Route("/questions", func(r chi.Router) {
 		r.Get("/", service.ListQuestions)
 		r.Post("/", service.CreateQuestion)
@@ -95,7 +104,9 @@ func main() {
 			r.Delete("/", service.DeleteQuestion)
 		})
 	})
+}
 
+func initRestServer(r *chi.Mux) {
 	// Serve on port 8080
 	port := os.Getenv("PORT")
 	if port == "" {
@@ -104,36 +115,22 @@ func main() {
 
 	// Start the server
 	log.Printf("Starting REST server on http://localhost:%s", port)
-	err = http.ListenAndServe(fmt.Sprintf(":%s", port), r)
+	err := http.ListenAndServe(fmt.Sprintf(":%s", port), r)
 	if err != nil {
 		log.Fatalf("Failed to start server: %v", err)
 	}
 }
 
-type server struct {
-	pb.UnimplementedQuestionMatchingServiceServer // Embed the unimplemented service
-}
-
 func initGrpcServer() {
 	lis, err := net.Listen("tcp", ":50051")
 	if err != nil {
 		log.Fatalf("failed to listen: %v", err)
 	}
 	s := grpc.NewServer()
-	pb.RegisterQuestionMatchingServiceServer(s, &server{})
+	pb.RegisterQuestionMatchingServiceServer(s, &handlers.GrpcServer{})
 
 	log.Printf("gRPC Server is listening on port 50051...")
 	if err := s.Serve(lis); err != nil {
 		log.Fatalf("failed to serve: %v", err)
 	}
 }
-
-func (s *server) FindMatchingQuestion(ctx context.Context, req *pb.MatchQuestionRequest) (*pb.QuestionFound, error) {
-	// STUB
-	return &pb.QuestionFound{
-		QuestionId:         1,
-		QuestionName:       "abc",
-		QuestionDifficulty: "Easy",
-		QuestionTopics:     []string{"Algorithms", "Arrays"},
-	}, nil
-}