Allow ignoring merge order when fetching merged classes

src/stories/hubbles_law/database.ts

@@ -1,6 +1,6 @@
 import { Attributes, FindOptions, Op, QueryTypes, Sequelize, WhereAttributeHash, WhereOptions, col, fn, literal } from "sequelize";
 import { AsyncMergedHubbleStudentClasses, Galaxy, HubbleMeasurement, SampleHubbleMeasurement, SyncMergedHubbleClasses } from "./models";
 import { classSize, findClassById, findStudentById } from "../../database";
 import { RemoveHubbleMeasurementResult, SubmitHubbleMeasurementResult } from "./request_results";
 import { Class, StoryState, Student, StudentsClasses } from "../../models";
 import { HubbleStudentData } from "./models/hubble_student_data";
@@ -320,7 +320,7 @@
   return classIDs;
 }
 
-export async function getMergedIDsForClass(classID: number): Promise<number[]> {
+export async function getMergedIDsForClass(classID: number, ignoreMergeOrder=false): Promise<number[]> {
   // TODO: Currently this uses two queries:
   // The first to get the merge group (if there is one)
   // Then a second to get all of the classes in the merge group
@@ -334,14 +334,15 @@
     return [classID];
   }
 
-  const mergeEntries = await HubbleClassMergeGroup.findAll({
-    where: {
-      group_id: mergeGroup.group_id,
-      merge_order: {
-        [Op.lte] : mergeGroup.merge_order,
-      }
-    }
-  });
+  const where: WhereOptions = {
+    group_id: mergeGroup.group_id,
+  };
+  if (!ignoreMergeOrder) {
+    where.merge_order = {
+      [Op.lte]: mergeGroup.merge_order,
+    };
+  }
+  const mergeEntries = await HubbleClassMergeGroup.findAll({ where });
   return mergeEntries.map(entry => entry.class_id);
 }
 

src/stories/hubbles_law/router.ts

@@ -401,14 +401,15 @@ router.get(["/class-measurements/:studentID", "stage-3-measurements/:studentID"]
 
 router.get("/merged-classes/:classID", async (req, res) => {
   const classID = Number(req.params.classID);
+  const ignoreMergeOrder = (req.query?.ignore_merge_order as string)?.toLowerCase() === "true";
   const cls = await findClassById(classID);
   if (cls === null) {
     res.status(404).json({
       message: `No class found with ID ${classID}`,
     });
     return;
   }
-  const classIDs = await getMergedIDsForClass(classID);
+  const classIDs = await getMergedIDsForClass(classID, ignoreMergeOrder);
   res.json({
     merged_class_ids: classIDs,
   });