lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes

Browse source
This commit is contained in:
Konstantin Mamalakis 2018-03-16 17:54:44 +02:00 • committed by Josh Harvey
parent 65f0e852d0
commit 577a85c9b1
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ofac/loading.js
View file

@ -54,6 +54,12 @@ const parseSource = source => {
const readStream = fs.createReadStream(source) const readStream = fs.createReadStream(source)
const jsonStream = readStream.pipe(ndjson.parse()) const jsonStream = readStream.pipe(ndjson.parse())
jsonStream.on('data', individual => { jsonStream.on('data', individual => {
_.forEach(period => {
_.forEach(date => {
const {year, month, day} = date
date.date = new Date(year, month - 1, day)
}, [period.start, period.end])
}, individual.birthDatePeriods)
individuals.push(individual) individuals.push(individual)
}) })

4
lib/ofac/parsing.js
View file

@ -93,9 +93,7 @@ function processDate (dateNode) {
const year = parseInt(dateNode.Year) const year = parseInt(dateNode.Year)
const month = parseInt(dateNode.Month) const month = parseInt(dateNode.Month)
const day = parseInt(dateNode.Day) const day = parseInt(dateNode.Day)
const date = new Date(year, month - 1, day) return {year, month, day}
return {year, month, day, date}
} }
function processFeature (featureNode) { function processFeature (featureNode) {

10
tests/ofac/parsing.js
View file

@ -114,8 +114,8 @@ const individualA = {id: '9', aliases: [{id: '5',
{value: 'john', phonetics: ['JN', 'AN']}, {value: 'john', phonetics: ['JN', 'AN']},
{value: 'doe', phonetics: ['T']}]}], {value: 'doe', phonetics: ['T']}]}],
birthDatePeriods: [{ birthDatePeriods: [{
start: {year: 1955, month: 10, day: 5, date: new Date(1955, 9, 5)}, start: {year: 1955, month: 10, day: 5},
end: {year: 1955, month: 10, day: 5, date: new Date(1955, 9, 5)}}] end: {year: 1955, month: 10, day: 5}}]
} }
const individualB = {id: '11', aliases: [{id: '15', const individualB = {id: '11', aliases: [{id: '15',
@ -129,8 +129,8 @@ const individualB = {id: '11', aliases: [{id: '15',
{value: 'de', phonetics: ['T']}, {value: 'de', phonetics: ['T']},
{value: 'gaul', phonetics: ['KL']}]}], {value: 'gaul', phonetics: ['KL']}]}],
birthDatePeriods: [{ birthDatePeriods: [{
start: {year: 1965, month: 11, day: 20, date: new Date(1965, 10, 20)}, start: {year: 1965, month: 11, day: 20},
end: {year: 1965, month: 11, day: 20, date: new Date(1965, 10, 20)}}] end: {year: 1965, month: 11, day: 20}}]
} }
@ -180,6 +180,8 @@ describe('OFAC', function () {
.then(([individuals]) => { .then(([individuals]) => {
assert.ok(Array.isArray(individuals)) assert.ok(Array.isArray(individuals))
assert.equal(individuals.length, 2) assert.equal(individuals.length, 2)
console.log(JSON.stringify(individuals[0]))
console.log(JSON.stringify(individualA))
assert.deepEqual(individuals, [individualA, individualB]) assert.deepEqual(individuals, [individualA, individualB])
}) })
}) })