fix: proto dependency

Author: tituschewxj

apps/matching-service/go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/redis/go-redis/v9 v9.6.2
 	google.golang.org/grpc v1.67.1
 	google.golang.org/protobuf v1.35.1
+	proto v0.0.0-00010101000000-000000000000
 )
 
 require (

apps/matching-service/processes/findmatches.go

@@ -12,7 +12,7 @@ import (
 )
 
 // Find the first matching user from the front on the queue, based on topics, then difficulty.
-func findMatchingUsers(tx *redis.Tx, currentUsername string, ctx context.Context) (*models.MatchFound, error) {
+func findMatchingUser(tx *redis.Tx, currentUsername string, ctx context.Context) (*models.MatchFound, error) {
 	currentUser, err := databases.GetUserDetails(tx, currentUsername, ctx)
 	if err != nil {
 		return nil, err
@@ -153,14 +153,23 @@ func doTopicMatching(tx *redis.Tx, ctx context.Context, currentUser *models.Matc
 
 	// Iterate through the queue to find a match, so a user in the queue the longest is more likely to be matched.
 	var foundUsers []string
-	for _, otherUser := range potentialMatches {
-		if otherUser == currentUser.Username {
+	for _, otherUsername := range potentialMatches {
+		if otherUsername == currentUser.Username {
 			continue
 		}
 
+		// Include users without any difficulty selected
+		otherUser, err := databases.GetUserDetails(tx, otherUsername, ctx)
+		if err != nil {
+			return nil, err
+		}
+		if len(otherUser.Topics) == 0 {
+			foundUsers = append(foundUsers, otherUsername)
+		}
+
 		// other user has matching topic
-		if _, ok := sameTopicUsers[otherUser]; ok {
-			foundUsers = append(foundUsers, otherUser)
+		if _, ok := sameTopicUsers[otherUsername]; ok {
+			foundUsers = append(foundUsers, otherUsername)
 			break
 		}
 	}
@@ -181,14 +190,23 @@ func doDifficultyMatching(tx *redis.Tx, ctx context.Context, currentUser *models
 
 	// Iterate through the queue to find a match, so a user in the queue the longest is more likely to be matched.
 	var foundUsers []string
-	for _, otherUser := range potentialMatches {
-		if otherUser == currentUser.Username {
+	for _, otherUsername := range potentialMatches {
+		if otherUsername == currentUser.Username {
 			continue
 		}
 
-		// other user has matching difficulty
-		if _, ok := sameDifficultyUsers[otherUser]; ok {
-			foundUsers = append(foundUsers, otherUser)
+		// Include users without any difficulty selected
+		otherUser, err := databases.GetUserDetails(tx, otherUsername, ctx)
+		if err != nil {
+			return nil, err
+		}
+		if len(otherUser.Topics) == 0 {
+			foundUsers = append(foundUsers, otherUsername)
+		}
+
+		// other user has matching difficulty or has no difficulty
+		if _, ok := sameDifficultyUsers[otherUsername]; ok {
+			foundUsers = append(foundUsers, otherUsername)
 			break
 		}
 	}

apps/matching-service/processes/performmatches.go

@@ -8,7 +8,8 @@ import (
 	"log"
 	"matching-service/databases"
 	"matching-service/models"
-	pb "matching-service/proto"
+	pb "proto/questionmatching"
+
 	"matching-service/servers"
 
 	"github.com/redis/go-redis/v9"
@@ -39,7 +40,7 @@ func PerformMatching(rdb *redis.Client, matchRequest models.MatchRequest, ctx co
 		defer databases.PrintMatchingQueue(tx, "After Matchmaking", ctx)
 
 		// Find a matching user if any
-		matchFound, err = findMatchingUsers(tx, currentUsername, ctx)
+		matchFound, err = findMatchingUser(tx, currentUsername, ctx)
 		if err != nil {
 			if errors.Is(err, models.NoMatchFound) {
 				return nil
@@ -119,7 +120,7 @@ func queryQuestionService(ctx context.Context, matchFound *models.MatchFound) *m
 		User:               matchFound.User,
 		MatchedUser:        matchFound.MatchedUser,
 		MatchedTopics:      matchFound.MatchedTopics,
-		QuestionDocRefID:   question.QuestionName,
+		QuestionDocRefID:   question.QuestionDocRefId,
 		QuestionName:       question.QuestionName,
 		QuestionDifficulty: question.QuestionDifficulty,
 		QuestionTopics:     question.QuestionTopics,