chore(insights): correct DB migration script (#5024)

* chore(insights): correct DB migration script * fixup! chore(insights): correct DB migration script * fixup! chore(insights): correct DB migration script * fixup! chore(insights): correct DB migration script * fixup! chore(insights): correct DB migration script
QwikDev · Aug 25, 2023 · ab9f97c · ab9f97c
1 parent 925389b
commit ab9f97c
Show file tree

Hide file tree

Showing 17 changed files with 438 additions and 137 deletions.
diff --git a/packages/insights/drizzle/0012_omniscient_leader.sql b/packages/insights/drizzle/0012_omniscient_leader.sql
@@ -10,6 +10,22 @@ CREATE TABLE `symbolDetailTmp` (
 	FOREIGN KEY (`public_api_key`) REFERENCES `applications`(`public_api_key`) ON UPDATE no action ON DELETE no action,
 	FOREIGN KEY (`public_api_key`,`manifest_hash`) REFERENCES `manifests`(`public_api_key`,`hash`) ON UPDATE no action ON DELETE no action
 );--> statement-breakpoint
-INSERT INTO `symbolDetailTmp` SELECT * FROM `symbolDetail`;--> statement-breakpoint
+INSERT INTO `symbolDetailTmp` (
+	`hash`,
+	`public_api_key`,
+	`manifest_hash`,
+	`full_name`,
+	`origin`,
+	`lo`,
+	`hi`
+) SELECT 
+	`hash`,
+	`public_api_key`,
+	`manifest_hash`,
+	`full_name`,
+	`origin`,
+	`lo`,
+	`hi`
+ FROM `symbolDetail`;--> statement-breakpoint
 DROP TABLE `symbolDetail`;--> statement-breakpoint
 ALTER TABLE `symbolDetailTmp` RENAME TO `symbolDetail`;
diff --git a/packages/insights/package.json b/packages/insights/package.json
@@ -9,8 +9,8 @@
     "@typescript/analyze-trace": "^0.10.0",
     "density-clustering": "^1.3.0",
     "dotenv": "^16.3.1",
-    "drizzle-kit": "^0.19.12",
-    "drizzle-orm": "^0.28.2",
+    "drizzle-kit": "^0.19.13",
+    "drizzle-orm": "0.28.3",
     "install": "^0.13.0"
   },
   "devDependencies": {
@@ -29,7 +29,7 @@
     "eslint-plugin-qwik": "1.2.6",
     "netlify-cli": "^15.9.1",
     "prettier": "3.0.0",
-    "typescript": "5.1.6",
+    "typescript": "5.2.2",
     "undici": "5.22.1",
     "uvu": "0.5.6",
     "vite": "4.4.7",

diff --git a/packages/insights/src/db/query-helpers.ts b/packages/insights/src/db/query-helpers.ts
@@ -1,5 +1,5 @@
-import { sql, type InferInsertModel } from 'drizzle-orm';
-import { edgeTable, type routesTable } from './schema';
+import { sql } from 'drizzle-orm';
+import { type EdgeRowSansId, edgeTable, type RouteRowSansId } from './schema';
 import { BUCKETS } from '~/stats/vector';
 
 export type VectorKeys<PREFIX extends string> =
@@ -81,7 +81,7 @@ export function createEdgeRow({
   interaction: boolean;
   delayBucket: number;
   latencyBucket: number;
-}): InferInsertModel<typeof edgeTable> {
+}): EdgeRowSansId {
   return {
     publicApiKey,
     manifestHash,
@@ -630,7 +630,7 @@ export function createRouteRow({
   manifestHash: string;
   route: string;
   symbol: string;
-}): InferInsertModel<typeof routesTable> {
+}): RouteRowSansId {
   return {
     publicApiKey,
     manifestHash,

diff --git a/packages/insights/src/db/query.ts b/packages/insights/src/db/query.ts
@@ -1,6 +1,13 @@
 import { and, eq, isNull, sql, inArray } from 'drizzle-orm';
 import { type AppDatabase } from '.';
-import { applicationTable, edgeTable, routesTable, symbolDetailTable, symbolTable } from './schema';
+import {
+  type SymbolDetailRow,
+  applicationTable,
+  edgeTable,
+  routesTable,
+  symbolDetailTable,
+  symbolTable,
+} from './schema';
 import {
   createEdgeRow,
   delayBucketField,
@@ -39,7 +46,17 @@ export async function getEdges(
   }));
 }
 
-export async function getSlowEdges(db: AppDatabase, publicApiKey: string, manifests: string[]) {
+export interface SlowEdge {
+  manifestHash: string;
+  to: string;
+  latency: number[];
+}
+
+export async function getSlowEdges(
+  db: AppDatabase,
+  publicApiKey: string,
+  manifests: string[]
+): Promise<SlowEdge[]> {
   let where = eq(edgeTable.publicApiKey, publicApiKey);
   if (manifests.length) {
     where = and(where, inArray(edgeTable.manifestHash, manifests))!;
@@ -62,7 +79,15 @@ export async function getSlowEdges(db: AppDatabase, publicApiKey: string, manife
   }));
 }
 
-export function getSymbolDetails(db: AppDatabase, publicApiKey: string) {
+export type SymbolDetailForApp = Pick<
+  SymbolDetailRow,
+  'hash' | 'fullName' | 'origin' | 'lo' | 'hi'
+>;
+
+export async function getSymbolDetails(
+  db: AppDatabase,
+  publicApiKey: string
+): Promise<SymbolDetailForApp[]> {
   return db
     .select({
       hash: symbolDetailTable.hash,

diff --git a/packages/insights/src/db/schema.ts b/packages/insights/src/db/schema.ts
@@ -1,3 +1,4 @@
+import { type InferSelectModel, type InferInsertModel } from 'drizzle-orm';
 import {
   integer,
   sqliteTable,
@@ -9,7 +10,10 @@ import {
 
 export type DatabaseSchema = {
   applicationTable: typeof applicationTable;
+  manifestTabes: typeof manifestTable;
   symbolTable: typeof symbolTable;
+  symbolDetailTable: typeof symbolDetailTable;
+  errorTable: typeof errorTable;
 };
 
 export const applicationTable = sqliteTable(
@@ -25,6 +29,9 @@ export const applicationTable = sqliteTable(
   })
 );
 
+export type ApplicationRow = InferSelectModel<typeof applicationTable>;
+export type ApplicationRowSansId = InferInsertModel<typeof applicationTable>;
+
 export const symbolTable = sqliteTable('symbols', {
   id: integer('id').primaryKey(),
   publicApiKey: text('public_api_key').references(() => applicationTable.publicApiKey),
@@ -37,6 +44,9 @@ export const symbolTable = sqliteTable('symbols', {
   loadDelay: integer('load_delay_ms').notNull(),
 });
 
+export type SymbolRow = InferSelectModel<typeof symbolTable>;
+export type SymbolRowSansId = InferInsertModel<typeof symbolTable>;
+
 // event, source, lineno, colno, error
 export const errorTable = sqliteTable('errors', {
   id: integer('id').primaryKey(),
@@ -53,6 +63,8 @@ export const errorTable = sqliteTable('errors', {
   stack: text('stack').notNull(),
 });
 
+export type ErrorRow = InferSelectModel<typeof errorTable>;
+
 export const manifestTable = sqliteTable(
   'manifests',
   {
@@ -66,6 +78,8 @@ export const manifestTable = sqliteTable(
   })
 );
 
+export type ManifestRow = InferSelectModel<typeof manifestTable>;
+
 export const symbolDetailTable = sqliteTable(
   'symbolDetail',
   {
@@ -92,6 +106,9 @@ export const symbolDetailTable = sqliteTable(
   }
 );
 
+export type SymbolDetailRow = InferSelectModel<typeof symbolDetailTable>;
+export type SymbolDetailRowSansId = InferInsertModel<typeof symbolDetailTable>;
+
 export const edgeTable = sqliteTable(
   'edges',
   {
@@ -217,6 +234,9 @@ export const edgeTable = sqliteTable(
   })
 );
 
+export type EdgeRow = InferSelectModel<typeof edgeTable>;
+export type EdgeRowSansId = InferInsertModel<typeof edgeTable>;
+
 export const routesTable = sqliteTable(
   'routes',
   {
@@ -285,3 +305,6 @@ export const routesTable = sqliteTable(
     ),
   })
 );
+
+export type RouteRow = InferSelectModel<typeof routesTable>;
+export type RouteRowSansId = InferInsertModel<typeof routesTable>;
diff --git a/packages/insights/src/db/sql-edges.ts b/packages/insights/src/db/sql-edges.ts
@@ -3,12 +3,19 @@ import { type AppDatabase } from './index';
 import { edgeTableDelayCount, latencyColumnSums, delayColumnSums, toVector } from './query-helpers';
 import { edgeTable } from './schema';
 
+export interface OutgoingEdge {
+  manifestHash: string;
+  to: string;
+  latency: number[];
+  delay: number[];
+}
+
 export async function dbGetOutgoingEdges(
   db: AppDatabase,
   publicApiKey: string,
   symbol: string,
   manifests: string[]
-) {
+): Promise<OutgoingEdge[]> {
   let where = and(eq(edgeTable.publicApiKey, publicApiKey), eq(edgeTable.from, symbol));
   if (manifests.length) {
     where = and(where, inArray(edgeTable.manifestHash, manifests))!;

diff --git a/packages/insights/src/db/sql-manifest.ts b/packages/insights/src/db/sql-manifest.ts
@@ -1,12 +1,12 @@
-import { eq, and, type InferSelectModel, sql } from 'drizzle-orm';
+import { eq, and, sql } from 'drizzle-orm';
 import { type AppDatabase } from './index';
-import { edgeTable, manifestTable } from './schema';
+import { type ManifestRow, edgeTable, manifestTable } from './schema';
 import { latencyColumnSums, toVector } from './query-helpers';
 
 export async function dbGetManifests(
   db: AppDatabase,
   publicApiKey: string
-): Promise<InferSelectModel<typeof manifestTable>[]> {
+): Promise<ManifestRow[]> {
   const manifests = await db
     .select()
     .from(manifestTable)
@@ -16,7 +16,16 @@ export async function dbGetManifests(
   return manifests;
 }
 
-export async function dbGetManifestStats(db: AppDatabase, publicApiKey: string) {
+export interface ManifestStatsRow {
+  hash: string;
+  timestamp: Date;
+  latency: number[];
+}
+
+export async function dbGetManifestStats(
+  db: AppDatabase,
+  publicApiKey: string
+): Promise<ManifestStatsRow[]> {
   const manifests = await db
     .select({ hash: manifestTable.hash, timestamp: manifestTable.timestamp, ...latencyColumnSums })
     .from(manifestTable)
@@ -38,7 +47,7 @@ export async function dbGetManifestInfo(
   db: AppDatabase,
   publicApiKey: string,
   manifestHash: string
-): Promise<InferSelectModel<typeof manifestTable>> {
+): Promise<ManifestRow> {
   const manifest = await db
     .select()
     .from(manifestTable)

diff --git a/packages/insights/src/routes.gen.d.ts b/packages/insights/src/routes.gen.d.ts
@@ -49,53 +49,53 @@ export interface AppRouteParamsFunction {
   (route: "/", params?: {}): string;
   (
     route: "/api/v1/[publicApiKey]/bundles/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/api/v1/[publicApiKey]/post/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/api/v1/[publicApiKey]/post/error/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/api/v1/[publicApiKey]/post/manifest/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (route: "/app/", params?: {}): string;
   (route: "/app/[publicApiKey]/", params: { publicApiKey: string }): string;
   (
     route: "/app/[publicApiKey]/edit/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/app/[publicApiKey]/errors/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/app/[publicApiKey]/manifests/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/app/[publicApiKey]/symbols/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/app/[publicApiKey]/symbols/bundles/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/app/[publicApiKey]/symbols/edge/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/app/[publicApiKey]/symbols/outgoing/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (
     route: "/app/[publicApiKey]/symbols/slow/",
-    params: { publicApiKey: string }
+    params: { publicApiKey: string },
   ): string;
   (route: "/app/add/", params?: {}): string;
   (route: "/test/", params?: {}): string;

diff --git a/packages/insights/src/routes/app/[publicApiKey]/errors/index.tsx b/packages/insights/src/routes/app/[publicApiKey]/errors/index.tsx
@@ -1,14 +1,14 @@
-import { component$ } from '@builder.io/qwik';
+import { type ReadonlySignal, component$ } from '@builder.io/qwik';
 import { routeLoader$ } from '@builder.io/qwik-city';
-import { getDB, errorTable } from '~/db';
+import { getDB, errorTable, type ErrorRow } from '~/db';
 import { eq, sql } from 'drizzle-orm';
 import { css, cx } from '~/styled-system/css';
 import { ErrorIcon } from '~/components/icons/error';
 import { type PopupEvent } from '~/components/popup-manager';
 
 export const useErrors = routeLoader$(async ({ params }) => {
   const db = getDB();
-  const errors = await db
+  const errors: ErrorRow[] = await db
     .select()
     .from(errorTable)
     .where(eq(errorTable.publicApiKey, params.publicApiKey))
@@ -60,7 +60,7 @@ const columnMessageCell = cx(
 );
 
 export default component$(() => {
-  const errors = useErrors();
+  const errors: ReadonlySignal<ErrorRow[]> = useErrors();
   return (
     <div>
       <h1>

diff --git a/packages/insights/src/routes/app/[publicApiKey]/manifests/index.tsx b/packages/insights/src/routes/app/[publicApiKey]/manifests/index.tsx
@@ -1,9 +1,9 @@
-import { component$ } from '@builder.io/qwik';
+import { type ReadonlySignal, component$ } from '@builder.io/qwik';
 import { routeLoader$ } from '@builder.io/qwik-city';
 import Histogram, { latencyColors } from '~/components/histogram';
 import { ManifestTile } from '~/components/minifest-tile';
 import { getDB } from '~/db';
-import { dbGetManifestStats } from '~/db/sql-manifest';
+import { type ManifestStatsRow, dbGetManifestStats } from '~/db/sql-manifest';
 import { vectorAvg, vectorSum, BUCKETS } from '~/stats/vector';
 import { css, cx } from '~/styled-system/css';
 
@@ -60,7 +60,7 @@ const columnHistogram = cx(
 );
 
 export default component$(() => {
-  const data = useData();
+  const data: ReadonlySignal<ManifestStatsRow[]> = useData();
   return (
     <div>
       <h1>Manifests</h1>