From 9c9213de6692e6a052656aae91b1b7d9af834ab3 Mon Sep 17 00:00:00 2001 From: Benjamin Blanchard Date: Thu, 27 Aug 2026 16:15:14 -0400 Subject: [PATCH 1/2] fix export query for typeorm 1; await call to avoid crash --- packages/backend/src/api/repositories/LogRepository.ts | 8 ++++++-- packages/backend/src/api/services/AnalyticsService.ts | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/api/repositories/LogRepository.ts b/packages/backend/src/api/repositories/LogRepository.ts index 5d0d866e9d..518c62484f 100644 --- a/packages/backend/src/api/repositories/LogRepository.ts +++ b/packages/backend/src/api/repositories/LogRepository.ts @@ -163,9 +163,13 @@ export class LogRepository extends Repository { .innerJoin(IndividualEnrollment, 'individualEnrollment', '"individualEnrollment"."experimentId"=experiment.id') .innerJoin('experiment.queries', 'queries') .innerJoin('queries.metric', 'metric') - .innerJoin('metric.logs', 'logs', '"logs"."userId"="individualEnrollment"."userId"') + .innerJoin('metric.logs', 'logs') .where('experiment.id=:experimentId', { experimentId }) - .execute(); + .andWhere('"logs"."userId"="individualEnrollment"."userId"') + .getRawMany() + .catch((errorMsg: any) => { + throw errorMsg; + }); } public prepareMetricString(metricId: string[]) { diff --git a/packages/backend/src/api/services/AnalyticsService.ts b/packages/backend/src/api/services/AnalyticsService.ts index 0659b130c6..6742cf1514 100644 --- a/packages/backend/src/api/services/AnalyticsService.ts +++ b/packages/backend/src/api/services/AnalyticsService.ts @@ -135,7 +135,7 @@ export class AnalyticsService { throw new HttpError(404, `Experiment not found for id: ${experimentId}`); } - this.sendExportData(experimentDetails, email, logger); + await this.sendExportData(experimentDetails, email, logger); } private async sendExportData( From 05b44691c1d0febada6144158fc2270ecd1cebb0 Mon Sep 17 00:00:00 2001 From: Benjamin Blanchard Date: Thu, 27 Aug 2026 16:36:38 -0400 Subject: [PATCH 2/2] use repositoryError --- packages/backend/src/api/repositories/LogRepository.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/api/repositories/LogRepository.ts b/packages/backend/src/api/repositories/LogRepository.ts index 518c62484f..c7e2c00caa 100644 --- a/packages/backend/src/api/repositories/LogRepository.ts +++ b/packages/backend/src/api/repositories/LogRepository.ts @@ -168,7 +168,8 @@ export class LogRepository extends Repository { .andWhere('"logs"."userId"="individualEnrollment"."userId"') .getRawMany() .catch((errorMsg: any) => { - throw errorMsg; + const errorMsgString = repositoryError('LogRepository', 'getLogPerExperimentQuery', { experimentId }, errorMsg); + throw errorMsgString; }); }