diff --git a/apps/cli/src/backup/projects/export/index.ts b/apps/cli/src/backup/projects/export/index.ts index b9f916575..9eb882e6b 100644 --- a/apps/cli/src/backup/projects/export/index.ts +++ b/apps/cli/src/backup/projects/export/index.ts @@ -127,11 +127,11 @@ export const generateCsvs = async ( } if (item === 'pattern_matching_rois' && !minimum) { - const allRecords = fetchAllRecordsUsingSubquery<{ pattern_matching_id: number }>( + const allRecords = fetchAllRecordsUsingSubquery<{ project_id: number }>( 'pattern_matchings', item, { projectId }, - (t) => ({ patternMatchingId: t.pattern_matching_id }), + (t) => ({ projectId: t.project_id }), sequelize, storage, legacyStorage, diff --git a/apps/cli/src/backup/projects/export/queries.ts b/apps/cli/src/backup/projects/export/queries.ts index eaa4af630..f0930fed2 100644 --- a/apps/cli/src/backup/projects/export/queries.ts +++ b/apps/cli/src/backup/projects/export/queries.ts @@ -138,26 +138,25 @@ export const PATTERN_MATCHINGS = ` ` export const PATTERN_MATCHING_ROIS = ` - select - pattern_matching_roi_id, - pmr.pattern_matching_id, - recording_id, - pmr.species_id, - pmr.songtype_id, - x1, - y1, - x2, - y2, - score, - validated - from pattern_matching_rois pmr - join pattern_matchings pm on pmr.pattern_matching_id = pm.pattern_matching_id - join jobs j on pm.job_id = j.job_id - where pm.pattern_matching_id = $patternMatchingId and pm.deleted = 0 and j.state = 'completed' +select + pmr.pattern_matching_id, + pmr.recording_id, + pmr.species_id, + pmr.songtype_id, + x1, + x2, + y1, + y2, + score, + validated +from pattern_matching_rois pmr +join pattern_matchings pm on pmr.pattern_matching_id = pm.pattern_matching_id +where pm.project_id = $projectId and validated is not null limit $limit offset $offset ` + export const SOUNDSCAPES = ` select soundscape_id,