fixed findOneAndUpdate

Author: ddfridley

app/lib/__tests__/undebates-from-template-and-rows.js

@@ -25,16 +25,56 @@ const inputRowObjs = [
   { Seat: 'President', Name: 'Jane Doe', Email: 'janedoe@doe.com' },
 ]
 
+let outRowObjs
+
 test('create an election in the db', async () => {
   const { rowObjs, messages } = await undebatesFromTemplateAndRows(viewerRecorderTemplate, inputRowObjs)
-  console.info('messages', messages)
+  outRowObjs = rowObjs
+  expect(rowObjs[0].viewer_url).toBe('https://cc.enciv.org/country:us/organization:cfa/office:president/2021-03-21')
+  expect(rowObjs[0].recorder_url).toMatch(
+    /https:\/\/cc.enciv.org\/country:us\/organization:cfa\/office:president\/2021-03-21-recorder-[a-f\d]{24}$/
+  )
+  const viewers = await Iota.find({ path: '/country:us/organization:cfa/office:president/2021-03-21' })
+  expect(viewers[0]).toMatchObject(viewerRecorderTemplate.candidateViewer)
+  const [recorder0] = await Iota.find({ 'bp_info.candidate_name': rowObjs[0].Name })
+  expect(recorder0).toMatchObject(viewerRecorderTemplate.candidateRecorder)
+  const [recorder1] = await Iota.find({ 'bp_info.candidate_name': rowObjs[1].Name })
+  expect(recorder1).toMatchObject(viewerRecorderTemplate.candidateRecorder)
+  expect(recorder0.parentId).toBe(MongoModels.ObjectID(viewers[0]._id).toString())
+  expect(recorder1.parentId).toBe(MongoModels.ObjectID(viewers[0]._id).toString())
+})
+
+test('update the agenda', async () => {
+  viewerRecorderTemplate.candidateViewer.webComponent.participants.moderator.agenda = [
+    ['New Introductions', '1- Name', '2- Planet', '3- language', '4- What role are you running for?'],
+    ['How did you evolve?'],
+    ['What is your favorite pet'],
+    ['How do we get off this planet'],
+    [
+      'What is the one thing you want us to know about your candidacy that was not covered by the candidate questions provided?',
+    ],
+    ['Thank you!'],
+  ]
+  viewerRecorderTemplate.candidateRecorder.component.participants.moderator.agenda = [
+    ['1- How To', '2- Record Placeholder'],
+    ['New Introductions', '1- Name', '2- Planet', '3- language', '4- What role are you running for?'],
+    ['How did you evolve?'],
+    ['What is your favorite pet'],
+    ['How do we get off this planet'],
+    [
+      'What is the one thing you want us to know about your candidacy that was not covered by the candidate questions provided?',
+    ],
+    ['Thank you!'],
+  ]
+  const { rowObjs, messages } = await undebatesFromTemplateAndRows(viewerRecorderTemplate, outRowObjs)
   expect(rowObjs[0].viewer_url).toBe('https://cc.enciv.org/country:us/organization:cfa/office:president/2021-03-21')
   expect(rowObjs[0].recorder_url).toMatch(
     /https:\/\/cc.enciv.org\/country:us\/organization:cfa\/office:president\/2021-03-21-recorder-[a-f\d]{24}$/
   )
   const viewers = await Iota.find({ path: '/country:us/organization:cfa/office:president/2021-03-21' })
   expect(viewers[0]).toMatchObject(viewerRecorderTemplate.candidateViewer)
   const [recorder0] = await Iota.find({ 'bp_info.candidate_name': rowObjs[0].Name })
+
   expect(recorder0).toMatchObject(viewerRecorderTemplate.candidateRecorder)
   const [recorder1] = await Iota.find({ 'bp_info.candidate_name': rowObjs[1].Name })
   expect(recorder1).toMatchObject(viewerRecorderTemplate.candidateRecorder)

app/lib/undebates-from-template-and-rows.js

@@ -45,7 +45,8 @@ function updateOrCreatePair(csvRowObj, template, messages) {
       var viewerObj = cloneDeep(viewers[0])
       mergeWithVerbose(viewerObj, template.getViewer(csvRowObj), messages)
       template.overWriteViewerInfo.call(template, viewerObj, csvRowObj)
-      await Iota.findOneAndReplace({ _id: viewerObj._id }, viewerObj)
+      const newViewerObj = await Iota.findOneAndReplace({ _id: viewerObj._id }, viewerObj, { returnNewDocument: true })
+      if (!newViewerObj) ko("couldn't update viewer")
       var recorders = await Iota.find({ path: template.recorderPath.call(template, csvRowObj) })
       if (recorders.length === 0) {
         // it didn't exist
@@ -55,7 +56,10 @@ function updateOrCreatePair(csvRowObj, template, messages) {
         var newRecorder = cloneDeep(recorders[0])
         mergeWithVerbose(newRecorder, template.getRecorder(csvRowObj), messages)
         template.overWriteRecorderInfo.call(template, newRecorder, viewerObj, csvRowObj)
-        var recorderObj = await Iota.findOneAndReplace({ _id: newRecorder._id }, newRecorder)
+        var recorderObj = await Iota.findOneAndReplace({ _id: newRecorder._id }, newRecorder, {
+          returnNewDocument: true,
+        })
+        if (!recorderObj) ko("couldn't update recorder")
         return ok({ viewerObj, recorderObj })
       }
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "undebate",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Not debates, but a place where voters can get to know their candidates",
   "main": "dist/index.js",
   "scripts": {