fix(model json converted to conflict rewind csv):

functions/import-conflict-convertor.js

@@ -9,6 +9,7 @@ module.exports = function (ctx) {
 
   convertConflictsToRewind.columnNames = columnNames
   convertConflictsToRewind.lineToJson = lineToJson
+  convertConflictsToRewind.jsonToRewind = jsonToRewind
 
   return convertConflictsToRewind
 }
@@ -40,7 +41,6 @@ function columnNames (line) {
 } // columnNames
 
 function lineToJson (line, columnNames) {
-
   const columns = csvParse(line)[0].map(s => s.trim())
 
   const json = {}
@@ -50,3 +50,11 @@ function lineToJson (line, columnNames) {
   })
   return json
 } // lineToJson
+
+function jsonToRewind (json, model) {
+  const modelName = `${model.namespace}.${model.name}`
+  const keyString = model.primaryKey.map(k => json[k]).join('_')
+  const oldValue = JSON.stringify(json)
+
+  return `${modelName},${keyString},'${oldValue}','{"action":"conflict"}'`
+} // jsonToRewind

test/conflicts-to-rewind-test.js

@@ -9,7 +9,7 @@ const path = require('path')
 
 describe('transform conflicts file to rewind audit entry', function () {
   this.timeout(process.env.TIMEOUT || 5000)
-  let tymlyService, conflictConvertor
+  let tymlyService, conflictConvertor, gazetteerModel
 
   before('set up tymly', async () => {
     const tymlyServices = await tymly.boot(
@@ -28,6 +28,7 @@ describe('transform conflicts file to rewind audit entry', function () {
     )
 
     tymlyService = tymlyServices.tymly
+    gazetteerModel = tymlyService.blueprintComponents.models.wmfs_gazetteer
     conflictConvertor = tymlyServices.functions.functions.ordnanceSurvey_importConflictConvertor
   })
 
@@ -63,6 +64,20 @@ describe('transform conflicts file to rewind audit entry', function () {
     })
   })
 
+  it('json to rewind row', () => {
+    const json = {
+      uprn: '12345678',
+      counter: '1',
+      street_name_1: '1 Trouser Street'
+    }
+
+    const rewind = conflictConvertor.func.jsonToRewind(json, gazetteerModel)
+
+    expect(rewind).to.eql(
+      'wmfs.gazetteer,12345678_1,\'{"uprn":"12345678","counter":"1","street_name_1":"1 Trouser Street"}\',\'{"action":"conflict"}\''
+    )
+  })
+
   after('shutdown tymly', async () => {
     await tymlyService.shutdown()
   })