feat: return docrefid

Author: tituschewxj

apps/matching-service/models/match.go

@@ -22,7 +22,7 @@ type MatchQuestionFound struct {
 	User               string   `json:"user"`
 	MatchedUser        string   `json:"matched_user"`
 	MatchedTopics      []string `json:"matched_topics"`
-	QuestionID         int64    `json:"question_id"`
+	QuestionDocRefID   string   `json:"question_doc_ref_id"`
 	QuestionName       string   `json:"question_name"`
 	QuestionDifficulty string   `json:"question_difficulty"`
 	QuestionTopics     []string `json:"question_topics"`

apps/matching-service/models/question.go

@@ -6,7 +6,7 @@ type MatchQuestionRequest struct {
 }
 
 type QuestionFound struct {
-	QuestionID         int64    `json:"question_id"`
+	QuestionDocRefID   string   `json:"question_doc_ref_id"`
 	QuestionName       string   `json:"question_name"`
 	QuestionDifficulty string   `json:"question_difficulty"`
 	QuestionTopics     []string `json:"question_topics"`

apps/matching-service/processes/performmatches.go

@@ -77,7 +77,7 @@ func completeMatch(tx *redis.Tx, ctx context.Context, matchFound *models.MatchFo
 	matchQuestionFound := queryQuestionService(ctx, matchFound)
 
 	log.Printf("Match %v: Question %v found with topics: %v and difficulty %v",
-		matchFound.MatchID, matchQuestionFound.QuestionID,
+		matchFound.MatchID, matchQuestionFound.QuestionDocRefID,
 		matchQuestionFound.QuestionTopics, matchQuestionFound.QuestionDifficulty)
 
 	currentUsername := matchFound.User
@@ -119,7 +119,7 @@ func queryQuestionService(ctx context.Context, matchFound *models.MatchFound) *m
 		User:               matchFound.User,
 		MatchedUser:        matchFound.MatchedUser,
 		MatchedTopics:      matchFound.MatchedTopics,
-		QuestionID:         question.QuestionId,
+		QuestionDocRefID:   question.QuestionName,
 		QuestionName:       question.QuestionName,
 		QuestionDifficulty: question.QuestionDifficulty,
 		QuestionTopics:     question.QuestionTopics,

apps/proto/questionmatching.proto

@@ -10,7 +10,7 @@ message MatchQuestionRequest {
 }
 
 message QuestionFound {
-    int64 question_id = 1;
+    string question_doc_ref_id = 1;
     string question_name = 2;
     string question_difficulty = 3;
     repeated string question_topics = 4;

apps/proto/questionmatching/questionmatching.pb.go

@@ -67,24 +67,33 @@ func (s *GrpcServer) FindMatchingQuestion(ctx context.Context, req *pb.MatchQues
 	}
 
 	// 5b. Retrieve random question from potential questions
+	question, err := retrieveRandomQuestion(docs)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.QuestionFound{
+		QuestionDocRefId:   question.DocRefID,
+		QuestionName:       question.Title,
+		QuestionDifficulty: question.Complexity.String(),
+		QuestionTopics:     question.Categories,
+	}, nil
+}
+
+// Retrieve the document at the random offset
+
+func retrieveRandomQuestion(docs []*firestore.DocumentSnapshot) (*models.Question, error) {
 	// Generate a random offset
 	randomOffset := rand.Intn(len(docs))
 
-	// Retrieve the document at the random offset
 	doc := docs[randomOffset]
 	var question models.Question
 	if err := doc.DataTo(&question); err != nil {
 		return nil, err
 
 	}
 	question.DocRefID = doc.Ref.ID
-
-	return &pb.QuestionFound{
-		QuestionId:         question.ID,
-		QuestionName:       question.Title,
-		QuestionDifficulty: question.Complexity.String(),
-		QuestionTopics:     question.Categories,
-	}, nil
+	return &question, nil
 }
 
 func queryTopicAndDifficultyQuestion(client *firestore.Client, ctx context.Context, topics []string, difficulties []models.ComplexityType) ([]*firestore.DocumentSnapshot, error) {