From c3d2831d86db0bf23234163cbc16caf764c8c733 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sat, 3 May 2025 13:56:43 -0400 Subject: [PATCH] collab: Use new subscription usage tables (#29848) This PR updates Collab to use the new subscription usage tables added in #29847. Release Notes: - N/A --- crates/collab/src/llm/db/queries/subscription_usages.rs | 2 +- crates/collab/src/llm/db/tables/subscription_usage.rs | 4 ++-- crates/collab/src/llm/db/tables/subscription_usage_meter.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/collab/src/llm/db/queries/subscription_usages.rs b/crates/collab/src/llm/db/queries/subscription_usages.rs index 48a3d54febc81c8a13e6f45a52db88432ec194bf..c772e8c5341a5dbc100d64bdd4d2c99cf93c775b 100644 --- a/crates/collab/src/llm/db/queries/subscription_usages.rs +++ b/crates/collab/src/llm/db/queries/subscription_usages.rs @@ -69,7 +69,7 @@ impl LlmDatabase { Ok( subscription_usage::Entity::insert(subscription_usage::ActiveModel { - id: ActiveValue::not_set(), + id: ActiveValue::set(Uuid::now_v7()), user_id: ActiveValue::set(user_id), period_start_at: ActiveValue::set(period_start_at), period_end_at: ActiveValue::set(period_end_at), diff --git a/crates/collab/src/llm/db/tables/subscription_usage.rs b/crates/collab/src/llm/db/tables/subscription_usage.rs index f9640416f6830b174399750968311f0a5a20a813..dd93b03d051ef9752b1c777d24205085fca4487e 100644 --- a/crates/collab/src/llm/db/tables/subscription_usage.rs +++ b/crates/collab/src/llm/db/tables/subscription_usage.rs @@ -4,10 +4,10 @@ use sea_orm::entity::prelude::*; use time::PrimitiveDateTime; #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] -#[sea_orm(table_name = "subscription_usages")] +#[sea_orm(table_name = "subscription_usages_v2")] pub struct Model { #[sea_orm(primary_key)] - pub id: i32, + pub id: Uuid, pub user_id: UserId, pub period_start_at: PrimitiveDateTime, pub period_end_at: PrimitiveDateTime, diff --git a/crates/collab/src/llm/db/tables/subscription_usage_meter.rs b/crates/collab/src/llm/db/tables/subscription_usage_meter.rs index 02ed5c0877942e40dc46f9217e50d9a2b5f180b2..7afef14d20c465c350c6e5537b942871fb8fc010 100644 --- a/crates/collab/src/llm/db/tables/subscription_usage_meter.rs +++ b/crates/collab/src/llm/db/tables/subscription_usage_meter.rs @@ -4,10 +4,10 @@ use serde::Serialize; use crate::llm::db::ModelId; #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] -#[sea_orm(table_name = "subscription_usage_meters")] +#[sea_orm(table_name = "subscription_usage_meters_v2")] pub struct Model { #[sea_orm(primary_key)] - pub id: i32, + pub id: Uuid, pub subscription_usage_id: i32, pub model_id: ModelId, pub mode: CompletionMode,