Track who called in a correct answer

Sets solved_by to whoever called in the answer and confirmed_by to whoever confirmed it.
Torgen · Jan 16, 2020 · f429ebe · f429ebe
1 parent 42d9122
commit f429ebe
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 11 deletions.
diff --git a/lib/methods/correctCallIn.test.coffee b/lib/methods/correctCallIn.test.coffee
@@ -37,6 +37,7 @@ describe 'correctCallIn', ->
         touched_by: 'cscott'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
         feedsInto: []
       callin = model.CallIns.insert
@@ -71,7 +72,8 @@ describe 'correctCallIn', ->
           touched: 7
           touched_by: 'cjb'
           solved: 7
-          solved_by: 'cjb'
+          solved_by: 'torgen'
+          confirmed_by: 'cjb'
           tags: answer:
             name: 'Answer'
             value: 'precipitate'
@@ -119,6 +121,7 @@ describe 'correctCallIn', ->
         touched_by: 'cscott'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
         incorrectAnswers: []
         feedsInto: []
@@ -144,6 +147,7 @@ describe 'correctCallIn', ->
         touched_by: 'cscott'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
         feedsInto: []
       callin = model.CallIns.insert
@@ -175,6 +179,7 @@ describe 'correctCallIn', ->
             touched_by: 'cscott'
             solved: null
             solved_by: null
+            confirmed_by: null
             tags: {}
 
         it 'removes callin', ->
@@ -214,6 +219,7 @@ describe 'correctCallIn', ->
           touched_by: 'cscott'
           solved: null
           solved_by: null
+          confirmed_by: null
           tags: {}
 
       it 'removes callin', ->
@@ -254,6 +260,7 @@ describe 'correctCallIn', ->
         touched_by: 'cscott'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
         incorrectAnswers: []
         feedsInto: []
@@ -274,6 +281,7 @@ describe 'correctCallIn', ->
         touched_by: 'cscott'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
         feedsInto: []
       callin = model.CallIns.insert
@@ -305,6 +313,7 @@ describe 'correctCallIn', ->
             touched_by: 'cscott'
             solved: null
             solved_by: null
+            confirmed_by: null
             tags: {}
 
         it 'removes callin', ->
@@ -344,6 +353,7 @@ describe 'correctCallIn', ->
           touched_by: 'cscott'
           solved: null
           solved_by: null
+          confirmed_by: null
           tags: {}
 
       it 'removes callin', ->
@@ -384,6 +394,7 @@ describe 'correctCallIn', ->
         touched_by: 'cscott'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
         incorrectAnswers: []
         feedsInto: []
@@ -404,6 +415,7 @@ describe 'correctCallIn', ->
         touched_by: 'cscott'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
         feedsInto: []
       callin = model.CallIns.insert
@@ -435,6 +447,7 @@ describe 'correctCallIn', ->
             touched_by: 'cscott'
             solved: null
             solved_by: null
+            confirmed_by: null
             tags: {}
 
         it 'removes callin', ->
@@ -475,6 +488,7 @@ describe 'correctCallIn', ->
           touched_by: 'cscott'
           solved: null
           solved_by: null
+          confirmed_by: null
           tags: {}
 
       it 'removes callin', ->
@@ -516,6 +530,7 @@ describe 'correctCallIn', ->
         touched_by: 'cscott'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
         incorrectAnswers: []
         feedsInto: []

diff --git a/lib/methods/deleteAnswer.test.coffee b/lib/methods/deleteAnswer.test.coffee
@@ -62,6 +62,7 @@ describe 'deleteAnswer', ->
       touched_by: 'cjb'
       solved: null
       solved_by: null
+      confirmed_by: null
       tags: status: {name: 'Status', value: 'stuck', touched: 2, touched_by: 'torgen'}
     oplogs = model.Messages.find(room_name: 'oplog/0').fetch()
     chai.assert.equal oplogs.length, 1
@@ -88,7 +89,8 @@ describe 'deleteAnswer', ->
       touched: 2
       touched_by: 'torgen'
       solved: 2
-      solved_by: 'torgen'
+      solved_by: 'cjb'
+      confirmed_by: 'torgen'
       tags:
         answer: {name: 'Answer', value: 'foo', touched: 2, touched_by: 'torgen'}
         temperature: {name: 'Temperature', value: '12', touched: 2, touched_by: 'torgen'}
@@ -104,6 +106,7 @@ describe 'deleteAnswer', ->
       touched_by: 'cjb'
       solved: null
       solved_by: null
+      confirmed_by: null
       tags: temperature: {name: 'Temperature', value: '12', touched: 2, touched_by: 'torgen'}
     oplogs = model.Messages.find(room_name: 'oplog/0').fetch()
     chai.assert.equal oplogs.length, 1
@@ -130,7 +133,8 @@ describe 'deleteAnswer', ->
       touched: 2
       touched_by: 'torgen'
       solved: 2
-      solved_by: 'torgen'
+      solved_by: 'cjb'
+      confirmed_by: 'torgen'
       tags:
         answer: {name: 'Answer', value: 'foo', touched: 2, touched_by: 'torgen'}
         backsolve: {name: 'Backsolve', value: 'yes', touched: 2, touched_by: 'torgen'}
@@ -147,6 +151,7 @@ describe 'deleteAnswer', ->
       touched_by: 'cjb'
       solved: null
       solved_by: null
+      confirmed_by: null
       tags: {}
     oplogs = model.Messages.find(room_name: 'oplog/0').fetch()
     chai.assert.equal oplogs.length, 1

diff --git a/lib/methods/setAnswer.test.coffee b/lib/methods/setAnswer.test.coffee
@@ -37,6 +37,7 @@ describe 'setAnswer', ->
         touched_by: 'torgen'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: technology: {name: 'Technology', value: 'Pottery', touched: 2, touched_by: 'torgen'}
     it 'fails without login', ->
       chai.assert.throws ->
@@ -66,6 +67,7 @@ describe 'setAnswer', ->
           touched_by: 'cjb'
           solved: 7
           solved_by: 'cjb'
+          confirmed_by: 'cjb'
           tags:
             answer: {name: 'Answer', value: 'bar', touched: 7, touched_by: 'cjb'}
             technology: {name: 'Technology', value: 'Pottery', touched: 2, touched_by: 'torgen'}
@@ -94,7 +96,8 @@ describe 'setAnswer', ->
         touched: 2
         touched_by: 'torgen'
         solved: 2
-        solved_by: 'torgen'
+        solved_by: 'cscott'
+        confirmed_by: 'torgen'
         tags:
           answer: {name: 'Answer', value: 'qux', touched: 2, touched_by: 'torgen'}
           technology:{name: 'Technology', value: 'Pottery', touched: 2, touched_by: 'torgen'}
@@ -116,6 +119,7 @@ describe 'setAnswer', ->
         touched_by: 'cjb'
         solved: 7
         solved_by: 'cjb'
+        confirmed_by: 'cjb'
         tags:
           answer: {name: 'Answer', value: 'bar', touched: 7, touched_by: 'cjb'}
           technology: {name: 'Technology', value: 'Pottery', touched: 2, touched_by: 'torgen'}
@@ -145,7 +149,8 @@ describe 'setAnswer', ->
         touched: 2
         touched_by: 'torgen'
         solved: 2
-        solved_by: 'torgen'
+        solved_by: 'cscott'
+        confirmed_by: 'torgen'
         tags:
           answer: {name: 'Answer', value: 'bar', touched: 2, touched_by: 'torgen'}
           technology: {name: 'Technology', value: 'Pottery', touched: 2, touched_by: 'torgen'}
@@ -166,7 +171,8 @@ describe 'setAnswer', ->
         touched: 2
         touched_by: 'torgen'
         solved: 2
-        solved_by: 'torgen'
+        solved_by: 'cscott'
+        confirmed_by: 'torgen'
         tags:
           answer: {name: 'Answer', value: 'bar', touched: 2, touched_by: 'torgen'}
           technology: {name: 'Technology', value: 'Pottery', touched: 2, touched_by: 'torgen'}
@@ -184,6 +190,7 @@ describe 'setAnswer', ->
       touched_by: 'torgen'
       solved: null
       solved_by: null
+      confirmed_by: null
       tags: status: {name: 'Status', value: 'stuck', touched: 2, touched_by: 'torgen'}
     chai.assert.isTrue callAs 'setAnswer', 'cjb',
       target: id
@@ -210,11 +217,13 @@ describe 'setAnswer', ->
         touched_by: 'torgen'
         solved: null
         solved_by: null
+        confirmed_by: null
         tags: {}
       cid1 = model.CallIns.insert
         target: id
         name: 'Foo'
         answer: 'bar'
+        callin_type: 'answer'
         created: 5
         created_by: 'codexbot'
         submitted_to_hq: true
@@ -224,6 +233,7 @@ describe 'setAnswer', ->
         target: id
         name: 'Foo'
         answer: 'qux'
+        callin_type: 'answer'
         created: 5
         created_by: 'codexbot'
         submitted_to_hq: false
@@ -239,5 +249,11 @@ describe 'setAnswer', ->
     it 'doesn\'t oplog for callins', ->
       chai.assert.lengthOf model.Messages.find({room_name: 'oplog/0', type: 'callins'}).fetch(), 0
 
-    it "oplogs for puzzle", ->
+    it 'oplogs for puzzle', ->
       chai.assert.lengthOf model.Messages.find({room_name: 'oplog/0', type: 'puzzles', id: id}).fetch(), 2
+
+    it 'sets solved_by correctly', ->
+      chai.assert.deepInclude model.Puzzles.findOne(id),
+        solved: 7
+        solved_by: 'codexbot'
+        confirmed_by: 'cjb'
diff --git a/lib/model.coffee b/lib/model.coffee
@@ -1201,8 +1201,12 @@ doc_id_to_link = (id) ->
       updateDoc = $set:
         solved: now
         solved_by: @userId
+        confirmed_by: @userId
         touched: now
         touched_by: @userId
+      c = CallIns.findOne(target: id, callin_type: callin_types.ANSWER, answer: args.answer)
+      if c?
+        updateDoc.$set.solved_by = c.created_by
       setTagInternal updateDoc,
         name: 'Answer'
         value: args.answer
@@ -1276,6 +1280,7 @@ doc_id_to_link = (id) ->
       updateDoc = $set:
         solved: null
         solved_by: null
+        confirmed_by: null
         touched: now
         touched_by: @userId
       deleteTagInternal updateDoc, 'answer'

diff --git a/server/hubot-scripts/codex.test.coffee b/server/hubot-scripts/codex.test.coffee
@@ -73,6 +73,7 @@ describe 'codex hubot script', ->
         touched: 7
         touched_by: 'torgen'
         solved: 7
+        confirmed_by: 'torgen'
         tags: answer:
           name: 'Answer'
           value: 'linear abeja'
@@ -88,7 +89,8 @@ describe 'codex hubot script', ->
         touched: 3
         touched_by: 'cjb'
         solved: 3
-        solved_by: 'cjb'
+        solved_by: 'cscott'
+        confirmed_by: 'cjb'
         tags:
           answer:
             name: 'Answer'
@@ -100,7 +102,7 @@ describe 'codex hubot script', ->
         room_name: 'puzzles/12345abcde'
         timestamp: Date.now()
         body: 'bot the answer to latino alphabet is linear abeja'
-      waitForDocument model.Puzzles, {_id: '12345abcde', solved_by: 'torgen'},
+      waitForDocument model.Puzzles, {_id: '12345abcde', solved_by: 'torgen', confirmed_by: 'torgen'},
         touched: 7
         touched_by: 'torgen'
         solved: 7
@@ -117,7 +119,8 @@ describe 'codex hubot script', ->
         canon: 'latino_alphabet'
         feedsInto: []
         solved: 3
-        solved_by: 'cjb'
+        solved_by: 'cscott'
+        confirmed_by: 'cjb'
         touched: 3
         touched_by: 'cjb'
         tags:
@@ -139,7 +142,8 @@ describe 'codex hubot script', ->
         touched: 3
         touched_by: 'cjb'
         solved: 3
-        solved_by: 'cjb'
+        solved_by: 'cscott'
+        confirmed_by: 'cjb'
         tags: answer:
           name: 'Answer'
           value: 'linear abeja'