Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fix: Optimise import ID calculation

Blue Mouseea20fbbd5e92
diff --git a/backend/apps/cloud/src/data-import/data-import.service.ts b/backend/apps/cloud/src/data-import/data-import.service.ts
index d6721bed8..65da68a73 100644
--- a/backend/apps/cloud/src/data-import/data-import.service.ts
+++ b/backend/apps/cloud/src/data-import/data-import.service.ts
@@ -26,13 +26,29 @@ export class DataImportService {
) {}
private async getNextImportId(projectId: string): Promise<number> {
- const result = await this.dataImportRepository
+ const existingImportIds = await this.dataImportRepository
.createQueryBuilder('di')
- .select('MAX(di.importId)', 'maxId')
+ .select('di.importId', 'importId')
.where('di.projectId = :projectId', { projectId })
- .getRawOne<{ maxId: number | null }>()
+ .orderBy('di.importId', 'ASC')
+ .getRawMany<{ importId: number | string }>()
- const next = (result?.maxId ?? 0) + 1
+ let next = 1
+
+ for (const { importId } of existingImportIds) {
+ const currentImportId = Number(importId)
+
+ if (currentImportId < next) {
+ continue
+ }
+
+ if (currentImportId === next) {
+ next += 1
+ continue
+ }
+
+ break
+ }
if (next > MAX_IMPORT_ID) {
throw new BadRequestException(
diff --git a/backend/apps/community/src/data-import/data-import.service.ts b/backend/apps/community/src/data-import/data-import.service.ts
index b1fd9b7c7..f7f4bd12d 100644
--- a/backend/apps/community/src/data-import/data-import.service.ts
+++ b/backend/apps/community/src/data-import/data-import.service.ts
@@ -21,12 +21,27 @@ export class DataImportService {
private async getNextId(projectId: string): Promise<number> {
const result = await clickhouse
.query({
- query: `SELECT max(id) as maxId FROM ${CLICKHOUSE_DB}.data_import FINAL WHERE projectId = {projectId:FixedString(12)}`,
+ query: `SELECT id FROM ${CLICKHOUSE_DB}.data_import FINAL WHERE projectId = {projectId:FixedString(12)} ORDER BY id ASC`,
query_params: { projectId },
})
- .then((rs) => rs.json<{ maxId: number }>())
+ .then((rs) => rs.json<{ id: number | string }>())
- const next = (result.data?.[0]?.maxId || 0) + 1
+ let next = 1
+
+ for (const row of result.data || []) {
+ const currentId = Number(row.id)
+
+ if (currentId < next) {
+ continue
+ }
+
+ if (currentId === next) {
+ next += 1
+ continue
+ }
+
+ break
+ }
if (next > MAX_IMPORT_ID) {
throw new BadRequestException(