Update servers route (#3032)

modrinth · Dec 17, 2024 · 7e8cead · 7e8cead
1 parent fee8d6c
commit 7e8cead
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/...ca9658b604b3f3eab53fbac5fa0d95560a1c.json → ...e9a3e406cc58059d0c21dc95ed8b5d0634d9.json b/...ca9658b604b3f3eab53fbac5fa0d95560a1c.json → ...e9a3e406cc58059d0c21dc95ed8b5d0634d9.json
diff --git a/apps/labrinth/src/database/models/user_subscription_item.rs b/apps/labrinth/src/database/models/user_subscription_item.rs
@@ -115,6 +115,7 @@ impl UserSubscriptionItem {
             INNER JOIN products_prices pp ON us.price_id = pp.id
             INNER JOIN products p ON p.metadata  @> '{"type": "pyro"}'
             WHERE $1::text IS NULL OR us.status = $1::text
+            GROUP BY us.id
             "#,
             status
         )

diff --git a/apps/labrinth/src/routes/internal/billing.rs b/apps/labrinth/src/routes/internal/billing.rs
@@ -898,14 +898,25 @@ pub async fn active_servers(
         )
         .await?;
 
+    #[derive(Serialize)]
+    struct ActiveServer {
+        pub user_id: crate::models::ids::UserId,
+        pub server_id: String,
+        pub interval: PriceDuration,
+    }
+
     let server_ids = servers
         .into_iter()
         .filter_map(|x| {
-            x.metadata.map(|x| match x {
-                SubscriptionMetadata::Pyro { id } => id,
+            x.metadata.as_ref().map(|metadata| match metadata {
+                SubscriptionMetadata::Pyro { id } => ActiveServer {
+                    user_id: x.user_id.into(),
+                    server_id: id.clone(),
+                    interval: x.interval,
+                },
             })
         })
-        .collect::<Vec<_>>();
+        .collect::<Vec<ActiveServer>>();
 
     Ok(HttpResponse::Ok().json(server_ids))
 }
@@ -1747,7 +1758,7 @@ pub async fn stripe_webhook(
                                             "source": source,
                                             "payment_interval": metadata.charge_item.subscription_interval.map(|x| match x {
                                                 PriceDuration::Monthly => 1,
-                                                PriceDuration::Yearly => 3,
+                                                PriceDuration::Yearly => 12,
                                             })
                                         }))
                                         .send()