add round number to Question object

Enterprise-CMCS · Jan 21, 2025 · af20cd4 · af20cd4
1 parent 7fc5abb
commit af20cd4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/services/app-api/src/domain-models/QuestionsType.ts b/services/app-api/src/domain-models/QuestionsType.ts
@@ -16,6 +16,7 @@ const commonQuestionSchema = z.object({
     division: divisionType, // DMCO, DMCP, OACT
     documents: z.array(document),
     responses: z.array(questionResponseType),
+    round: z.number(),
 })
 
 const contractQuestion = commonQuestionSchema.extend({

diff --git a/services/app-api/src/postgres/questionResponse/questionHelpers.ts b/services/app-api/src/postgres/questionResponse/questionHelpers.ts
@@ -67,12 +67,19 @@ const convertToCommonIndexQuestionsPayload = <
     const getDivisionQuestionsEdge = (
         division: 'DMCP' | 'DMCO' | 'OACT',
         questions: P[]
-    ) => ({
-        totalCount: questions.filter((q) => q.division === division).length,
-        edges: questions
+    ) => {
+        const divisionQuestions = questions
             .filter((q) => q.division === division)
-            .map((question) => ({ node: question })),
-    })
+            .sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime())
+            .map((question, idx) => {
+                question.round = idx + 1
+                return { node: question }
+            })
+        return {
+            totalCount: divisionQuestions.length,
+            edges: divisionQuestions,
+        }
+    }
 
     return {
         DMCOQuestions: getDivisionQuestionsEdge('DMCO', questions),

diff --git a/services/app-graphql/src/fragments/questionsEdgeFragment.graphql b/services/app-graphql/src/fragments/questionsEdgeFragment.graphql
@@ -12,6 +12,7 @@ fragment contractQuestionEdgeFragment on ContractQuestionEdge {
             }
         }
         division
+        round
         documents {
             s3URL
             name

diff --git a/services/app-graphql/src/schema.graphql b/services/app-graphql/src/schema.graphql
@@ -1239,6 +1239,7 @@ type ContractQuestion {
     addedBy: CMSUsersUnion!
     documents: [Document!]!
     division: Division!
+    round: Int!
     #    noteText: String
     #    dueDate: Date
     #    rateIDs: [String!]
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
             division
+            round
             documents {
                 s3URL
                 name
@@ Expand Down @@