bernard-ng/basango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style(biome): using biome for format, lint, check

Browse Source
This commit is contained in:
bernard-ng
2025-11-08 12:58:40 +02:00
parent 075a388ccb
commit fdd1cbbfd5
152 changed files with 3737 additions and 3989 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/db/drizzle.config.ts
+3 -3
View File
@@ -1,10 +1,10 @@
import type { Config } from "drizzle-kit";
export default {
schema: "./src/schema.ts",
out: "./migrations",
dialect: "postgresql",
dbCredentials: {
url: process.env.DATABASE_URL!,
},
dialect: "postgresql",
out: "./migrations",
schema: "./src/schema.ts",
} satisfies Config;
packages/db/package.json
+12 -15
View File
@@ -1,19 +1,4 @@
{
"name": "@basango/db",
"private": true,
"scripts": {
"clean": "rm -rf .turbo node_modules",
"format": "biome format --write .",
"lint": "biome check .",
"lint:fix": "biome check --write .",
"typecheck": "tsc --noEmit"
},
"exports": {
"./client": "./src/client.ts",
"./schema": "./src/schema.ts",
"./utils": "./src/utils/index.ts",
"./queries": "./src/queries/index.ts"
},
"dependencies": {
"@basango/logger": "workspace:*",
"@date-fns/utc": "^2.1.1",
@@ -26,5 +11,17 @@
"@types/pg": "^8.15.6",
"drizzle-kit": "^0.31.6",
"typescript": "catalog:"
},
"exports": {
"./client": "./src/client.ts",
"./queries": "./src/queries/index.ts",
"./schema": "./src/schema.ts",
"./utils": "./src/utils/index.ts"
},
"name": "@basango/db",
"private": true,
"scripts": {
"clean": "rm -rf .turbo node_modules",
"typecheck": "tsc --noEmit"
}
}
packages/db/src/client.ts
+13 -13
View File
@@ -5,11 +5,11 @@ import * as schema from "@/schema";
const isDevelopment = process.env.NODE_ENV === "development";
const connectionConfig = {
max: isDevelopment ? 8 : 12,
idleTimeoutMillis: isDevelopment ? 5_000 : 60_000,
connectionTimeoutMillis: 15_000,
maxUses: isDevelopment ? 100 : 0,
allowExitOnIdle: true,
connectionTimeoutMillis: 15_000,
idleTimeoutMillis: isDevelopment ? 5_000 : 60_000,
max: isDevelopment ? 8 : 12,
maxUses: isDevelopment ? 100 : 0,
};
const pool = new Pool({
@@ -20,12 +20,12 @@ const pool = new Pool({
// Lightweight connection pool monitoring (single pool)
export const getConnectionPoolStats = () => {
const stats = {
active: Math.max(0, (pool.totalCount ?? 0) - (pool.idleCount ?? 0)),
ended: (pool as any).ended ?? false,
idle: pool.idleCount ?? 0,
name: "primary",
total: pool.options.max ?? 0,
idle: pool.idleCount ?? 0,
active: Math.max(0, (pool.totalCount ?? 0) - (pool.idleCount ?? 0)),
waiting: pool.waitingCount ?? 0,
ended: (pool as any).ended ?? false,
};
const totalConnections = connectionConfig.max;
@@ -33,23 +33,23 @@ export const getConnectionPoolStats = () => {
totalConnections > 0 ? Math.round((stats.active / totalConnections) * 100) : 0;
return {
timestamp: new Date().toISOString(),
region: process.env.FLY_REGION || "unknown",
instance: process.env.FLY_ALLOC_ID || "local",
pools: { primary: stats },
region: process.env.FLY_REGION || "unknown",
summary: {
totalConnections,
totalActive: stats.active,
totalWaiting: stats.waiting,
hasExhaustedPools: stats.active >= totalConnections || (stats.waiting ?? 0) > 0,
totalActive: stats.active,
totalConnections,
totalWaiting: stats.waiting,
utilizationPercent: utilization,
},
timestamp: new Date().toISOString(),
};
};
export const db = drizzle(pool, {
schema,
casing: "snake_case",
schema,
});
export const connectDb = async () => db;
export type Database = Awaited<ReturnType<typeof connectDb>>;
packages/db/src/queries/articles.ts
+59 -59
View File
@@ -133,16 +133,16 @@ export async function* getArticlesForExport(
let query = db
.select({
articleId: articles.id,
articleTitle: articles.title,
articleLink: articles.link,
articleBody: articles.body,
articleCategories: sql<string | null>`array_to_string
(${articles.categories}, ',')`,
articleBody: articles.body,
articleSource: sources.name,
articleHash: articles.hash,
articlePublishedAt: articles.publishedAt,
articleCrawledAt: articles.crawledAt,
articleHash: articles.hash,
articleId: articles.id,
articleLink: articles.link,
articlePublishedAt: articles.publishedAt,
articleSource: sources.name,
articleTitle: articles.title,
})
.from(articles)
.innerJoin(sources, eq(articles.sourceId, sources.id));
@@ -180,9 +180,9 @@ function normalizeArticleFilters(filters?: ArticleFilters): NormalizedArticleFil
const trimmedCategory = filters?.category?.trim();
return {
search: trimmedSearch && trimmedSearch.length > 0 ? trimmedSearch : undefined,
category: trimmedCategory && trimmedCategory.length > 0 ? trimmedCategory : undefined,
dateRange: filters?.dateRange ?? null,
search: trimmedSearch && trimmedSearch.length > 0 ? trimmedSearch : undefined,
sortDirection: filters?.sortDirection ?? "desc",
};
}
@@ -255,22 +255,22 @@ async function fetchArticleOverview(
const bookmarkExpression = buildBookmarkExistsExpression(options.userId);
const selectFields = {
article_excerpt: articles.excerpt,
article_id: articles.id,
articleTitle: articles.title,
articleLink: articles.link,
article_image: articles.image,
article_is_bookmarked: bookmarkExpression,
article_published_at: articles.publishedAt,
article_reading_time: articles.readingTime,
articleCategories: sql<string | null>`array_to_string
(${articles.categories}, ',')`,
article_excerpt: articles.excerpt,
article_published_at: articles.publishedAt,
article_image: articles.image,
article_reading_time: articles.readingTime,
sourceId: sources.id,
articleLink: articles.link,
articleTitle: articles.title,
source_created_at: sources.createdAt,
source_display_name: sources.displayName,
source_image: sql<string>`('${SOURCE_IMAGE_BASE}' || ${sources.name} || '.png')`,
sourceUrl: sources.url,
source_name: sources.name,
source_created_at: sources.createdAt,
article_is_bookmarked: bookmarkExpression,
sourceId: sources.id,
sourceUrl: sources.url,
} satisfies Record<string, SQL | AnyColumn>;
let query = db
@@ -321,8 +321,8 @@ async function fetchArticleOverview(
const rows = await query.orderBy(...orderings).limit(options.page.limit + 1);
return buildPaginationResult(rows, options.page, {
id: "article_id",
date: "article_published_at",
id: "article_id",
});
}
@@ -338,9 +338,9 @@ export async function getArticleOverviewList(
const filters = normalizeArticleFilters(params.filters);
return fetchArticleOverview(db, {
userId: params.userId,
page,
filters,
page,
userId: params.userId,
});
}
@@ -357,10 +357,10 @@ export async function getSourceArticleOverviewList(
const filters = normalizeArticleFilters(params.filters);
return fetchArticleOverview(db, {
userId: params.userId,
page,
filters,
baseConditions: [eq(sources.id, params.sourceId)],
filters,
page,
userId: params.userId,
});
}
@@ -384,22 +384,22 @@ export async function getBookmarkedArticleList(
];
const selectFields = {
article_excerpt: articles.excerpt,
article_id: articles.id,
articleTitle: articles.title,
articleLink: articles.link,
article_image: articles.image,
article_is_bookmarked: sql<boolean>`true`,
article_published_at: articles.publishedAt,
article_reading_time: articles.readingTime,
articleCategories: sql<string | null>`array_to_string
(${articles.categories}, ',')`,
article_excerpt: articles.excerpt,
article_published_at: articles.publishedAt,
article_image: articles.image,
article_reading_time: articles.readingTime,
sourceId: sources.id,
articleLink: articles.link,
articleTitle: articles.title,
source_created_at: sources.createdAt,
source_display_name: sources.displayName,
source_image: sql<string>`('${SOURCE_IMAGE_BASE}' || ${sources.name} || '.png')`,
sourceUrl: sources.url,
source_name: sources.name,
source_created_at: sources.createdAt,
article_is_bookmarked: sql<boolean>`true`,
sourceId: sources.id,
sourceUrl: sources.url,
} satisfies Record<string, SQL | AnyColumn>;
let query = db
@@ -452,8 +452,8 @@ export async function getBookmarkedArticleList(
const rows = await query.orderBy(...orderings).limit(page.limit + 1);
return buildPaginationResult(rows, page, {
id: "article_id",
date: "article_published_at",
id: "article_id",
});
}
@@ -465,33 +465,33 @@ export async function getArticleDetails(
const [row] = await db
.select({
article_bias: articles.bias,
article_crawled_at: articles.crawledAt,
article_hash: articles.hash,
article_id: articles.id,
articleTitle: articles.title,
articleLink: articles.link,
article_is_bookmarked: bookmarkExpression,
article_metadata: articles.metadata,
article_published_at: articles.publishedAt,
article_reading_time: articles.readingTime,
article_reliability: articles.reliability,
article_sentiment: articles.sentiment,
article_transparency: articles.transparency,
article_updated_at: articles.updatedAt,
articleBody: articles.body,
articleCategories: sql<string | null>`array_to_string
(${articles.categories}, ',')`,
articleBody: articles.body,
article_hash: articles.hash,
article_published_at: articles.publishedAt,
article_crawled_at: articles.crawledAt,
article_updated_at: articles.updatedAt,
article_bias: articles.bias,
article_reliability: articles.reliability,
article_transparency: articles.transparency,
article_sentiment: articles.sentiment,
article_metadata: articles.metadata,
article_reading_time: articles.readingTime,
sourceId: sources.id,
source_name: sources.name,
source_description: sources.description,
sourceUrl: sources.url,
source_updated_at: sources.updatedAt,
source_display_name: sources.displayName,
articleLink: articles.link,
articleTitle: articles.title,
source_bias: sources.bias,
source_description: sources.description,
source_display_name: sources.displayName,
source_image: sql<string>`('${SOURCE_IMAGE_BASE}' || ${sources.name} || '.png')`,
source_name: sources.name,
source_reliability: sources.reliability,
source_transparency: sources.transparency,
source_image: sql<string>`('${SOURCE_IMAGE_BASE}' || ${sources.name} || '.png')`,
article_is_bookmarked: bookmarkExpression,
source_updated_at: sources.updatedAt,
sourceId: sources.id,
sourceUrl: sources.url,
})
.from(articles)
.innerJoin(sources, eq(articles.sourceId, sources.id))
@@ -520,10 +520,10 @@ export async function getArticleCommentList(
let query = db
.select({
comment_id: comments.id,
comment_content: comments.content,
comment_sentiment: comments.sentiment,
comment_created_at: comments.createdAt,
comment_id: comments.id,
comment_sentiment: comments.sentiment,
user_id: users.id,
user_name: users.name,
})
@@ -541,7 +541,7 @@ export async function getArticleCommentList(
.limit(page.limit + 1);
return buildPaginationResult(rows, page, {
id: "comment_id",
date: "comment_created_at",
id: "comment_id",
});
}
packages/db/src/queries/bookmarks.ts
+5 -5
View File
@@ -40,13 +40,13 @@ export async function getBookmarkList(
let query = db
.select({
bookmark_id: bookmarks.id,
bookmark_name: bookmarks.name,
bookmark_description: bookmarks.description,
bookmark_created_at: bookmarks.createdAt,
bookmark_updated_at: bookmarks.updatedAt,
bookmark_articles_count: sql<number>`count(${bookmarkArticles.articleId})`,
bookmark_created_at: bookmarks.createdAt,
bookmark_description: bookmarks.description,
bookmark_id: bookmarks.id,
bookmark_is_public: bookmarks.isPublic,
bookmark_name: bookmarks.name,
bookmark_updated_at: bookmarks.updatedAt,
})
.from(bookmarks)
.leftJoin(bookmarkArticles, eq(bookmarkArticles.bookmarkId, bookmarks.id))
packages/db/src/queries/sources.ts
+33 -33
View File
@@ -2,6 +2,7 @@ import type { SQL } from "drizzle-orm";
import { and, desc, eq, lt, or, sql } from "drizzle-orm";
import type { Database } from "@/client";
import { PUBLICATION_GRAPH_DAYS, SOURCE_IMAGE_BASE } from "@/constant";
import { articles, followedSources, sources } from "@/schema";
import {
buildPaginationResult,
@@ -10,7 +11,6 @@ import {
type PageRequest,
type PaginationMeta,
} from "@/utils/pagination";
import { PUBLICATION_GRAPH_DAYS, SOURCE_IMAGE_BASE } from "@/constant";
export interface SourceOverviewRow {
sourceId: string;
@@ -70,14 +70,14 @@ export interface SourceStatisticsRow {
export async function getSourceStatisticsList(db: Database): Promise<SourceStatisticsRow[]> {
const rows = await db
.select({
sourceId: sources.id,
sourceName: sources.name,
sourceCrawledAt: sql<string | null>`max
(${articles.crawledAt})`,
articlesCount: sql<number>`count
(${articles.id})`,
articleMetadataAvailable: sql<number>`sum
(CASE WHEN ${articles.metadata} IS NOT NULL THEN 1 ELSE 0 END)`,
articlesCount: sql<number>`count
(${articles.id})`,
sourceCrawledAt: sql<string | null>`max
(${articles.crawledAt})`,
sourceId: sources.id,
sourceName: sources.name,
})
.from(sources)
.leftJoin(articles, eq(articles.sourceId, sources.id))
@@ -85,11 +85,11 @@ export async function getSourceStatisticsList(db: Database): Promise<SourceStati
.orderBy(sources.name.asc());
return rows.map((row) => ({
articleMetadataAvailable: Number(row.articleMetadataAvailable ?? 0),
articlesCount: Number(row.articlesCount ?? 0),
sourceCrawledAt: row.sourceCrawledAt,
sourceId: row.sourceId,
sourceName: row.sourceName,
sourceCrawledAt: row.sourceCrawledAt,
articlesCount: Number(row.articlesCount ?? 0),
articleMetadataAvailable: Number(row.articleMetadataAvailable ?? 0),
}));
}
@@ -158,13 +158,13 @@ export async function getSourceOverviewList(
let query = db
.select({
sourceId: sources.id,
source_created_at: sources.createdAt,
source_display_name: sources.displayName,
source_image: sql<string>`('${SOURCE_IMAGE_BASE}' || ${sources.name} || '.png')`,
sourceUrl: sources.url,
source_name: sources.name,
source_created_at: sources.createdAt,
source_is_followed: followExpression,
source_name: sources.name,
sourceId: sources.id,
sourceUrl: sources.url,
})
.from(sources);
@@ -181,8 +181,8 @@ export async function getSourceOverviewList(
const rows = await query.orderBy(desc(sources.createdAt), desc(sources.id)).limit(page.limit + 1);
return buildPaginationResult(rows, page, {
id: "sourceId",
date: "source_created_at",
id: "sourceId",
});
}
@@ -192,7 +192,7 @@ function createBackwardDateRange(days: number): { start: number; end: number } {
const startDate = new Date(now.getTime() - days * 86_400_000);
const start = Math.floor(startDate.getTime() / 1000);
return { start, end };
return { end, start };
}
async function fetchPublicationGraph(db: Database, sourceId: string): Promise<PublicationEntry[]> {
@@ -200,10 +200,10 @@ async function fetchPublicationGraph(db: Database, sourceId: string): Promise<Pu
const rows = await db
.select({
day: sql<string>`date
(${articles.publishedAt})`,
count: sql<number>`count
(${articles.id})`,
day: sql<string>`date
(${articles.publishedAt})`,
})
.from(articles)
.where(eq(articles.sourceId, sourceId))
@@ -233,7 +233,7 @@ async function fetchPublicationGraph(db: Database, sourceId: string): Promise<Pu
for (let date = new Date(start.getTime()); date < end; date.setUTCDate(date.getUTCDate() + 1)) {
const day = date.toISOString().slice(0, 10);
entries.push({ day, count: counts.get(day) ?? 0 });
entries.push({ count: counts.get(day) ?? 0, day });
}
return entries;
@@ -278,20 +278,8 @@ export async function getSourceDetails(
const [row] = await db
.select({
sourceId: sources.id,
source_name: sources.name,
source_description: sources.description,
sourceUrl: sources.url,
source_updated_at: sources.updatedAt,
source_display_name: sources.displayName,
source_bias: sources.bias,
source_reliability: sources.reliability,
source_transparency: sources.transparency,
source_image: sql<string>`('${SOURCE_IMAGE_BASE}' || ${sources.name} || '.png')`,
articles_count: sql<number>`count
(${articles.id})`,
source_crawled_at: sql<string | null>`max
(${articles.crawledAt})`,
articles_metadata_available: sql<number>`count
(*)
FILTER (WHERE
@@ -300,7 +288,19 @@ export async function getSourceDetails(
NOT
NULL
)`,
source_bias: sources.bias,
source_crawled_at: sql<string | null>`max
(${articles.crawledAt})`,
source_description: sources.description,
source_display_name: sources.displayName,
source_image: sql<string>`('${SOURCE_IMAGE_BASE}' || ${sources.name} || '.png')`,
source_is_followed: followExpression,
source_name: sources.name,
source_reliability: sources.reliability,
source_transparency: sources.transparency,
source_updated_at: sources.updatedAt,
sourceId: sources.id,
sourceUrl: sources.url,
})
.from(sources)
.leftJoin(articles, eq(articles.sourceId, sources.id))
@@ -328,12 +328,12 @@ export async function getSourceDetails(
]);
return {
categoryShares,
publicationGraph,
source: {
...row,
articles_count: Number(row.articles_count ?? 0),
articles_metadata_available: Number(row.articles_metadata_available ?? 0),
},
publicationGraph,
categoryShares,
};
}
packages/db/src/queries/users.ts
+2 -2
View File
@@ -17,10 +17,10 @@ export async function getUserProfile(
): Promise<UserProfileRow | null> {
const [row] = await db
.select({
user_created_at: users.createdAt,
user_email: users.email,
user_id: users.id,
user_name: users.name,
user_email: users.email,
user_created_at: users.createdAt,
user_updated_at: users.updatedAt,
})
.from(users)
packages/db/src/schema.ts
+63 -63
View File
@@ -5,9 +5,9 @@ import {
doublePrecision,
foreignKey,
index,
inet,
integer,
jsonb,
inet,
pgEnum,
pgTable,
primaryKey,
@@ -75,16 +75,16 @@ export const verificationTokenPurposeEnum = pgEnum("verification_token_purpose",
export const sources = pgTable(
"source",
{
id: uuid("id").notNull().defaultRandom().primaryKey(),
url: varchar("url", { length: 255 }).notNull(),
name: varchar("name", { length: 255 }).notNull(),
displayName: varchar("display_name", { length: 255 }),
description: varchar("description", { length: 1024 }),
createdAt: timestamp("created_at", { mode: "string" }).defaultNow().notNull(),
updatedAt: timestamp("updated_at", { mode: "string" }),
bias: biasEnum("bias").notNull().default("neutral"),
createdAt: timestamp("created_at", { mode: "string" }).defaultNow().notNull(),
description: varchar("description", { length: 1024 }),
displayName: varchar("display_name", { length: 255 }),
id: uuid("id").notNull().defaultRandom().primaryKey(),
name: varchar("name", { length: 255 }).notNull(),
reliability: reliabilityEnum("reliability").notNull().default("reliable"),
transparency: transparencyEnum("transparency").notNull().default("medium"),
updatedAt: timestamp("updated_at", { mode: "string" }),
url: varchar("url", { length: 255 }).notNull(),
},
(table) => [
uniqueIndex("unq_source_name").using(
@@ -103,33 +103,33 @@ export const sources = pgTable(
export const articles = pgTable(
"article",
{
id: uuid("id").notNull().defaultRandom().primaryKey(),
sourceId: uuid("sourceId").notNull(),
title: varchar("title", { length: 1024 }).notNull(),
bias: biasEnum("bias").notNull().default("neutral"),
body: text("body").notNull(),
hash: varchar("hash", { length: 32 }).notNull(),
categories: text("categories").array(),
sentiment: articleSentimentEnum("sentiment").notNull().default("neutral"),
metadata: jsonb("metadata"),
tokenStatistics: jsonb("token_statistics"),
image: varchar("image", { length: 1024 }).generatedAlwaysAs(() => sql`(metadata->>'image')`),
crawledAt: timestamp("crawled_at", { mode: "string" }).notNull(),
excerpt: varchar("excerpt", { length: 255 }).generatedAlwaysAs(
() => sql`((left(body, 200) || '...'))`,
),
publishedAt: timestamp("published_at", { mode: "string" }).notNull(),
crawledAt: timestamp("crawled_at", { mode: "string" }).notNull(),
updatedAt: timestamp("updated_at", { mode: "string" }),
hash: varchar("hash", { length: 32 }).notNull(),
id: uuid("id").notNull().defaultRandom().primaryKey(),
image: varchar("image", { length: 1024 }).generatedAlwaysAs(() => sql`(metadata->>'image')`),
link: varchar("link", { length: 1024 }).notNull(),
bias: biasEnum("bias").notNull().default("neutral"),
reliability: reliabilityEnum("reliability").notNull().default("reliable"),
transparency: transparencyEnum("transparency").notNull().default("medium"),
metadata: jsonb("metadata"),
publishedAt: timestamp("published_at", { mode: "string" }).notNull(),
readingTime: integer("reading_time").default(1),
reliability: reliabilityEnum("reliability").notNull().default("reliable"),
sentiment: articleSentimentEnum("sentiment").notNull().default("neutral"),
sourceId: uuid("sourceId").notNull(),
title: varchar("title", { length: 1024 }).notNull(),
tokenStatistics: jsonb("token_statistics"),
transparency: transparencyEnum("transparency").notNull().default("medium"),
tsv: tsvector("tsv").generatedAlwaysAs(
() => sql`(
setweight(to_tsvector('french', coalesce(title, '')), 'A')
|| setweight(to_tsvector('french', coalesce(body, '')), 'B')
)`,
),
updatedAt: timestamp("updated_at", { mode: "string" }),
},
(table) => [
index("article_sourceId_idx").on(table.sourceId),
@@ -146,13 +146,13 @@ export const articles = pgTable(
name: "article_sourceId_fkey",
}).onDelete("cascade"),
{
kind: "check",
expression: sql`reading_time >= 0`,
kind: "check",
name: "chk_article_reading_time",
},
{
kind: "check",
expression: sql`(metadata IS NULL OR jsonb_typeof(metadata) IN ('object','array'))`,
kind: "check",
name: "chk_article_metadata_json",
},
],
@@ -161,22 +161,22 @@ export const articles = pgTable(
export const users = pgTable(
"user",
{
id: uuid("id").notNull().defaultRandom().primaryKey(),
name: varchar("name", { length: 255 }).notNull(),
email: varchar("email", { length: 255 }).notNull(),
password: varchar("password", { length: 512 }).notNull(),
isLocked: boolean("is_locked").notNull().default(false),
isConfirmed: boolean("is_confirmed").notNull().default(false),
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
updatedAt: timestamp("updated_at", { mode: "string" }),
email: varchar("email", { length: 255 }).notNull(),
id: uuid("id").notNull().defaultRandom().primaryKey(),
isConfirmed: boolean("is_confirmed").notNull().default(false),
isLocked: boolean("is_locked").notNull().default(false),
name: varchar("name", { length: 255 }).notNull(),
password: varchar("password", { length: 512 }).notNull(),
roles: jsonb("roles").notNull(),
updatedAt: timestamp("updated_at", { mode: "string" }),
},
(table) => [
uniqueIndex("unq_user_email").using("btree", sql`lower (${table.email})`),
{
expression: sql`jsonb_typeof(roles) = 'array'`,
kind: "check",
name: "chk_user_roles_array",
expression: sql`jsonb_typeof(roles) = 'array'`,
},
],
);
@@ -184,13 +184,13 @@ export const users = pgTable(
export const bookmarks = pgTable(
"bookmark",
{
id: uuid("id").notNull().defaultRandom().primaryKey(),
userId: uuid("user_id").notNull(),
name: varchar("name", { length: 255 }).notNull(),
description: varchar("description", { length: 512 }),
isPublic: boolean("is_public").notNull().default(false),
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
description: varchar("description", { length: 512 }),
id: uuid("id").notNull().defaultRandom().primaryKey(),
isPublic: boolean("is_public").notNull().default(false),
name: varchar("name", { length: 255 }).notNull(),
updatedAt: timestamp("updated_at", { mode: "string" }),
userId: uuid("user_id").notNull(),
},
(table) => [
index("bookmark_user_id_idx").on(table.userId),
@@ -206,8 +206,8 @@ export const bookmarks = pgTable(
export const bookmarkArticles = pgTable(
"bookmark_article",
{
bookmarkId: uuid("bookmark_id").notNull(),
articleId: uuid("article_id").notNull(),
bookmarkId: uuid("bookmark_id").notNull(),
},
(table) => [
primaryKey({
@@ -232,13 +232,13 @@ export const bookmarkArticles = pgTable(
export const comments = pgTable(
"comment",
{
id: uuid("id").notNull().defaultRandom().primaryKey(),
userId: uuid("user_id").notNull(),
articleId: uuid("article_id").notNull(),
content: varchar("content", { length: 512 }).notNull(),
sentiment: articleSentimentEnum("sentiment").notNull().default("neutral"),
isSpam: boolean("is_spam").notNull().default(false),
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
id: uuid("id").notNull().defaultRandom().primaryKey(),
isSpam: boolean("is_spam").notNull().default(false),
sentiment: articleSentimentEnum("sentiment").notNull().default("neutral"),
userId: uuid("user_id").notNull(),
},
(table) => [
index("comment_user_id_idx").on(table.userId),
@@ -260,10 +260,10 @@ export const comments = pgTable(
export const followedSources = pgTable(
"followed_source",
{
id: uuid("id").notNull().defaultRandom().primaryKey(),
followerId: uuid("follower_id").notNull(),
sourceId: uuid("sourceId").notNull(),
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
followerId: uuid("follower_id").notNull(),
id: uuid("id").notNull().defaultRandom().primaryKey(),
sourceId: uuid("sourceId").notNull(),
},
(table) => [
index("followed_source_follower_idx").on(table.followerId),
@@ -289,9 +289,9 @@ export const followedSources = pgTable(
export const loginAttempts = pgTable(
"login_attempt",
{
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
id: uuid("id").notNull().defaultRandom().primaryKey(),
userId: uuid("user_id").notNull(),
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
},
(table) => [
index("login_attempt_user_id_idx").on(table.userId),
@@ -307,18 +307,18 @@ export const loginAttempts = pgTable(
export const loginHistories = pgTable(
"login_history",
{
id: uuid("id").notNull().defaultRandom().primaryKey(),
userId: uuid("user_id").notNull(),
ipAddress: inet("ip_address"),
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
deviceOperatingSystem: varchar("device_operating_system", { length: 255 }),
deviceClient: varchar("device_client", { length: 255 }),
deviceDevice: varchar("device_device", { length: 255 }),
deviceIsBot: boolean("device_is_bot").notNull().default(false),
locationTimeZone: varchar("location_time_zone", { length: 255 }),
locationLongitude: doublePrecision("location_longitude"),
locationLatitude: doublePrecision("location_latitude"),
deviceOperatingSystem: varchar("device_operating_system", { length: 255 }),
id: uuid("id").notNull().defaultRandom().primaryKey(),
ipAddress: inet("ip_address"),
locationAccuracyRadius: integer("location_accuracy_radius"),
locationLatitude: doublePrecision("location_latitude"),
locationLongitude: doublePrecision("location_longitude"),
locationTimeZone: varchar("location_time_zone", { length: 255 }),
userId: uuid("user_id").notNull(),
},
(table) => [
index("login_history_user_id_idx").on(table.userId),
@@ -346,11 +346,11 @@ export const refreshTokens = pgTable(
export const verificationTokens = pgTable(
"verification_token",
{
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
id: uuid("id").notNull().defaultRandom().primaryKey(),
userId: uuid("user_id").notNull(),
purpose: verificationTokenPurposeEnum("purpose").notNull(),
token: varchar("token", { length: 60 }),
createdAt: timestamp("created_at", { mode: "string" }).notNull(),
userId: uuid("user_id").notNull(),
},
(table) => [
index("verification_token_user_id_idx").on(table.userId),
@@ -374,40 +374,40 @@ export const sourcesRelations = relations(sources, ({ many }) => ({
}));
export const articlesRelations = relations(articles, ({ one, many }) => ({
bookmarkLinks: many(bookmarkArticles),
comments: many(comments),
source: one(sources, {
fields: [articles.sourceId],
references: [sources.id],
}),
bookmarkLinks: many(bookmarkArticles),
comments: many(comments),
}));
export const appUsersRelations = relations(users, ({ many }) => ({
bookmarks: many(bookmarks),
comments: many(comments),
followedSources: many(followedSources),
loginAttempts: many(loginAttempts),
loginHistories: many(loginHistories),
verificationTokens: many(verificationTokens),
followedSources: many(followedSources),
}));
export const bookmarksRelations = relations(bookmarks, ({ one, many }) => ({
articles: many(bookmarkArticles),
user: one(users, {
fields: [bookmarks.userId],
references: [users.id],
}),
articles: many(bookmarkArticles),
}));
export const bookmarkArticlesRelations = relations(bookmarkArticles, ({ one }) => ({
bookmark: one(bookmarks, {
fields: [bookmarkArticles.bookmarkId],
references: [bookmarks.id],
}),
article: one(articles, {
fields: [bookmarkArticles.articleId],
references: [articles.id],
}),
bookmark: one(bookmarks, {
fields: [bookmarkArticles.bookmarkId],
references: [bookmarks.id],
}),
}));
export const commentsRelations = relations(comments, ({ one }) => ({
packages/db/src/utils/pagination.ts
+2 -2
View File
@@ -53,7 +53,7 @@ export function createPageState(request: PageRequest = {}): PageState {
const cursor = request.cursor ?? null;
const offset = (page - 1) * limit;
return { page, limit, cursor, offset };
return { cursor, limit, offset, page };
}
export function encodeCursor(
@@ -111,9 +111,9 @@ export function buildPaginationResult<T extends Record<string, unknown>>(
data,
pagination: {
current: page.page,
limit: page.limit,
cursor,
hasNext,
limit: page.limit,
},
};
}
packages/db/tsconfig.json
+4 -4
View File
@@ -1,11 +1,11 @@
{
"extends": "@basango/typescript-config/base.json",
"include": ["src"],
"exclude": ["node_modules"],
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
}
}
},
"exclude": ["node_modules"],
"extends": "@basango/tsconfig/base.json",
"include": ["src"]
}