fix: change photos path

This commit is contained in:
José Oliveira 2021-06-10 18:52:58 +01:00 committed by Josh Harvey
parent c221437618
commit c7d56c8110
6 changed files with 42 additions and 50 deletions

View file

@ -20,7 +20,7 @@ const notifierUtils = require('./notifier/utils')
const NUM_RESULTS = 1000
const idPhotoCardBasedir = _.get('idPhotoCardDir', options)
const frontCameraBaseDir = _.get('frontCameraDir', options)
const idCardDataDir = _.get('idCardDataDir', options)
const operatorDataDir = _.get('operatorDataDir', options)
/**
* Add new customer
@ -576,51 +576,36 @@ function updatePhotoCard (id, patch) {
* @param {String} directory directory path of id card data for a certain user
*/
function updatePhoto (imageData, directory) {
return Promise.resolve(imageData)
function updatePhotos (imagesData, id, dir) {
return Promise.resolve(imagesData)
.then(patch => {
if (_.isEmpty(imageData)) {
if (_.isEmpty(imagesData)) {
return patch
}
const newPatch = {
idCardDataPath: ''
}
// decode the base64 string to binary data
const decodedImageData = Buffer.from(imageData, 'base64')
// workout the image hash
// i.e. 240e85ff2e4bb931f235985dd0134e459239496d2b5af6c5665168d38ef89b50
const hash = crypto
.createHash('sha256')
.update(imageData)
.digest('hex')
// workout the image folder
// i.e. 24/0e/85
const rpath = _.join(path.sep, _.map(_.wrap(_.join, ''), _.take(3, _.chunk(2, _.split('', hash)))))
// i.e. ../<lamassu-server-home>/idcardphoto/customer_id/24/0e/85
const dirname = path.join(directory, rpath)
const newPatch = {}
// i.e. ../<lamassu-server-home>/<operatorid>/<customerid>/idcarddata
console.log(dir, 'directoryyyy')
const dirname = path.join(dir)
console.log(dirname, 'dirnaaaaaaaaaaaaaaame')
// create the directory tree if needed
_.attempt(() => makeDir.sync(dirname))
const promises = imagesData.map((imageData, index) => {
console.log(index)
// decode the base64 string to binary data
const decodedImageData = Buffer.from(imageData, 'base64')
// i.e. ../<lamassu-server-home>/idcardphoto/customer_id/24/0e/85/240e85ff2e4bb931f235985dd01....jpg
const filename = path.join(dirname, hash + '.jpg')
// i.e. ../<lamassu-server-home>/<operatorid>/<customerid>/idcarddata/1.jpg
const filename = path.join(dirname, index + '.jpg')
//
// i.e. {
// "idCardDataPath": "24/0e/85/240e85ff2e4bb931f235985dd01....jpg",
// "idCardDataAt": "now()"
// }
newPatch.idCardData = path.join(rpath)
newPatch.idCardDataAt = 'now()'
return writeFile(filename, decodedImageData)
})
// write image file
return writeFile(filename, decodedImageData)
.then(() => newPatch)
return Promise.all(promises)
.then(arr => {
newPatch.idCardData = path.join(dirname)
newPatch.idCardDataAt = 'now()'
return newPatch
})
})
}
@ -630,15 +615,16 @@ function updatePhoto (imageData, directory) {
* @returns {Promise<Object>} new patch to be applied
*/
function updateIdCardData (patch, id) {
const directory = idCardDataDir + '/' + id
/* TODO: fetch operator id */
const operatorId = 'id-operator'
const directory = operatorDataDir + '/' + operatorId + '/' + id + '/'
console.log(directory)
return Promise.resolve(patch)
.then(patch => {
const imagesData = _.get('photos', patch)
_.map(imageData => {
return updatePhoto(imageData, directory)
.then(newPatch => newPatch)
.catch(err => console.log('An error ocurred while saving the image ', err))
}, imagesData)
return updatePhotos(imagesData, id, directory)
.then(newPatch => newPatch)
.catch(err => console.log('An error ocurred while saving the image ', err))
})
}