From 0ea91409171056f20c9727a2ebc2436933222815 Mon Sep 17 00:00:00 2001 From: Jared Pereira Date: Fri, 4 Jul 2025 11:40:20 -0400 Subject: [PATCH] get domains via identity_rel --- actions/domains/deleteDomain.ts | 2 +- actions/getIdentityData.ts | 2 +- drizzle/relations.ts | 161 +++++++++++++++++--------------- drizzle/schema.ts | 144 +++++++++++++++------------- supabase/database.types.ts | 10 ++ 5 files changed, 175 insertions(+), 144 deletions(-) diff --git a/actions/domains/deleteDomain.ts b/actions/domains/deleteDomain.ts index d2b06ed7..2842041d 100644 --- a/actions/domains/deleteDomain.ts +++ b/actions/domains/deleteDomain.ts @@ -23,7 +23,7 @@ export async function deleteDomain({ domain }: { domain: string }) { `*, identities( *, - custom_domains(*) + custom_domains!custom_domains_identity_fkey(*) )`, ) .eq("id", auth_token) diff --git a/actions/getIdentityData.ts b/actions/getIdentityData.ts index db014aec..2a4acbbd 100644 --- a/actions/getIdentityData.ts +++ b/actions/getIdentityData.ts @@ -17,7 +17,7 @@ export async function getIdentityData() { *, bsky_profiles(*), subscribers_to_publications(*), - custom_domains!custom_domains_identity_fkey(*), + custom_domains!custom_domains_identity_id_fkey(publication_domains(*), *), home_leaflet:permission_tokens!identities_home_page_fkey(*, permission_token_rights(*)), permission_token_on_homepage( created_at, diff --git a/drizzle/relations.ts b/drizzle/relations.ts index c38ffb3d..6c6855e3 100644 --- a/drizzle/relations.ts +++ b/drizzle/relations.ts @@ -1,101 +1,99 @@ import { relations } from "drizzle-orm/relations"; -import { identities, bsky_profiles, entities, facts, entity_sets, permission_tokens, email_subscriptions_to_entity, email_auth_tokens, custom_domains, phone_rsvps_to_entity, custom_domain_routes, poll_votes_on_entity, subscribers_to_publications, publications, permission_token_on_homepage, documents, documents_in_publications, publication_domains, publication_subscriptions, leaflets_in_publications, permission_token_rights } from "./schema"; +import { entity_sets, entities, facts, identities, email_auth_tokens, bsky_profiles, poll_votes_on_entity, permission_tokens, phone_rsvps_to_entity, custom_domains, custom_domain_routes, email_subscriptions_to_entity, subscribers_to_publications, publications, permission_token_on_homepage, documents, documents_in_publications, publication_domains, leaflets_in_publications, publication_subscriptions, permission_token_rights } from "./schema"; -export const bsky_profilesRelations = relations(bsky_profiles, ({one}) => ({ +export const entitiesRelations = relations(entities, ({one, many}) => ({ + entity_set: one(entity_sets, { + fields: [entities.set], + references: [entity_sets.id] + }), + facts: many(facts), + poll_votes_on_entities_option_entity: many(poll_votes_on_entity, { + relationName: "poll_votes_on_entity_option_entity_entities_id" + }), + poll_votes_on_entities_poll_entity: many(poll_votes_on_entity, { + relationName: "poll_votes_on_entity_poll_entity_entities_id" + }), + permission_tokens: many(permission_tokens), + phone_rsvps_to_entities: many(phone_rsvps_to_entity), + email_subscriptions_to_entities: many(email_subscriptions_to_entity), +})); + +export const entity_setsRelations = relations(entity_sets, ({many}) => ({ + entities: many(entities), + permission_token_rights: many(permission_token_rights), +})); + +export const factsRelations = relations(facts, ({one}) => ({ + entity: one(entities, { + fields: [facts.entity], + references: [entities.id] + }), +})); + +export const email_auth_tokensRelations = relations(email_auth_tokens, ({one}) => ({ identity: one(identities, { - fields: [bsky_profiles.did], - references: [identities.atp_did] + fields: [email_auth_tokens.identity], + references: [identities.id] }), })); export const identitiesRelations = relations(identities, ({one, many}) => ({ + email_auth_tokens: many(email_auth_tokens), bsky_profiles: many(bsky_profiles), permission_token: one(permission_tokens, { fields: [identities.home_page], references: [permission_tokens.id] }), - email_auth_tokens: many(email_auth_tokens), - custom_domains: many(custom_domains), + custom_domains_identity: many(custom_domains, { + relationName: "custom_domains_identity_identities_email" + }), + custom_domains_identity_id: many(custom_domains, { + relationName: "custom_domains_identity_id_identities_id" + }), subscribers_to_publications: many(subscribers_to_publications), permission_token_on_homepages: many(permission_token_on_homepage), publication_domains: many(publication_domains), publication_subscriptions: many(publication_subscriptions), })); -export const factsRelations = relations(facts, ({one}) => ({ - entity: one(entities, { - fields: [facts.entity], - references: [entities.id] +export const bsky_profilesRelations = relations(bsky_profiles, ({one}) => ({ + identity: one(identities, { + fields: [bsky_profiles.did], + references: [identities.atp_did] }), })); -export const entitiesRelations = relations(entities, ({one, many}) => ({ - facts: many(facts), - entity_set: one(entity_sets, { - fields: [entities.set], - references: [entity_sets.id] - }), - permission_tokens: many(permission_tokens), - email_subscriptions_to_entities: many(email_subscriptions_to_entity), - phone_rsvps_to_entities: many(phone_rsvps_to_entity), - poll_votes_on_entities_option_entity: many(poll_votes_on_entity, { +export const poll_votes_on_entityRelations = relations(poll_votes_on_entity, ({one}) => ({ + entity_option_entity: one(entities, { + fields: [poll_votes_on_entity.option_entity], + references: [entities.id], relationName: "poll_votes_on_entity_option_entity_entities_id" }), - poll_votes_on_entities_poll_entity: many(poll_votes_on_entity, { + entity_poll_entity: one(entities, { + fields: [poll_votes_on_entity.poll_entity], + references: [entities.id], relationName: "poll_votes_on_entity_poll_entity_entities_id" }), })); -export const entity_setsRelations = relations(entity_sets, ({many}) => ({ - entities: many(entities), - permission_token_rights: many(permission_token_rights), -})); - export const permission_tokensRelations = relations(permission_tokens, ({one, many}) => ({ entity: one(entities, { fields: [permission_tokens.root_entity], references: [entities.id] }), identities: many(identities), - email_subscriptions_to_entities: many(email_subscriptions_to_entity), custom_domain_routes_edit_permission_token: many(custom_domain_routes, { relationName: "custom_domain_routes_edit_permission_token_permission_tokens_id" }), custom_domain_routes_view_permission_token: many(custom_domain_routes, { relationName: "custom_domain_routes_view_permission_token_permission_tokens_id" }), + email_subscriptions_to_entities: many(email_subscriptions_to_entity), permission_token_on_homepages: many(permission_token_on_homepage), leaflets_in_publications: many(leaflets_in_publications), permission_token_rights: many(permission_token_rights), })); -export const email_subscriptions_to_entityRelations = relations(email_subscriptions_to_entity, ({one}) => ({ - entity: one(entities, { - fields: [email_subscriptions_to_entity.entity], - references: [entities.id] - }), - permission_token: one(permission_tokens, { - fields: [email_subscriptions_to_entity.token], - references: [permission_tokens.id] - }), -})); - -export const email_auth_tokensRelations = relations(email_auth_tokens, ({one}) => ({ - identity: one(identities, { - fields: [email_auth_tokens.identity], - references: [identities.id] - }), -})); - -export const custom_domainsRelations = relations(custom_domains, ({one, many}) => ({ - identity: one(identities, { - fields: [custom_domains.identity], - references: [identities.email] - }), - custom_domain_routes: many(custom_domain_routes), - publication_domains: many(publication_domains), -})); - export const phone_rsvps_to_entityRelations = relations(phone_rsvps_to_entity, ({one}) => ({ entity: one(entities, { fields: [phone_rsvps_to_entity.entity], @@ -120,16 +118,29 @@ export const custom_domain_routesRelations = relations(custom_domain_routes, ({o }), })); -export const poll_votes_on_entityRelations = relations(poll_votes_on_entity, ({one}) => ({ - entity_option_entity: one(entities, { - fields: [poll_votes_on_entity.option_entity], - references: [entities.id], - relationName: "poll_votes_on_entity_option_entity_entities_id" +export const custom_domainsRelations = relations(custom_domains, ({one, many}) => ({ + custom_domain_routes: many(custom_domain_routes), + identity_identity: one(identities, { + fields: [custom_domains.identity], + references: [identities.email], + relationName: "custom_domains_identity_identities_email" }), - entity_poll_entity: one(entities, { - fields: [poll_votes_on_entity.poll_entity], - references: [entities.id], - relationName: "poll_votes_on_entity_poll_entity_entities_id" + identity_identity_id: one(identities, { + fields: [custom_domains.identity_id], + references: [identities.id], + relationName: "custom_domains_identity_id_identities_id" + }), + publication_domains: many(publication_domains), +})); + +export const email_subscriptions_to_entityRelations = relations(email_subscriptions_to_entity, ({one}) => ({ + entity: one(entities, { + fields: [email_subscriptions_to_entity.entity], + references: [entities.id] + }), + permission_token: one(permission_tokens, { + fields: [email_subscriptions_to_entity.token], + references: [permission_tokens.id] }), })); @@ -148,8 +159,8 @@ export const publicationsRelations = relations(publications, ({many}) => ({ subscribers_to_publications: many(subscribers_to_publications), documents_in_publications: many(documents_in_publications), publication_domains: many(publication_domains), - publication_subscriptions: many(publication_subscriptions), leaflets_in_publications: many(leaflets_in_publications), + publication_subscriptions: many(publication_subscriptions), })); export const permission_token_on_homepageRelations = relations(permission_token_on_homepage, ({one}) => ({ @@ -194,17 +205,6 @@ export const publication_domainsRelations = relations(publication_domains, ({one }), })); -export const publication_subscriptionsRelations = relations(publication_subscriptions, ({one}) => ({ - identity: one(identities, { - fields: [publication_subscriptions.identity], - references: [identities.atp_did] - }), - publication: one(publications, { - fields: [publication_subscriptions.publication], - references: [publications.uri] - }), -})); - export const leaflets_in_publicationsRelations = relations(leaflets_in_publications, ({one}) => ({ document: one(documents, { fields: [leaflets_in_publications.doc], @@ -220,6 +220,17 @@ export const leaflets_in_publicationsRelations = relations(leaflets_in_publicati }), })); +export const publication_subscriptionsRelations = relations(publication_subscriptions, ({one}) => ({ + identity: one(identities, { + fields: [publication_subscriptions.identity], + references: [identities.atp_did] + }), + publication: one(publications, { + fields: [publication_subscriptions.publication], + references: [publications.uri] + }), +})); + export const permission_token_rightsRelations = relations(permission_token_rights, ({one}) => ({ entity_set: one(entity_sets, { fields: [permission_token_rights.entity_set], diff --git a/drizzle/schema.ts b/drizzle/schema.ts index c22ca6d2..400b90b0 100644 --- a/drizzle/schema.ts +++ b/drizzle/schema.ts @@ -1,12 +1,11 @@ -import { pgTable, pgEnum, text, jsonb, foreignKey, timestamp, uuid, bigint, boolean, unique, uniqueIndex, smallint, primaryKey } from "drizzle-orm/pg-core" +import { pgTable, pgEnum, text, jsonb, timestamp, foreignKey, uuid, index, bigint, boolean, unique, uniqueIndex, smallint, primaryKey } from "drizzle-orm/pg-core" import { sql } from "drizzle-orm" export const aal_level = pgEnum("aal_level", ['aal1', 'aal2', 'aal3']) export const code_challenge_method = pgEnum("code_challenge_method", ['s256', 'plain']) export const factor_status = pgEnum("factor_status", ['unverified', 'verified']) -export const factor_type = pgEnum("factor_type", ['totp', 'webauthn']) +export const factor_type = pgEnum("factor_type", ['totp', 'webauthn', 'phone']) export const one_time_token_type = pgEnum("one_time_token_type", ['confirmation_token', 'reauthentication_token', 'recovery_token', 'email_change_token_new', 'email_change_token_current', 'phone_change_token']) -export const request_status = pgEnum("request_status", ['PENDING', 'SUCCESS', 'ERROR']) export const key_status = pgEnum("key_status", ['default', 'valid', 'invalid', 'expired']) export const key_type = pgEnum("key_type", ['aead-ietf', 'aead-det', 'hmacsha512', 'hmacsha256', 'auth', 'shorthash', 'generichash', 'kdf', 'secretbox', 'secretstream', 'stream_xchacha20']) export const rsvp_status = pgEnum("rsvp_status", ['GOING', 'NOT_GOING', 'MAYBE']) @@ -19,18 +18,6 @@ export const oauth_state_store = pgTable("oauth_state_store", { state: jsonb("state").notNull(), }); -export const oauth_session_store = pgTable("oauth_session_store", { - key: text("key").primaryKey().notNull(), - session: jsonb("session").notNull(), -}); - -export const bsky_profiles = pgTable("bsky_profiles", { - did: text("did").primaryKey().notNull().references(() => identities.atp_did, { onDelete: "cascade" } ), - record: jsonb("record").notNull(), - indexed_at: timestamp("indexed_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), - handle: text("handle"), -}); - export const publications = pgTable("publications", { uri: text("uri").primaryKey().notNull(), indexed_at: timestamp("indexed_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), @@ -39,6 +26,12 @@ export const publications = pgTable("publications", { record: jsonb("record"), }); +export const entities = pgTable("entities", { + id: uuid("id").primaryKey().notNull(), + created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), + set: uuid("set").notNull().references(() => entity_sets.id, { onDelete: "cascade", onUpdate: "cascade" } ), +}); + export const facts = pgTable("facts", { id: uuid("id").primaryKey().notNull(), entity: uuid("entity").notNull().references(() => entities.id, { onDelete: "cascade", onUpdate: "restrict" } ), @@ -48,12 +41,11 @@ export const facts = pgTable("facts", { updated_at: timestamp("updated_at", { mode: 'string' }), // You can use { mode: "bigint" } if numbers are exceeding js number limitations version: bigint("version", { mode: "number" }).default(0).notNull(), -}); - -export const documents = pgTable("documents", { - uri: text("uri").primaryKey().notNull(), - data: jsonb("data").notNull(), - indexed_at: timestamp("indexed_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), +}, +(table) => { + return { + entity_idx: index("facts_entity_idx").on(table.entity), + } }); export const replicache_clients = pgTable("replicache_clients", { @@ -61,12 +53,27 @@ export const replicache_clients = pgTable("replicache_clients", { client_group: text("client_group").notNull(), // You can use { mode: "bigint" } if numbers are exceeding js number limitations last_mutation: bigint("last_mutation", { mode: "number" }).notNull(), +}, +(table) => { + return { + client_group_idx: index("replicache_clients_client_group_idx").on(table.client_group), + } }); -export const entities = pgTable("entities", { - id: uuid("id").primaryKey().notNull(), +export const email_auth_tokens = pgTable("email_auth_tokens", { + id: uuid("id").defaultRandom().primaryKey().notNull(), created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), - set: uuid("set").notNull().references(() => entity_sets.id, { onDelete: "cascade", onUpdate: "cascade" } ), + confirmed: boolean("confirmed").default(false).notNull(), + email: text("email"), + confirmation_code: text("confirmation_code").notNull(), + identity: uuid("identity").references(() => identities.id, { onDelete: "cascade", onUpdate: "cascade" } ), +}); + +export const bsky_profiles = pgTable("bsky_profiles", { + did: text("did").primaryKey().notNull().references(() => identities.atp_did, { onDelete: "cascade" } ), + record: jsonb("record").notNull(), + indexed_at: timestamp("indexed_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), + handle: text("handle"), }); export const entity_sets = pgTable("entity_sets", { @@ -74,6 +81,14 @@ export const entity_sets = pgTable("entity_sets", { created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), }); +export const poll_votes_on_entity = pgTable("poll_votes_on_entity", { + id: uuid("id").defaultRandom().primaryKey().notNull(), + created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), + poll_entity: uuid("poll_entity").notNull().references(() => entities.id, { onDelete: "cascade", onUpdate: "cascade" } ), + option_entity: uuid("option_entity").notNull().references(() => entities.id, { onDelete: "cascade", onUpdate: "cascade" } ), + voter_token: uuid("voter_token").notNull(), +}); + export const permission_tokens = pgTable("permission_tokens", { id: uuid("id").defaultRandom().primaryKey().notNull(), root_entity: uuid("root_entity").notNull().references(() => entities.id, { onDelete: "cascade", onUpdate: "cascade" } ), @@ -94,25 +109,6 @@ export const identities = pgTable("identities", { } }); -export const email_subscriptions_to_entity = pgTable("email_subscriptions_to_entity", { - id: uuid("id").defaultRandom().primaryKey().notNull(), - entity: uuid("entity").notNull().references(() => entities.id, { onDelete: "cascade" } ), - email: text("email").notNull(), - created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), - token: uuid("token").notNull().references(() => permission_tokens.id, { onDelete: "cascade" } ), - confirmed: boolean("confirmed").default(false).notNull(), - confirmation_code: text("confirmation_code").notNull(), -}); - -export const email_auth_tokens = pgTable("email_auth_tokens", { - id: uuid("id").defaultRandom().primaryKey().notNull(), - created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), - confirmed: boolean("confirmed").default(false).notNull(), - email: text("email"), - confirmation_code: text("confirmation_code").notNull(), - identity: uuid("identity").references(() => identities.id, { onDelete: "cascade", onUpdate: "cascade" } ), -}); - export const phone_number_auth_tokens = pgTable("phone_number_auth_tokens", { id: uuid("id").defaultRandom().primaryKey().notNull(), created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), @@ -122,13 +118,6 @@ export const phone_number_auth_tokens = pgTable("phone_number_auth_tokens", { country_code: text("country_code").notNull(), }); -export const custom_domains = pgTable("custom_domains", { - domain: text("domain").primaryKey().notNull(), - identity: text("identity").default('').references(() => identities.email, { onDelete: "cascade", onUpdate: "cascade" } ), - confirmed: boolean("confirmed").notNull(), - created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), -}); - export const phone_rsvps_to_entity = pgTable("phone_rsvps_to_entity", { created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), phone_number: text("phone_number").notNull(), @@ -159,12 +148,33 @@ export const custom_domain_routes = pgTable("custom_domain_routes", { } }); -export const poll_votes_on_entity = pgTable("poll_votes_on_entity", { +export const custom_domains = pgTable("custom_domains", { + domain: text("domain").primaryKey().notNull(), + identity: text("identity").default('').references(() => identities.email, { onDelete: "cascade", onUpdate: "cascade" } ), + confirmed: boolean("confirmed").notNull(), + created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), + identity_id: uuid("identity_id").references(() => identities.id, { onDelete: "cascade" } ), +}); + +export const email_subscriptions_to_entity = pgTable("email_subscriptions_to_entity", { id: uuid("id").defaultRandom().primaryKey().notNull(), + entity: uuid("entity").notNull().references(() => entities.id, { onDelete: "cascade" } ), + email: text("email").notNull(), created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), - poll_entity: uuid("poll_entity").notNull().references(() => entities.id, { onDelete: "cascade", onUpdate: "cascade" } ), - option_entity: uuid("option_entity").notNull().references(() => entities.id, { onDelete: "cascade", onUpdate: "cascade" } ), - voter_token: uuid("voter_token").notNull(), + token: uuid("token").notNull().references(() => permission_tokens.id, { onDelete: "cascade" } ), + confirmed: boolean("confirmed").default(false).notNull(), + confirmation_code: text("confirmation_code").notNull(), +}); + +export const documents = pgTable("documents", { + uri: text("uri").primaryKey().notNull(), + data: jsonb("data").notNull(), + indexed_at: timestamp("indexed_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), +}); + +export const oauth_session_store = pgTable("oauth_session_store", { + key: text("key").primaryKey().notNull(), + session: jsonb("session").notNull(), }); export const subscribers_to_publications = pgTable("subscribers_to_publications", { @@ -212,30 +222,30 @@ export const publication_domains = pgTable("publication_domains", { } }); -export const publication_subscriptions = pgTable("publication_subscriptions", { +export const leaflets_in_publications = pgTable("leaflets_in_publications", { publication: text("publication").notNull().references(() => publications.uri, { onDelete: "cascade" } ), - identity: text("identity").notNull().references(() => identities.atp_did, { onDelete: "cascade" } ), - created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), - record: jsonb("record").notNull(), - uri: text("uri").notNull(), + doc: text("doc").default('').references(() => documents.uri, { onDelete: "set null" } ), + leaflet: uuid("leaflet").notNull().references(() => permission_tokens.id, { onDelete: "cascade" } ), + description: text("description").default('').notNull(), + title: text("title").default('').notNull(), }, (table) => { return { - publication_subscriptions_pkey: primaryKey({ columns: [table.publication, table.identity], name: "publication_subscriptions_pkey"}), - publication_subscriptions_uri_key: unique("publication_subscriptions_uri_key").on(table.uri), + leaflets_in_publications_pkey: primaryKey({ columns: [table.publication, table.leaflet], name: "leaflets_in_publications_pkey"}), } }); -export const leaflets_in_publications = pgTable("leaflets_in_publications", { +export const publication_subscriptions = pgTable("publication_subscriptions", { publication: text("publication").notNull().references(() => publications.uri, { onDelete: "cascade" } ), - doc: text("doc").default('').references(() => documents.uri, { onDelete: "set null" } ), - leaflet: uuid("leaflet").notNull().references(() => permission_tokens.id, { onDelete: "cascade" } ), - description: text("description").default('').notNull(), - title: text("title").default('').notNull(), + identity: text("identity").notNull().references(() => identities.atp_did, { onDelete: "cascade" } ), + created_at: timestamp("created_at", { withTimezone: true, mode: 'string' }).defaultNow().notNull(), + record: jsonb("record").notNull(), + uri: text("uri").notNull(), }, (table) => { return { - leaflets_in_publications_pkey: primaryKey({ columns: [table.publication, table.leaflet], name: "leaflets_in_publications_pkey"}), + publication_subscriptions_pkey: primaryKey({ columns: [table.publication, table.identity], name: "publication_subscriptions_pkey"}), + publication_subscriptions_uri_key: unique("publication_subscriptions_uri_key").on(table.uri), } }); diff --git a/supabase/database.types.ts b/supabase/database.types.ts index d1ebcd44..4d824918 100644 --- a/supabase/database.types.ts +++ b/supabase/database.types.ts @@ -118,18 +118,21 @@ export type Database = { created_at: string domain: string identity: string | null + identity_id: string | null } Insert: { confirmed: boolean created_at?: string domain: string identity?: string | null + identity_id?: string | null } Update: { confirmed?: boolean created_at?: string domain?: string identity?: string | null + identity_id?: string | null } Relationships: [ { @@ -139,6 +142,13 @@ export type Database = { referencedRelation: "identities" referencedColumns: ["email"] }, + { + foreignKeyName: "custom_domains_identity_id_fkey" + columns: ["identity_id"] + isOneToOne: false + referencedRelation: "identities" + referencedColumns: ["id"] + }, ] } documents: { -- 2.51.2