diff --git a/noncore/_utils/rfcx-mqtt/mqtt-checkin-router.js b/noncore/_utils/rfcx-mqtt/mqtt-checkin-router.js index cd260bd44..60e8fddce 100644 --- a/noncore/_utils/rfcx-mqtt/mqtt-checkin-router.js +++ b/noncore/_utils/rfcx-mqtt/mqtt-checkin-router.js @@ -44,9 +44,6 @@ function onMessageCheckin (data, messageId) { .then((checkInObj) => { return checkInDatabase.syncGuardianPrefs(checkInObj) }) - .then((checkInObj) => { - return checkInDatabase.createDbAudio(checkInObj) - }) .then((checkInObj) => { return checkInDatabase.createDbScreenShot(checkInObj) }) @@ -65,6 +62,10 @@ function onMessageCheckin (data, messageId) { } return Promise.resolve(checkInObj) }) + // Create audio db after getting path from ingest + .then((checkInObj) => { + return checkInDatabase.createDbAudio(checkInObj) + }) .then((checkInObj) => { return checkInDatabase.finalizeCheckIn(checkInObj) }) diff --git a/noncore/_utils/rfcx-mqtt/mqtt-database.js b/noncore/_utils/rfcx-mqtt/mqtt-database.js index f4238de23..7a01795cf 100644 --- a/noncore/_utils/rfcx-mqtt/mqtt-database.js +++ b/noncore/_utils/rfcx-mqtt/mqtt-database.js @@ -354,7 +354,7 @@ exports.checkInDatabase = { site_id: checkInObj.db.dbGuardian.site_id, check_in_id: checkInObj.db.dbCheckIn.id, sha1_checksum: checkInObj.audio.meta.sha1CheckSum, - url: null, + url: `s3://${checkInObj.audio.meta.ingestBucket}/${checkInObj.audio.meta.ingestPath}`, encode_duration: checkInObj.audio.meta.encodeDuration, measured_at: checkInObj.audio.meta.measuredAt, measured_at_local: moment.tz(checkInObj.audio.meta.measuredAt, (checkInObj.db.dbSite.timezone || 'UTC')).format('YYYY-MM-DDTHH:mm:ss.SSS'), diff --git a/noncore/_utils/rfcx-mqtt/mqtt-streams.js b/noncore/_utils/rfcx-mqtt/mqtt-streams.js index 309e8372a..8d1bdcc66 100644 --- a/noncore/_utils/rfcx-mqtt/mqtt-streams.js +++ b/noncore/_utils/rfcx-mqtt/mqtt-streams.js @@ -19,6 +19,8 @@ async function ingestGuardianAudio (checkInObj) { targetBitrate: checkInObj.audio.meta.bitRate, sampleRate: checkInObj.audio.meta.sampleRate }) + checkInObj.audio.meta.ingestPath = uploadData.path + checkInObj.audio.meta.ingestBucket = uploadData.bucket await S3Service.putObject(checkInObj.audio.filePath, uploadData.path, uploadData.bucket) assetUtils.deleteLocalFileFromFileSystem(checkInObj.audio.filePath) return checkInObj