From 6e1d53e28a056e429c54e1e6af45eaa7939daa41 Mon Sep 17 00:00:00 2001 From: Kush Thaker Date: Wed, 31 Jul 2024 10:56:40 +0530 Subject: queues so far Co-authored-by: Dhravya Shah --- apps/web/server/db/schema.ts | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'apps/web/server') diff --git a/apps/web/server/db/schema.ts b/apps/web/server/db/schema.ts index 32b80719..11711997 100644 --- a/apps/web/server/db/schema.ts +++ b/apps/web/server/db/schema.ts @@ -7,6 +7,7 @@ import { sqliteTableCreator, text, integer, + blob, } from "drizzle-orm/sqlite-core"; import type { AdapterAccountType } from "next-auth/adapters"; @@ -242,3 +243,28 @@ export const canvas = createTable( export type ChatThread = typeof chatThreads.$inferSelect; export type ChatHistory = typeof chatHistory.$inferSelect; + +export const jobs = createTable( + "jobs", + { + id: integer("id").notNull().primaryKey({ autoIncrement: true }), + userId: text("userId") + .notNull() + .references(() => users.id, { onDelete: "cascade" }), + url: text("url").notNull(), + status: text("status").notNull(), + attempts: integer("attempts").notNull().default(0), + lastAttemptAt: integer("lastAttemptAt"), + error: blob("error"), + createdAt: integer("createdAt").notNull(), + updatedAt: integer("updatedAt").notNull(), + }, + (job) => ({ + userIdx: index("jobs_userId_idx").on(job.userId), + statusIdx: index("jobs_status_idx").on(job.status), + createdAtIdx: index("jobs_createdAt_idx").on(job.createdAt), + urlIdx: index("jobs_url_idx").on(job.url), + }), +); + +export type Job = typeof jobs.$inferSelect; -- cgit v1.2.3 From 241276be588312aec4f9e09a23c7951379238da8 Mon Sep 17 00:00:00 2001 From: Kush Thaker Date: Wed, 31 Jul 2024 11:37:54 +0530 Subject: db schema in packages --- apps/web/server/auth.ts | 2 +- apps/web/server/db/index.ts | 2 +- apps/web/server/db/schema.ts | 270 ------------------------------------------- 3 files changed, 2 insertions(+), 272 deletions(-) delete mode 100644 apps/web/server/db/schema.ts (limited to 'apps/web/server') diff --git a/apps/web/server/auth.ts b/apps/web/server/auth.ts index 78671551..5d8b15d1 100644 --- a/apps/web/server/auth.ts +++ b/apps/web/server/auth.ts @@ -2,7 +2,7 @@ import NextAuth, { NextAuthResult } from "next-auth"; import Google from "next-auth/providers/google"; import { DrizzleAdapter } from "@auth/drizzle-adapter"; import { db } from "./db"; -import { accounts, sessions, users, verificationTokens } from "./db/schema"; +import { accounts, sessions, users, verificationTokens } from "@repo/db/schema"; export const { handlers: { GET, POST }, diff --git a/apps/web/server/db/index.ts b/apps/web/server/db/index.ts index a9ec9106..52f3e350 100644 --- a/apps/web/server/db/index.ts +++ b/apps/web/server/db/index.ts @@ -1,6 +1,6 @@ import { drizzle } from "drizzle-orm/d1"; -import * as schema from "./schema"; +import * as schema from "@repo/db/schema"; export const db = drizzle(process.env.DATABASE, { schema, diff --git a/apps/web/server/db/schema.ts b/apps/web/server/db/schema.ts deleted file mode 100644 index 11711997..00000000 --- a/apps/web/server/db/schema.ts +++ /dev/null @@ -1,270 +0,0 @@ -import { create } from "domain"; -import { relations, sql } from "drizzle-orm"; -import { - index, - int, - primaryKey, - sqliteTableCreator, - text, - integer, - blob, -} from "drizzle-orm/sqlite-core"; -import type { AdapterAccountType } from "next-auth/adapters"; - -export const createTable = sqliteTableCreator((name) => `${name}`); - -export const users = createTable( - "user", - { - id: text("id") - .primaryKey() - .$defaultFn(() => crypto.randomUUID()), - name: text("name"), - email: text("email").notNull(), - emailVerified: integer("emailVerified", { mode: "timestamp_ms" }), - image: text("image"), - telegramId: text("telegramId"), - hasOnboarded: integer("hasOnboarded", { mode: "boolean" }).default(false), - }, - (user) => ({ - emailIdx: index("users_email_idx").on(user.email), - telegramIdx: index("users_telegram_idx").on(user.telegramId), - idIdx: index("users_id_idx").on(user.id), - }), -); - -export type User = typeof users.$inferSelect; - -export const accounts = createTable( - "account", - { - userId: text("userId") - .notNull() - .references(() => users.id, { onDelete: "cascade" }), - type: text("type").$type().notNull(), - provider: text("provider").notNull(), - providerAccountId: text("providerAccountId").notNull(), - refresh_token: text("refresh_token"), - access_token: text("access_token"), - expires_at: integer("expires_at"), - token_type: text("token_type"), - scope: text("scope"), - id_token: text("id_token"), - session_state: text("session_state"), - }, - (account) => ({ - compoundKey: primaryKey({ - columns: [account.provider, account.providerAccountId], - }), - }), -); - -export const sessions = createTable("session", { - sessionToken: text("sessionToken").primaryKey(), - userId: text("userId") - .notNull() - .references(() => users.id, { onDelete: "cascade" }), - expires: integer("expires", { mode: "timestamp_ms" }).notNull(), -}); - -export const verificationTokens = createTable( - "verificationToken", - { - identifier: text("identifier").notNull(), - token: text("token").notNull(), - expires: integer("expires", { mode: "timestamp_ms" }).notNull(), - }, - (verificationToken) => ({ - compositePk: primaryKey({ - columns: [verificationToken.identifier, verificationToken.token], - }), - }), -); - -export const authenticators = createTable( - "authenticator", - { - credentialID: text("credentialID").notNull().unique(), - userId: text("userId") - .notNull() - .references(() => users.id, { onDelete: "cascade" }), - providerAccountId: text("providerAccountId").notNull(), - credentialPublicKey: text("credentialPublicKey").notNull(), - counter: integer("counter").notNull(), - credentialDeviceType: text("credentialDeviceType").notNull(), - credentialBackedUp: integer("credentialBackedUp", { - mode: "boolean", - }).notNull(), - transports: text("transports"), - }, - (authenticator) => ({ - compositePK: primaryKey({ - columns: [authenticator.userId, authenticator.credentialID], - }), - }), -); - -export const storedContent = createTable( - "storedContent", - { - id: integer("id").notNull().primaryKey({ autoIncrement: true }), - content: text("content").notNull(), - title: text("title", { length: 255 }), - description: text("description", { length: 255 }), - url: text("url").notNull(), - savedAt: int("savedAt", { mode: "timestamp" }).notNull(), - baseUrl: text("baseUrl", { length: 255 }).unique(), - ogImage: text("ogImage", { length: 255 }), - type: text("type").default("page"), - image: text("image", { length: 255 }), - userId: text("user").references(() => users.id, { - onDelete: "cascade", - }), - noteId: integer("noteId"), - }, - (sc) => ({ - urlIdx: index("storedContent_url_idx").on(sc.url), - savedAtIdx: index("storedContent_savedAt_idx").on(sc.savedAt), - titleInx: index("storedContent_title_idx").on(sc.title), - userIdx: index("storedContent_user_idx").on(sc.userId), - }), -); - -export type Content = typeof storedContent.$inferSelect; - -export const contentToSpace = createTable( - "contentToSpace", - { - contentId: integer("contentId") - .notNull() - .references(() => storedContent.id, { onDelete: "cascade" }), - spaceId: integer("spaceId") - .notNull() - .references(() => space.id, { onDelete: "cascade" }), - }, - (cts) => ({ - compoundKey: primaryKey({ columns: [cts.contentId, cts.spaceId] }), - }), -); - -export const space = createTable( - "space", - { - id: integer("id").notNull().primaryKey({ autoIncrement: true }), - name: text("name").notNull().unique().default("none"), - user: text("user", { length: 255 }).references(() => users.id, { - onDelete: "cascade", - }), - createdAt: int("createdAt", { mode: "timestamp" }).notNull(), - numItems: integer("numItems").notNull().default(0), - }, - (space) => ({ - nameIdx: index("spaces_name_idx").on(space.name), - userIdx: index("spaces_user_idx").on(space.user), - }), -); - -export const spacesAccess = createTable( - "spacesAccess", - { - spaceId: integer("spaceId") - .notNull() - .references(() => space.id, { onDelete: "cascade" }), - userEmail: text("userEmail").notNull(), - }, - (spaceAccess) => ({ - compoundKey: primaryKey({ - columns: [spaceAccess.spaceId, spaceAccess.userEmail], - }), - }), -); - -export type StoredContent = Omit; -export type StoredSpace = typeof space.$inferSelect; -export type ChachedSpaceContent = StoredContent & { - space: number; -}; - -export const chatThreads = createTable( - "chatThread", - { - id: text("id") - .notNull() - .primaryKey() - .$defaultFn(() => crypto.randomUUID()), - firstMessage: text("firstMessage").notNull(), - userId: text("userId") - .notNull() - .references(() => users.id, { onDelete: "cascade" }), - }, - (thread) => ({ - userIdx: index("chatThread_user_idx").on(thread.userId), - }), -); - -export const chatHistory = createTable( - "chatHistory", - { - id: integer("id").notNull().primaryKey({ autoIncrement: true }), - threadId: text("threadId") - .notNull() - .references(() => chatThreads.id, { onDelete: "cascade" }), - question: text("question").notNull(), - answer: text("answerParts"), // Single answer part as string - answerSources: text("answerSources"), // JSON stringified array of objects - answerJustification: text("answerJustification"), - createdAt: int("createdAt", { mode: "timestamp" }) - .notNull() - .default(new Date()), - }, - (history) => ({ - threadIdx: index("chatHistory_thread_idx").on(history.threadId), - }), -); - -export const canvas = createTable( - "canvas", - { - id: text("id") - .notNull() - .primaryKey() - .$defaultFn(() => crypto.randomUUID()), - title: text("title").default("Untitled").notNull(), - description: text("description").default("Untitled").notNull(), - imageUrl: text("url").default("").notNull(), - userId: text("userId") - .notNull() - .references(() => users.id, { onDelete: "cascade" }), - }, - (canvas) => ({ - userIdx: index("canvas_user_userId").on(canvas.userId), - }), -); - -export type ChatThread = typeof chatThreads.$inferSelect; -export type ChatHistory = typeof chatHistory.$inferSelect; - -export const jobs = createTable( - "jobs", - { - id: integer("id").notNull().primaryKey({ autoIncrement: true }), - userId: text("userId") - .notNull() - .references(() => users.id, { onDelete: "cascade" }), - url: text("url").notNull(), - status: text("status").notNull(), - attempts: integer("attempts").notNull().default(0), - lastAttemptAt: integer("lastAttemptAt"), - error: blob("error"), - createdAt: integer("createdAt").notNull(), - updatedAt: integer("updatedAt").notNull(), - }, - (job) => ({ - userIdx: index("jobs_userId_idx").on(job.userId), - statusIdx: index("jobs_status_idx").on(job.status), - createdAtIdx: index("jobs_createdAt_idx").on(job.createdAt), - urlIdx: index("jobs_url_idx").on(job.url), - }), -); - -export type Job = typeof jobs.$inferSelect; -- cgit v1.2.3