Feat/delete evaluators or chair

src/back-end/lib/db/evaluations/sprint-with-us/team-questions.ts

@@ -1,9 +1,15 @@
 import {
+  RawSWUEvaluationPanelMember,
   readOneSWUEvaluationPanelMember,
   readOneSWUOpportunity
 } from "back-end/lib/db/opportunity/sprint-with-us";
 import { getValidValue, isInvalid, valid } from "shared/lib/validation";
-import { Connection, readOneSWUProposalSlim, tryDb } from "back-end/lib/db";
+import {
+  Connection,
+  readOneSWUProposalSlim,
+  Transaction,
+  tryDb
+} from "back-end/lib/db";
 import {
   AuthenticatedSession,
   Session,
@@ -380,6 +386,80 @@ export const updateSWUTeamQuestionResponseEvaluation = tryDb<
   );
 });
 
+/**
+ * All evaluations have been submitted when every evaluator has evaluated every
+ * question for every proponent
+ */
+export async function allSWUTeamQuestionResponseEvaluatorEvaluationsSubmitted(
+  connection: Connection,
+  trx: Transaction,
+  opportunityId: string,
+  proposalsCount: number
+) {
+  const [
+    [{ count: submittedEvaluatorEvaluationsCount }],
+    [{ count: evaluatorsCount }],
+    [{ count: questionsCount }]
+  ] = await Promise.all([
+    generateSWUTeamQuestionResponseEvaluationQuery(connection)
+      .transacting(trx)
+      .clearSelect()
+      .where({
+        "statuses.status": SWUTeamQuestionResponseEvaluationStatus.Submitted
+      })
+      .count("*"),
+    // Evaluators for the most recent version
+    connection<RawSWUEvaluationPanelMember>(
+      "swuEvaluationPanelMembers as members"
+    )
+      .transacting(trx)
+      .join(
+        connection.raw(
+          "(??) as versions",
+          connection("swuOpportunityVersions")
+            .select("opportunity", "id")
+            .rowNumber("rn", function () {
+              this.orderBy("createdAt", "desc").partitionBy("opportunity");
+            })
+        ),
+        function () {
+          this.on("members.opportunityVersion", "=", "versions.id");
+        }
+      )
+      .where({
+        evaluator: true,
+        "versions.opportunity": opportunityId,
+        "versions.rn": 1
+      })
+      .count("*"),
+    // Questions for the most recent version
+    connection<RawSWUEvaluationPanelMember>("swuTeamQuestions as questions")
+      .transacting(trx)
+      .join(
+        connection.raw(
+          "(??) as versions",
+          connection("swuOpportunityVersions")
+            .select("opportunity", "id")
+            .rowNumber("rn", function () {
+              this.orderBy("createdAt", "desc").partitionBy("opportunity");
+            })
+        ),
+        function () {
+          this.on("questions.opportunityVersion", "=", "versions.id");
+        }
+      )
+      .where({
+        "versions.opportunity": opportunityId,
+        "versions.rn": 1
+      })
+      .count("*")
+  ]);
+  return (
+    Number(submittedEvaluatorEvaluationsCount) ===
+    Number(evaluatorsCount) * proposalsCount * Number(questionsCount)
+  );
+}
+
 function generateSWUTeamQuestionResponseEvaluationQuery(
   connection: Connection,
   consensus = false
@@ -391,24 +471,47 @@ function generateSWUTeamQuestionResponseEvaluationQuery(
     ? CHAIR_EVALUATION_STATUS_TABLE_NAME
     : EVALUATOR_EVALUATION_STATUS_TABLE_NAME;
   const query = connection(`${evaluationTableName} as evaluations`)
-    .join(`${evaluationStatusTableName} as statuses`, function () {
-      this.on(
-        "evaluations.evaluationPanelMember",
-        "=",
-        "statuses.evaluationPanelMember"
-      )
-        .andOn("evaluations.proposal", "=", "statuses.proposal")
-        .andOnNotNull("statuses.status")
-        .andOn(
-          "statuses.createdAt",
+    .join(
+      connection.raw(
+        "(??) as statuses",
+        connection(`${evaluationStatusTableName}`)
+          .select("evaluationPanelMember", "proposal", "status", "createdAt")
+          .rowNumber("rn", function () {
+            this.orderBy("createdAt", "desc").partitionBy([
+              "evaluationPanelMember",
+              "proposal"
+            ]);
+          })
+      ),
+      function () {
+        this.on(
+          "evaluations.evaluationPanelMember",
           "=",
-          connection.raw(
-            `(select max("createdAt") from "${evaluationStatusTableName}" as statuses2 where
-              statuses2."evaluationPanelMember" = evaluations."evaluationPanelMember" and statuses2."proposal" = evaluations."proposal"
-              and statuses2.status is not null)`
-          )
-        );
-    })
+          "statuses.evaluationPanelMember"
+        )
+          .andOn("evaluations.proposal", "=", "statuses.proposal")
+          .andOn("statuses.rn", "=", connection.raw(1));
+      }
+    )
+    .join("swuProposals as proposals", "evaluations.proposal", "proposals.id")
+    .join(
+      "swuEvaluationPanelMembers as members",
+      "evaluations.evaluationPanelMember",
+      "members.user"
+    )
+    .join(
+      connection.raw(
+        "(??) as versions",
+        connection("swuOpportunityVersions")
+          .select("opportunity", "id")
+          .rowNumber("rn", function () {
+            this.orderBy("createdAt", "desc").partitionBy("opportunity");
+          })
+      ),
+      function () {
+        this.on("proposals.opportunity", "=", "versions.opportunity");
+      }
+    )
     .select<RawSWUTeamQuestionResponseEvaluation[]>(
       "evaluations.proposal",
       "evaluations.evaluationPanelMember",
@@ -420,7 +523,11 @@ function generateSWUTeamQuestionResponseEvaluationQuery(
       "evaluations.notes",
       "statuses.status",
       "statuses.createdAt"
-    );
+    )
+    .where({
+      "members.opportunityVersion": connection.raw("versions.id"),
+      "versions.rn": 1
+    });
 
   return query;
 }

src/back-end/lib/db/opportunity/sprint-with-us.ts

@@ -1,5 +1,6 @@
 import { generateUuid } from "back-end/lib";
 import {
+  allSWUTeamQuestionResponseEvaluatorEvaluationsSubmitted,
   CHAIR_EVALUATION_STATUS_TABLE_NAME,
   CHAIR_EVALUATION_TABLE_NAME,
   Connection,
@@ -13,11 +14,8 @@ import {
 import { readOneFileById } from "back-end/lib/db/file";
 import { readOneOrganizationContactEmail } from "back-end/lib/db/organization";
 import {
-  allIndividualSWUTeamQuestionResponseEvaluationsComplete,
-  readManySWUProposals,
   readOneSWUAwardedProposal,
-  readSubmittedSWUProposalCount,
-  updateSWUProposalStatus
+  readSubmittedSWUProposalCount
 } from "back-end/lib/db/proposal/sprint-with-us";
 import { RawSWUOpportunitySubscriber } from "back-end/lib/db/subscribers/sprint-with-us";
 import { readOneUser, readOneUserSlim } from "back-end/lib/db/user";
@@ -1215,6 +1213,25 @@ export const updateSWUOpportunityVersion = tryDb<
     ...restOfOpportunity
   } = opportunity;
   const opportunityVersion = await connection.transaction(async (trx) => {
+    const prevPanel: RawSWUEvaluationPanelMember[] =
+      await connection<RawSWUEvaluationPanelMember>(
+        "swuEvaluationPanelMembers as sepm"
+      )
+        .select("sepm.*")
+        .join(
+          "swuOpportunityVersions as sov",
+          "sepm.opportunityVersion",
+          "=",
+          "sov.id"
+        )
+        .where(
+          "sov.createdAt",
+          "=",
+          connection<Date>("swuOpportunityVersions as sov2")
+            .max("createdAt")
+            .where("sov2.opportunity", "=", restOfOpportunity.id)
+        );
+
     const [versionRecord] = await connection<SWUOpportunityVersionRecord>(
       "swuOpportunityVersions"
     )
@@ -1285,12 +1302,30 @@ export const updateSWUOpportunityVersion = tryDb<
 
     // Create evaluation panel
     for (const member of evaluationPanel) {
-      await connection<RawSWUEvaluationPanelMember>("swuEvaluationPanelMembers")
-        .transacting(trx)
-        .insert({
-          ...member,
-          opportunityVersion: versionRecord.id
-        });
+      const prevMember = prevPanel.find(({ user }) => user === member.user);
+      if (prevMember) {
+        await connection<RawSWUEvaluationPanelMember>(
+          "swuEvaluationPanelMembers"
+        )
+          .transacting(trx)
+          .where({
+            user: prevMember.user,
+            opportunityVersion: prevMember.opportunityVersion
+          })
+          .update({
+            ...member,
+            opportunityVersion: versionRecord.id
+          });
+      } else {
+        await connection<RawSWUEvaluationPanelMember>(
+          "swuEvaluationPanelMembers"
+        )
+          .transacting(trx)
+          .insert({
+            ...member,
+            opportunityVersion: versionRecord.id
+          });
+      }
     }
 
     // Add an 'edit' change record
@@ -1467,12 +1502,12 @@ export const closeSWUOpportunities = tryDb<[], number>(async (connection) => {
           )?.map((result) => result.id) || [];
 
         for (const [index, proposalId] of proposalIds.entries()) {
-          // Set the proposal to EVALUATION_QUESTIONS_INDIVIDUAL status
+          // Set the proposal to UNDER_REVIEW_QUESTIONS status
           await connection("swuProposalStatuses").transacting(trx).insert({
             id: generateUuid(),
             createdAt: now,
             proposal: proposalId,
-            status: SWUProposalStatus.EvaluationTeamQuestionsIndividual,
+            status: SWUProposalStatus.UnderReviewTeamQuestions,
             note: ""
           });
 
@@ -1698,44 +1733,17 @@ export const submitIndividualQuestionEvaluations = tryDb<
           if (!statusRecord) {
             throw new Error("unable to update team question evaluation");
           }
-
-          if (
-            await allIndividualSWUTeamQuestionResponseEvaluationsComplete(
-              connection,
-              trx,
-              proposalId,
-              id
-            )
-          ) {
-            const result = await updateSWUProposalStatus(
-              connection,
-              proposalId,
-              SWUProposalStatus.EvaluationTeamQuestionsConsensus,
-              "",
-              session
-            );
-            if (isInvalid(result)) {
-              throw new Error("unable to update proposal");
-            }
-          }
         }
       )
     );
 
-    // Update opportunity status if all evaluations complete for proposal
-    const updatedSWUProposals = getValidValue(
-      await readManySWUProposals(connection, session, id),
-      undefined
-    );
-    if (!updatedSWUProposals) {
-      throw new Error("unable to read proposals");
-    }
-
+    // Update opportunity status if all evaluations complete
     if (
-      updatedSWUProposals.every(
-        (proposal) =>
-          proposal.status !==
-          SWUProposalStatus.EvaluationTeamQuestionsIndividual
+      await allSWUTeamQuestionResponseEvaluatorEvaluationsSubmitted(
+        connection,
+        trx,
+        id,
+        evaluationParams.evaluations.map(({ proposal }) => proposal.id).length
       )
     ) {
       const result = await updateSWUOpportunityStatus(
@@ -1812,18 +1820,6 @@ export const submitConsensusQuestionEvaluations = tryDb<
         }
       )
     );
-
-    const result = await updateSWUOpportunityStatus(
-      connection,
-      id,
-      SWUOpportunityStatus.EvaluationTeamQuestionsReview,
-      "",
-      session
-    );
-
-    if (!result) {
-      throw new Error("unable to update opportunity");
-    }
   });
 
   const dbResult = await readOneSWUOpportunity(connection, id, session);