Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix stream_id undefined #643

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Fix stream_id undefined #643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions noncore/views/v1/models/guardian-audio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ exports.models = {
const queryParams = parsePermittedQueryParams(req.query, clipDurationFull)

// auto-generate the asset filepath if it's not stored in the url column
const segment = await StreamSegment.findOne({ where: { stream_id: dbRow.stream_id, start: dbRow.measured_at } })
const segment = await StreamSegment.findOne({ where: { stream_id: dbRow.Guardian.stream_id, start: dbRow.measured_at } })
const dateTimeString = dbRow.measured_at.toISOString().substr(0, 19).replace(/:/g, '-')
const audioPath = `/${dateTimeString.substr(0, 4)}/${dateTimeString.substr(5, 2)}/${dateTimeString.substr(8, 2)}/${dbRow.stream_id}/${segment.id}.${dbRow.Format.file_extension}`
const audioPath = `/${dateTimeString.substr(0, 4)}/${dateTimeString.substr(5, 2)}/${dateTimeString.substr(8, 2)}/${dbRow.Guardian.stream_id}/${segment.id}.${dbRow.Format.file_extension}`
const audioStorageUrl = (dbRow.url == null)
? 's3://' + process.env.INGEST_BUCKET + audioPath
: dbRow.url
Expand Down Expand Up @@ -88,9 +88,9 @@ exports.models = {
const queryParams = parsePermittedQueryParams(req.query, (dbRow.capture_sample_count / dbRow.Format.sample_rate))

// auto-generate the asset filepath if it's not stored in the url column
const segment = await StreamSegment.findOne({ where: { stream_id: dbRow.stream_id, start: dbRow.measured_at } })
const segment = await StreamSegment.findOne({ where: { stream_id: dbRow.Guardian.stream_id, start: dbRow.measured_at } })
const dateTimeString = dbRow.measured_at.toISOString().substr(0, 19).replace(/:/g, '-')
const audioPath = `/${dateTimeString.substr(0, 4)}/${dateTimeString.substr(5, 2)}/${dateTimeString.substr(8, 2)}/${dbRow.stream_id}/${segment.id}.${dbRow.Format.file_extension}`
const audioPath = `/${dateTimeString.substr(0, 4)}/${dateTimeString.substr(5, 2)}/${dateTimeString.substr(8, 2)}/${dbRow.Guardian.stream_id}/${segment.id}.${dbRow.Format.file_extension}`
const audioStorageUrl = (dbRow.url == null)
? 's3://' + process.env.INGEST_BUCKET + audioPath
: dbRow.url
Expand Down
Loading