diff --git a/apps/provider-inventory/drizzle/0000_initial_provider_inventory.sql b/apps/provider-inventory/drizzle/0000_initial_provider_inventory.sql index 39dd39d6b..1afec3401 100644 --- a/apps/provider-inventory/drizzle/0000_initial_provider_inventory.sql +++ b/apps/provider-inventory/drizzle/0000_initial_provider_inventory.sql @@ -1,8 +1,6 @@ CREATE TABLE provider_inventory ( owner TEXT PRIMARY KEY, host_uri TEXT NOT NULL, - ip_region TEXT, - uptime_7d DOUBLE PRECISION, is_online BOOLEAN NOT NULL DEFAULT false, is_online_since TIMESTAMPTZ, diff --git a/apps/provider-inventory/drizzle/meta/0000_snapshot.json b/apps/provider-inventory/drizzle/meta/0000_snapshot.json index a003b016c..36ea7cf55 100644 --- a/apps/provider-inventory/drizzle/meta/0000_snapshot.json +++ b/apps/provider-inventory/drizzle/meta/0000_snapshot.json @@ -20,18 +20,6 @@ "primaryKey": false, "notNull": true }, - "ip_region": { - "name": "ip_region", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "uptime_7d": { - "name": "uptime_7d", - "type": "double precision", - "primaryKey": false, - "notNull": false - }, "is_online": { "name": "is_online", "type": "boolean", diff --git a/apps/provider-inventory/env/.env.functional.test b/apps/provider-inventory/env/.env.functional.test index 4552eae78..8772ced3c 100644 --- a/apps/provider-inventory/env/.env.functional.test +++ b/apps/provider-inventory/env/.env.functional.test @@ -1,4 +1,4 @@ -POSTGRES_BASE_URL=postgres://postgres:password@localhost:5432 +PROVIDER_INVENTORY_POSTGRES_URL=postgres://postgres:password@localhost:5432 LOG_LEVEL=warn STD_OUT_LOG_FORMAT=pretty REST_API_NODE_URL=https://api.sandbox-2.aksh.pw:443 diff --git a/apps/provider-inventory/src/model-schemas/provider-inventory/provider-inventory.schema.ts b/apps/provider-inventory/src/model-schemas/provider-inventory/provider-inventory.schema.ts index 8ae6d6ea9..0920d0f7f 100644 --- a/apps/provider-inventory/src/model-schemas/provider-inventory/provider-inventory.schema.ts +++ b/apps/provider-inventory/src/model-schemas/provider-inventory/provider-inventory.schema.ts @@ -1,5 +1,5 @@ import { sql } from "drizzle-orm"; -import { bigint, boolean, doublePrecision, index, pgTable, text, timestamp } from "drizzle-orm/pg-core"; +import { bigint, boolean, index, pgTable, text, timestamp } from "drizzle-orm/pg-core"; import { jsonbBigint } from "@src/lib/jsonb-bigint/jsonb-bigint.column"; @@ -8,8 +8,6 @@ export const providerInventory = pgTable( { owner: text("owner").primaryKey(), hostUri: text("host_uri").notNull(), - ipRegion: text("ip_region"), - uptime7d: doublePrecision("uptime_7d"), isOnline: boolean("is_online").notNull().default(false), isOnlineSince: timestamp("is_online_since", { withTimezone: true }), diff --git a/apps/provider-inventory/src/repositories/bid-screening/bid-screening.repository.ts b/apps/provider-inventory/src/repositories/bid-screening/bid-screening.repository.ts index 1e6707667..f326a2405 100644 --- a/apps/provider-inventory/src/repositories/bid-screening/bid-screening.repository.ts +++ b/apps/provider-inventory/src/repositories/bid-screening/bid-screening.repository.ts @@ -31,8 +31,6 @@ export class BidScreeningRepository { .select({ owner: providerInventory.owner, hostUri: providerInventory.hostUri, - ipRegion: providerInventory.ipRegion, - uptime7d: providerInventory.uptime7d, inventory: providerInventory.inventory, isAudited: sql`${providerInventory.auditedBy} @> ARRAY[${AUDITOR}]::text[]`.as("isAudited") }) @@ -42,8 +40,6 @@ export class BidScreeningRepository { return rows.map(row => ({ owner: row.owner, hostUri: row.hostUri, - ipRegion: row.ipRegion, - uptime7d: row.uptime7d, cluster: hydrateClusterState(row.inventory), isAudited: row.isAudited })); diff --git a/apps/provider-inventory/src/services/bid-screening/bid-screening.service.spec.ts b/apps/provider-inventory/src/services/bid-screening/bid-screening.service.spec.ts index bac565846..d0bfd625e 100644 --- a/apps/provider-inventory/src/services/bid-screening/bid-screening.service.spec.ts +++ b/apps/provider-inventory/src/services/bid-screening/bid-screening.service.spec.ts @@ -104,8 +104,6 @@ function makeCandidate(owner: string, overrides?: { isAudited?: boolean }): BidS return { owner, hostUri: "https://provider.example.com:8443", - ipRegion: "us-east", - uptime7d: 0.998, isAudited: overrides?.isAudited ?? false, cluster: { nodes: [ diff --git a/apps/provider-inventory/src/types/provider.ts b/apps/provider-inventory/src/types/provider.ts index 07497a7f7..9ea7b253a 100644 --- a/apps/provider-inventory/src/types/provider.ts +++ b/apps/provider-inventory/src/types/provider.ts @@ -3,7 +3,5 @@ import type { ClusterState } from "./inventory.types"; export interface ProviderWithClusterState { owner: string; hostUri: string; - ipRegion?: string | null; - uptime7d?: number | null; cluster: ClusterState; } diff --git a/apps/provider-inventory/test/services/test-database.service.ts b/apps/provider-inventory/test/services/test-database.service.ts index 50460b274..9c11276eb 100644 --- a/apps/provider-inventory/test/services/test-database.service.ts +++ b/apps/provider-inventory/test/services/test-database.service.ts @@ -9,12 +9,12 @@ export class TestDatabaseService { readonly #dbName: string; constructor(testPath: string) { - if (!process.env.POSTGRES_BASE_URL) { - throw new Error("POSTGRES_BASE_URL is not set"); + if (!process.env.PROVIDER_INVENTORY_POSTGRES_URL) { + throw new Error("PROVIDER_INVENTORY_POSTGRES_URL is not set"); } const fileName = path.basename(testPath).replace(/\.(spec|integration)\.ts$/, ""); const prefix = randomUUID().replace(/-/g, ""); - this.#postgresUri = process.env.POSTGRES_BASE_URL; + this.#postgresUri = process.env.PROVIDER_INVENTORY_POSTGRES_URL; this.#dbName = `pi_test_${prefix}_${fileName}`.replace(/\W+/g, "_"); process.env.PROVIDER_INVENTORY_POSTGRES_URL = `${this.#postgresUri}/${this.#dbName}`; }