From 07b81bf2de13dd2fc356920a6f8da51c182136ac Mon Sep 17 00:00:00 2001 From: gnomadic Date: Wed, 4 Sep 2024 15:20:12 -0400 Subject: [PATCH] getting closer --- .../api/routers/metrics/utils/getProjects.ts | 4 +- src/types/metrics.ts | 72 +++++++++---------- src/utils/fetchMetrics/fetchImpactMetrics.ts | 20 +++--- src/utils/fetchMetrics/types.ts | 4 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/server/api/routers/metrics/utils/getProjects.ts b/src/server/api/routers/metrics/utils/getProjects.ts index 5da76ab7..6e7af030 100644 --- a/src/server/api/routers/metrics/utils/getProjects.ts +++ b/src/server/api/routers/metrics/utils/getProjects.ts @@ -27,7 +27,7 @@ export async function getProjects({ project_name: { _in: Object.keys(tempProjectMap) }, event_source: { _eq: "BASE" }, }, - orderBy: [{ active_contract_count_90_days: "desc" }], + orderBy: [{ activeContractCount90Days: "desc" }], limit: 300, offset: 0, }; @@ -37,7 +37,7 @@ export async function getProjects({ const projectMetricsMap: ProjectIdToMetricsMap = Object.fromEntries( projects.map((project) => { // Replace with correct projectId - const projectId = tempProjectMap[project.project_name] ?? ""; + const projectId = tempProjectMap[project.projectName] ?? ""; const metrics = metricIds.reduce( (acc, metricId) => ({ ...acc, diff --git a/src/types/metrics.ts b/src/types/metrics.ts index 46b3d2da..b8116abe 100644 --- a/src/types/metrics.ts +++ b/src/types/metrics.ts @@ -1,35 +1,35 @@ export enum AvailableMetrics { - active_contract_count_90_days = "Active Contract Count (90 Days)", - address_count = "Address Count", - address_count_90_days = "Address Count (90 Days)", - days_since_first_transaction = "Days Since First Transaction", - gas_fees_sum = "Gas Fees Sum", - gas_fees_sum_6_months = "Gas Fees Sum (6 Months)", - high_activity_address_count_90_days = "High Activity Address Count (90 Days)", - low_activity_address_count_90_days = "Low Activity Address Count (90 Days)", - medium_activity_address_count_90_days = "Medium Activity Address Count (90 Days)", - multi_project_address_count_90_days = "Multi Project Address Count (90 Days)", - new_address_count_90_days = "New Address Count (90 Days)", - returning_address_count_90_days = "Returning Address Count (90 Days)", - transaction_count = "Transaction Count", - transaction_count_6_months = "Transaction Count (6 Months)", + activeContractCount90Days = "Active Contract Count (90 Days)", + addressCount = "Address Count", + addressCount90Days = "Address Count (90 Days)", + daysSinceFirstTransaction = "Days Since First Transaction", + gasFeesSum = "Gas Fees Sum", + gasFeesSum6Months = "Gas Fees Sum (6 Months)", + highActivityAddressCount90Days = "High Activity Address Count (90 Days)", + lowActivityAddressCount90Days = "Low Activity Address Count (90 Days)", + mediumActivityAddressCount90Days = "Medium Activity Address Count (90 Days)", + multiProjectAddressCount90Days = "Multi Project Address Count (90 Days)", + newAddressCount90Days = "New Address Count (90 Days)", + returningAddressCount90Days = "Returning Address Count (90 Days)", + transactionCount = "Transaction Count", + transactionCount6Months = "Transaction Count (6 Months)", } export type OSOMetric = { - active_contract_count_90_days: number; - address_count: number; - address_count_90_days: number; - days_since_first_transaction: number; - gas_fees_sum: number; - gas_fees_sum_6_months: number; - high_activity_address_count_90_days: number; - low_activity_address_count_90_days: number; - medium_activity_address_count_90_days: number; - multi_project_address_count_90_days: number; - new_address_count_90_days: number; - returning_address_count_90_days: number; - transaction_count: number; - transaction_count_6_months: number; + activeContractCount90Days: number; + addressCount: number; + addressCount90Days: number; + daysSinceFirstTransaction: number; + gasFeesSum: number; + gasFeesSum6Months: number; + highActivityAddressCount90Days: number; + lowActivityAddressCount90Days: number; + mediumActivityAddressCount90Days: number; + multiProjectAddressCount90Days: number; + newAddressCount90Days: number; + returningAddressCount90Days: number; + transactionCount: number; + transactionCount6Months: number; }; export type MetricId = keyof OSOMetric; @@ -41,19 +41,19 @@ export type Metric = { }; type OSOMetricProjectMeta = { - event_source: string; - display_name: string; - project_id: string; - project_name: string; - project_namespace: string; - project_source: string; + eventSource: string; + displayName: string; + projectId: string; + projectName: string; + projectNamespace: string; + projectSource: string; }; export type OSOMetrics = (OSOMetric & OSOMetricProjectMeta)[]; export type OSOMetricCSVProjectMeta = { - project_name: string; - project_id: string; + projectName: string; + projectId: string; }; export type OSOMetricsCSV = OSOMetricCSVProjectMeta & OSOMetric; diff --git a/src/utils/fetchMetrics/fetchImpactMetrics.ts b/src/utils/fetchMetrics/fetchImpactMetrics.ts index 0d510f3d..6b476c8e 100644 --- a/src/utils/fetchMetrics/fetchImpactMetrics.ts +++ b/src/utils/fetchMetrics/fetchImpactMetrics.ts @@ -9,23 +9,23 @@ const fetch = createCachedFetch({ ttl: 1000 * 60 * 10 }); function createMetricsQuery(metrics: string[]) { return ` -query Metrics( - $where: onchain_metrics_by_project_v1_bool_exp, - $orderBy: [onchain_metrics_by_project_v1_order_by!], +query Oso_onchainMetricsByProjectV1( + $where: Oso_OnchainMetricsByProjectV1BoolExp, + $orderBy: [Oso_OnchainMetricsByProjectV1OrderBy!], $limit: Int, $offset: Int) { - onchain_metrics_by_project_v1( + oso_onchainMetricsByProjectV1( where: $where order_by: $orderBy limit: $limit offset: $offset ) { - event_source - display_name - project_id - project_name - project_namespace - project_source + eventSource + displayName + projectId + projectName + projectNamespace + projectSource ${metrics.join("\n")} } diff --git a/src/utils/fetchMetrics/types.ts b/src/utils/fetchMetrics/types.ts index 2ccf1651..6805eb00 100644 --- a/src/utils/fetchMetrics/types.ts +++ b/src/utils/fetchMetrics/types.ts @@ -1,10 +1,10 @@ -type OrderBy = "asc" | "desc"; +type OrderBy = "Asc" | "Desc"; export type ImpactMetricsQuery = { where: { project_name: { _in: string[] }; event_source: { _eq: "BASE" }; }; - orderBy: { active_contract_count_90_days: OrderBy }[]; + orderBy: { activeContractCount90Days: OrderBy }[]; limit: number; offset: number; };