feat: added updated user usage structs (#2057)

* feat: added upated user usage structs

* fix: generate types

* feat: implement eq/partialeq to simplify tests

---------

Co-authored-by: oddgrd <[email protected]>

Author: nathanjclark

common/src/models/project.rs

@@ -117,7 +117,7 @@ pub enum ComputeTier {
 }
 
 /// Sub-Response for the /user/me/usage backend endpoint
-#[derive(Debug, Default, Deserialize, Serialize, Clone)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq)]
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[typeshare::typeshare]
 pub struct ProjectUsageResponse {
@@ -126,10 +126,13 @@ pub struct ProjectUsageResponse {
 
     /// Show the VCPU used by this project on the container platform.
     pub vcpu: ProjectUsageVCPU,
+
+    /// Daily usage breakdown for this project
+    pub daily: Vec<ProjectUsageDaily>,
 }
 
 /// Build Minutes subquery for the [`ProjectUsageResponse`] struct
-#[derive(Debug, Default, Deserialize, Serialize, Clone)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, Eq, PartialEq)]
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[typeshare::typeshare]
 pub struct ProjectUsageBuild {
@@ -141,7 +144,7 @@ pub struct ProjectUsageBuild {
 }
 
 /// VCPU subquery for the [`ProjectUsageResponse`] struct
-#[derive(Debug, Default, Deserialize, Serialize, Clone)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq)]
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[typeshare::typeshare]
 pub struct ProjectUsageVCPU {
@@ -151,3 +154,21 @@ pub struct ProjectUsageVCPU {
     /// Used VCPU hours beyond the included reserved VCPU hours for a project.
     pub billable_hours: f32,
 }
+
+// Add this new struct for daily usage data
+#[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[typeshare::typeshare]
+pub struct ProjectUsageDaily {
+    pub avg_cpu_utilised: f32,
+    pub avg_mem_utilised: f32,
+    pub billable_vcpu_hours: f32,
+    pub build_minutes: u32,
+    pub isodate: chrono::NaiveDate,
+    pub max_cpu_reserved: f32,
+    pub max_mem_reserved: f32,
+    pub min_cpu_reserved: f32,
+    pub min_mem_reserved: f32,
+    pub reserved_vcpu_hours: f32,
+    pub runtime_minutes: u32,
+}

common/src/models/user.rs

@@ -225,7 +225,7 @@ pub struct UpdateAccountTierRequest {
 }
 
 /// Sub-Response for the /user/me/usage backend endpoint
-#[derive(Debug, Default, Deserialize, Serialize, Clone)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[typeshare::typeshare]
 pub struct UserBillingCycle {
@@ -238,6 +238,39 @@ pub struct UserBillingCycle {
     pub end: NaiveDate,
 }
 
+#[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[typeshare::typeshare]
+pub struct UserUsageCustomDomains {
+    pub used: u32,
+    pub limit: u32,
+}
+
+#[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[typeshare::typeshare]
+pub struct UserUsageProjects {
+    pub used: u32,
+    pub limit: u32,
+}
+
+#[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[typeshare::typeshare]
+pub struct UserUsageTeamMembers {
+    pub used: u32,
+    pub limit: u32,
+}
+
+#[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[typeshare::typeshare]
+pub struct UserOverviewResponse {
+    pub custom_domains: UserUsageCustomDomains,
+    pub projects: UserUsageProjects,
+    pub team_members: Option<UserUsageTeamMembers>,
+}
+
 /// Response for the /user/me/usage backend endpoint
 #[derive(Debug, Default, Deserialize, Serialize, Clone)]
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
@@ -246,6 +279,8 @@ pub struct UserUsageResponse {
     /// Billing cycle for user, will be None if no usage data exists for user.
     pub billing_cycle: Option<UserBillingCycle>,
 
+    /// User overview information including project and domain counts
+    pub user: Option<UserOverviewResponse>,
     /// HashMap of project related metrics for this cycle keyed by project_id. Will be empty
     /// if no project usage data exists for user.
     pub projects: HashMap<String, ProjectUsageResponse>,