MutableClimbDataSource#addOrUpdateClimbs should keep order of climbs

Author: greghart

src/model/MutableClimbDataSource.ts

@@ -107,6 +107,16 @@ export default class MutableClimbDataSource extends ClimbDataSource {
 
     const newDocs: ClimbChangeDocType[] = []
 
+    // when adding new climbs, ensure they are added in expected sort order, such that:
+    // * multiple climbs keep the order they're input in.
+    // * all newly added climbs come after existing climbs.
+    let newClimbLeftRightIndex = await this.climbModel
+      .find({ _id: { $in: parent.climbs } })
+      .select('metadata.left_right_index')
+      .sort({ 'metadata.left_right_index': -1 })
+      .limit(1)[0]
+      ?.metadata.left_right_index ?? 1
+
     for (let i = 0; i < userInput.length; i++) {
       // when adding new climbs we require name and disciplines
       if (!idList[i].existed && userInput[i].name == null) {
@@ -186,6 +196,8 @@ export default class MutableClimbDataSource extends ClimbDataSource {
         metadata: {
           areaRef: parent.metadata.area_id,
           lnglat: parent.metadata.lnglat,
+          // waterfall left_right_index -- new climbs get auto incremented, but user input always overrides
+          ...!idList[i].existed && { left_right_index: newClimbLeftRightIndex++ },
           ...userInput[i]?.leftRightIndex != null && { left_right_index: userInput[i].leftRightIndex }
         },
         ...!idList[i].existed && { createdBy: experimentalUserId ?? userId },

src/model/__tests__/MutableClimbDataSource.ts

@@ -178,22 +178,33 @@ describe('Climb CRUD', () => {
     const newIDs = await climbs.addOrUpdateClimbs(
       testUser,
       routesArea.metadata.area_id,
-      newClimbsToAdd)
+      newClimbsToAdd
+    )
 
     expect(newIDs).toHaveLength(newClimbsToAdd.length)
 
-    const climb0 = await climbs.findOneClimbByMUUID(muid.from(newIDs[0]))
-
-    // Validate new climb
-    expect(climb0).toMatchObject({
-      name: newClimbsToAdd[0].name,
-      type: sanitizeDisciplines(newClimbsToAdd[0].disciplines),
-      content: {
-        description: newClimbsToAdd[0].description,
-        location: newClimbsToAdd[0].location,
-        protection: newClimbsToAdd[0].protection
-      }
-    })
+    // Validate all climbs were added, and in the order we expect
+    for (const [i, climbIn] of newClimbsToAdd.entries()) {
+      const climbOut = await climbs.findOneClimbByMUUID(muid.from(newIDs[i]))
+
+      // Validate new climb
+      expect(climbOut).toMatchObject({
+        name: climbIn.name,
+        type: sanitizeDisciplines(climbIn.disciplines),
+        metadata: {
+          left_right_index: i + 1
+        },
+        ...climbIn.description === undefined
+          ? {}
+          : {
+              content: {
+                description: climbIn.description,
+                location: climbIn.location,
+                protection: climbIn.protection
+              }
+            }
+      })
+    }
 
     // California contains subareas.  Should fail.
     await expect(