Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Complete import on error

Edward Cuif120a3d7b1c4
diff --git a/server/src/api/sites/batchImportEvents.ts b/server/src/api/sites/batchImportEvents.ts
index 2696ce332..20efa5091 100644
--- a/server/src/api/sites/batchImportEvents.ts
+++ b/server/src/api/sites/batchImportEvents.ts
@@ -107,6 +107,10 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportReque
const errorMessage = insertError instanceof Error ? insertError.message : "Unknown error";
console.error("Failed to insert events:", errorMessage);
+ if (isLastBatch) {
+ importQuotaManager.completeImport(siteRecord.organizationId);
+ }
+
return reply.status(500).send({
error: `Failed to insert events: ${errorMessage}`,
});
diff --git a/server/src/api/sites/createSiteImport.ts b/server/src/api/sites/createSiteImport.ts
index 2d19c101c..adcef3c1a 100644
--- a/server/src/api/sites/createSiteImport.ts
+++ b/server/src/api/sites/createSiteImport.ts
@@ -60,29 +60,34 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportR
return reply.status(429).send({ error: "Only 1 concurrent import allowed per organization" });
}
- const quotaTracker = await importQuotaManager.getTracker(organizationId);
- const summary = quotaTracker.getSummary();
+ try {
+ const quotaTracker = await importQuotaManager.getTracker(organizationId);
+ const summary = quotaTracker.getSummary();
- const earliestAllowedDate = DateTime.fromFormat(summary.oldestAllowedMonth + "01", "yyyyMMdd", {
- zone: "utc",
- }).toFormat("yyyy-MM-dd");
- const latestAllowedDate = DateTime.utc().toFormat("yyyy-MM-dd");
+ const earliestAllowedDate = DateTime.fromFormat(summary.oldestAllowedMonth + "01", "yyyyMMdd", {
+ zone: "utc",
+ }).toFormat("yyyy-MM-dd");
+ const latestAllowedDate = DateTime.utc().toFormat("yyyy-MM-dd");
- const importRecord = await createImport({
- siteId,
- organizationId,
- platform,
- });
+ const importRecord = await createImport({
+ siteId,
+ organizationId,
+ platform,
+ });
- return reply.send({
- data: {
- importId: importRecord.importId,
- allowedDateRange: {
- earliestAllowedDate,
- latestAllowedDate,
+ return reply.send({
+ data: {
+ importId: importRecord.importId,
+ allowedDateRange: {
+ earliestAllowedDate,
+ latestAllowedDate,
+ },
},
- },
- });
+ });
+ } catch (error) {
+ importQuotaManager.completeImport(organizationId);
+ throw error;
+ }
} catch (error) {
console.error("Error creating import:", error);
return reply.status(500).send({ error: "Internal server error" });