Skip to content

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

Add import status table

Edward Cuiec1a3e5128bc
diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.ts
index d2669b1b6..ee1f30858 100644
--- a/server/src/db/postgres/schema.ts
+++ b/server/src/db/postgres/schema.ts
@@ -8,6 +8,7 @@ import {
timestamp,
foreignKey,
unique,
+ bigint,
} from "drizzle-orm/pg-core";
// User table
@@ -252,3 +253,42 @@ export const goals = pgTable(
}),
]
);
+
+// Import status table for tracking data import progress
+export const importStatus = pgTable(
+ "import_status",
+ {
+ importId: text("import_id").primaryKey().notNull(),
+ siteId: integer("site_id").notNull(),
+ organizationId: text("organization_id").notNull(),
+ source: text("source").notNull(),
+ status: text("status").notNull().default("pending"),
+ totalRows: integer("total_rows"),
+ processedRows: integer("processed_rows").default(0),
+ chunksCompleted: integer("chunks_completed").default(0),
+ totalChunks: integer("total_chunks"),
+ errorMessage: text("error_message"),
+ startedAt: timestamp("started_at").defaultNow(),
+ completedAt: timestamp("completed_at"),
+ fileName: text("file_name").notNull(),
+ fileSize: bigint("file_size", { mode: "number" }).notNull(),
+ createdBy: text("created_by").notNull(),
+ },
+ (table) => [
+ foreignKey({
+ columns: [table.siteId],
+ foreignColumns: [sites.siteId],
+ name: "import_status_site_id_sites_site_id_fk",
+ }),
+ foreignKey({
+ columns: [table.organizationId],
+ foreignColumns: [organization.id],
+ name: "import_status_organization_id_organization_id_fk",
+ }),
+ foreignKey({
+ columns: [table.createdBy],
+ foreignColumns: [user.id],
+ name: "import_status_created_by_user_id_fk",
+ }),
+ ]
+);
diff --git a/server/src/types/import.ts b/server/src/types/import.ts
index cfc73a783..c0a5465a2 100644
--- a/server/src/types/import.ts
+++ b/server/src/types/import.ts
@@ -22,6 +22,24 @@ export interface ImportMapper<T> {
transform(rows: T, site: string, importId: string): RybbitEvent[];
}
+export interface ImportStatus {
+ import_id: string;
+ site_id: string;
+ organization: string;
+ source: "umami";
+ status: "pending" | "processing" | "completed" | "failed";
+ total_rows?: number;
+ processed_rows: number;
+ chunks_completed: number;
+ total_chunks?: number;
+ error_message?: string;
+ started_at: Date;
+ completed_at?: Date;
+ file_name: string;
+ file_size: number;
+ created_by: string; // user_id
+}
+
interface RybbitEvent {
site_id: number;
timestamp: string;