feat(tool-picker): add user answers on recommendation query

Author: sudip-khanal

apps/tool_picker/graphql/types.py

@@ -8,14 +8,23 @@
     RecommendationResult,
     Tool,
     ToolAnswer,
+    UserAnswer,
 )
 from utils.graphql.types import DjangoFileType
 
 
+@strawberry_django.type(Question)
+class QuestionTitleType:
+    id: strawberry.ID
+    title: strawberry.auto
+    question_type: strawberry.auto
+    description: strawberry.auto
+
+
 @strawberry_django.type(CheckboxOption)
 class CheckboxOptionType:
     id: strawberry.ID
-    question_id: strawberry.ID
+    question: QuestionTitleType
     order: strawberry.auto
     text: strawberry.auto
 
@@ -49,16 +58,16 @@ class CatalogType:
 class ToolAnswerType:
     id: strawberry.ID
     tool_id: strawberry.ID
-    question_id: strawberry.ID
+    question: QuestionTitleType
     description: strawberry.auto
-    ordinal_value: int
+    ordinal_value: int | None
     selected_options: list[CheckboxOptionType]
 
 
 @strawberry_django.type(UserAnswer)
 class UserAnswerType:
-    question: strawberry.auto
-    ordinal_value: int
+    question: QuestionTitleType
+    ordinal_value: int | None
     selected_options: list[CheckboxOptionType]
 
 
@@ -79,12 +88,13 @@ class ToolType:
 class UserSubmissionType:
     id: strawberry.ID
     catalog_id: strawberry.ID
+    answers: list[UserAnswerType]
 
 
 @strawberry_django.type(RecommendationResult)
 class RecommendationResultType:
     id: strawberry.auto
-    submission: strawberry.auto
+    submission: UserSubmissionType
     rank: strawberry.auto
     score: strawberry.auto
     tool: ToolType

apps/tool_picker/serializers.py

@@ -6,6 +6,7 @@
 
 from apps.tool_picker.models import (
     CheckboxOption,
+    OrdinalTypeEnum,
     Question,
     QuestionTypeEnum,
     UserAnswer,
@@ -72,16 +73,6 @@ def validate(self, attrs: dict[str, typing.Any]):
                         % question.get_question_type_display(),
                     },
                 )
-
-        else:
-            raise serializers.ValidationError(
-                {
-                    "non_field_errors": gettext(
-                        "Unsupported question type",
-                    ),
-                },
-            )
-
         return attrs
 
 
@@ -105,12 +96,17 @@ def validate(self, attrs: dict[str, typing.Any]):
             raise serializers.ValidationError(
                 {"answer": gettext("At least one answer is required.")},
             )
-
         # All the question related to the selected catalog catalog.
         catalog_questions = set(
             catalog.questions.values_list("id", flat=True),
         )
 
+        ordinal_answers = [ans for ans in answers if ans["question"].question_type == QuestionTypeEnum.ORDINAL]
+        if ordinal_answers and all(ans["ordinal_value"] == OrdinalTypeEnum.NOT_AVAILABLE for ans in ordinal_answers):
+            raise serializers.ValidationError(
+                gettext("All ordinal answers should not be N/A. please choose one must be a different value."),
+            )
+
         # All the question answered by user.
         answered_questions = {ans["question"].id for ans in answers}
 

apps/tool_picker/tests/query_test.py

@@ -56,7 +56,10 @@ class Query:
                 answers {
                     id
                     description
-                    questionId
+                    question {
+                        id
+                        title
+                    }
                     toolId
                 }
                 }
@@ -91,7 +94,10 @@ class Query:
                     labelNa
                     options {
                       id
-                      questionId
+                      question{
+                          id
+                          title
+                      }
                       text
                       order
                     }
@@ -179,7 +185,10 @@ def _query():
                                 options=[
                                     dict(
                                         id=self.gID(self.options.pk),
-                                        questionId=self.gID(self.question.pk),
+                                        question=dict(
+                                            id=self.gID(self.question.pk),
+                                            title=self.question.title,
+                                        ),
                                         text=self.options.text,
                                         order=self.options.order,
                                     ),
@@ -252,7 +261,10 @@ def _query():
                             dict(
                                 id=self.gID(self.tool_answer.pk),
                                 description=self.tool_answer.description,
-                                questionId=self.gID(self.question.pk),
+                                question=dict(
+                                    id=self.gID(self.question.pk),
+                                    title=self.question.title,
+                                ),
                                 toolId=self.gID(self.tool.pk),
                             ),
                         ],

schema.graphql

@@ -86,7 +86,7 @@ type CatalogTypeOffsetPaginated {
 """Model representing option of checkbox question."""
 type CheckboxOptionType {
   id: ID!
-  questionId: ID!
+  question: QuestionTitleType!
   order: Int!
   text: String!
 }
@@ -132,10 +132,6 @@ type DjangoFileType {
   url: String!
 }
 
-type DjangoModelType {
-  pk: ID!
-}
-
 input IDBaseFilterLookup {
   """Exact match. Filter will be skipped on `null` value"""
   exact: ID
@@ -223,6 +219,14 @@ type Query {
   enums: AppEnumCollection!
 }
 
+"""Model representing question within a catalog."""
+type QuestionTitleType {
+  id: ID!
+  title: String!
+  questionType: QuestionTypeEnum!
+  description: String!
+}
+
 """Model representing question within a catalog."""
 type QuestionType {
   id: ID!
@@ -262,7 +266,7 @@ input RecommendationResultOrder @oneOf {
 """Model representing recommended tools for a submission."""
 type RecommendationResultType {
   id: ID!
-  submission: DjangoModelType!
+  submission: UserSubmissionType!
   rank: Int!
 
   """Proximity score - lower is better (closer match)"""
@@ -284,9 +288,9 @@ type RecommendationResultTypeOffsetPaginated {
 type ToolAnswerType {
   id: ID!
   toolId: ID!
-  questionId: ID!
+  question: QuestionTitleType!
   description: String!
-  ordinalValue: Int!
+  ordinalValue: Int
   selectedOptions: [CheckboxOptionType!]!
 }
 
@@ -335,8 +339,8 @@ input UserAnswerInput {
 
 """Model representing a user's answer to a specific question."""
 type UserAnswerType {
-  question: DjangoModelType!
-  ordinalValue: Int!
+  question: QuestionTitleType!
+  ordinalValue: Int
   selectedOptions: [CheckboxOptionType!]!
 }
 
@@ -367,6 +371,7 @@ input UserSubmissionInput {
 type UserSubmissionType {
   id: ID!
   catalogId: ID!
+  answers: [UserAnswerType!]!
 }
 
 type UserSubmissionTypeMutationResponseType {