🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Merge branch 'master' into umami-import
Edward Cuif76a4d47e72a
diff --cc server/src/db/postgres/schema.tsindex 3b7a56f38,282257fff..1e1411877--- a/server/src/db/postgres/schema.ts+++ b/server/src/db/postgres/schema.ts@@@ -603,34 -599,21 +603,53 @@@ export const notificationChannels = pgT]);+ // Google Search Console connections table+ export const gscConnections = pgTable("gsc_connections", {+ siteId: integer("site_id")+ .primaryKey()+ .notNull()+ .references(() => sites.siteId, { onDelete: "cascade" }),++ // OAuth tokens+ accessToken: text("access_token").notNull(),+ refreshToken: text("refresh_token").notNull(),+ expiresAt: timestamp("expires_at", { mode: "string" }).notNull(),++ // Which GSC property this connection is for+ gscPropertyUrl: text("gsc_property_url").notNull(),++ createdAt: timestamp("created_at", { mode: "string" }).defaultNow().notNull(),+ updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow().notNull(),+ });+++export const importPlatformEnum = pgEnum("import_platform_enum", ["umami"]);++export const importStatusEnum = pgEnum("import_status_enum", ["pending", "processing", "completed", "failed"]);++export const importStatus = pgTable(+ "import_status",+ {+ importId: uuid("import_id").primaryKey().notNull().defaultRandom(),+ siteId: integer("site_id").notNull(),+ organizationId: text("organization_id").notNull(),+ platform: importPlatformEnum("platform").notNull(),+ status: importStatusEnum("status").notNull().default("pending"),+ importedEvents: integer("imported_events").notNull().default(0),+ errorMessage: text("error_message"),+ startedAt: timestamp("started_at", { mode: "string" }).notNull().defaultNow(),+ completedAt: timestamp("completed_at", { mode: "string" }),+ fileName: text("file_name").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",+ }),+ ]+);diff --cc server/src/index.tsindex 8bcfe3496,6ab88cfdf..c151dc8fd--- a/server/src/index.ts+++ b/server/src/index.ts@@@ -80,10 -80,12 +81,16 @@@ import { extractSiteId } from "./utils.import { getTrackingConfig } from "./api/sites/getTrackingConfig.js";import { updateSitePrivateLinkConfig } from "./api/sites/updateSitePrivateLinkConfig.js";import { getSitePrivateLinkConfig } from "./api/sites/getSitePrivateLinkConfig.js";+ import { connectGSC } from "./api/gsc/connect.js";+ import { gscCallback } from "./api/gsc/callback.js";+ import { getGSCStatus } from "./api/gsc/status.js";+ import { disconnectGSC } from "./api/gsc/disconnect.js";+ import { getGSCData } from "./api/gsc/getData.js";+ import { selectGSCProperty } from "./api/gsc/selectProperty.js";+import { getSiteImports } from "./api/sites/getSiteImports.js";+import { importSiteData } from "./api/sites/importSiteData.js";+import { deleteSiteImport } from "./api/sites/deleteSiteImport.js";+import { getJobQueue } from "./services/import/queues/jobQueueFactory.js";const __filename = fileURLToPath(import.meta.url);const __dirname = dirname(__filename);