Migrate vm_payment to subscriptions payment system

.github/workflows/build.yml

@@ -5,6 +5,20 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
+    inputs:
+      docker:
+        description: 'Docker image to build'
+        required: false
+        default: 'all'
+        type: choice
+        options:
+          - all
+          - lnvps-api
+          - lnvps-api-admin
+          - lnvps-operator
+          - lnvps-nostr
+          - lnvps-host-info
 
 env:
   REGISTRY: registry.v0l.io
@@ -14,6 +28,7 @@ jobs:
   # Build host-info as a multi-arch image first
   build-host-info:
     runs-on: ubuntu-latest
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.docker != 'lnvps-host-info' && github.event.inputs.docker != 'all'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -81,6 +96,7 @@ jobs:
           password: ${{ secrets.REGISTRY_TOKEN }}
 
       - name: Build and push ${{ matrix.name }}
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.docker != matrix.name && github.event.inputs.docker != 'all'
         uses: docker/build-push-action@v5
         with:
           context: .

API_CHANGELOG.md

@@ -4,6 +4,59 @@ All notable changes to the LNVPS APIs are documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [Unreleased]
+
+### Fixed
+
+- **2026-03-03** - VM upgrade no longer leaves subscription renewal cost stale
+  - `POST /api/v1/vm/{id}/upgrade` — After payment confirmation, `SubscriptionLineItem.amount` is now updated to the new base-currency cost of the upgraded template for both standard→custom and custom→custom upgrade paths
+  - `GET /api/v1/subscriptions/{id}` and admin equivalents — `line_items[].price` now reflects the post-upgrade renewal cost immediately after an upgrade completes
+
+- **2026-03-03** - Migration tool no longer marks subscriptions active for deleted VMs
+  - `migrate_vm_subscriptions` — Subscriptions created for deleted VMs are now inserted with `is_active = false`
+
+### Changed
+
+- **2026-03-03** - Admin subscription list now returns results in descending order
+  - `GET /api/admin/v1/subscriptions` — Results ordered by `id DESC` (newest first); applies to both the all-subscriptions list and the `?user_id=N` filtered list
+
+- **2026-03-03** - Admin VM info response now includes subscription details
+  - `GET /api/admin/v1/vms/{id}` — Response now includes a `subscription` object with the full `AdminSubscriptionInfo` (id, status, interval, currency, line items, payment count); omitted if no subscription is linked
+
+- **2026-03-03** - Admin subscription payment response now includes `company_base_currency`
+  - `GET /api/admin/v1/subscriptions/{id}/payments` — Each payment now includes `company_base_currency`
+  - `GET /api/admin/v1/subscription_payments/{id}` — Response now includes `company_base_currency`
+  - `POST /api/admin/v1/subscription_payments/{id}/complete` — Response now includes `company_base_currency`
+
+- **2026-03-03** - VM payments now use the unified `subscription_payment` table
+  - All VM renewal, purchase, and upgrade payments are now stored in `subscription_payment` instead of `vm_payment`
+  - `GET /api/v1/vm/{id}/payments` — Response format unchanged; now backed by `subscription_payment`; supports pagination via `?limit=N&offset=N` query params
+  - `GET /api/v1/vm/{id}/payments/{payment_id}` — Now looks up by `subscription_payment.id`
+  - `GET /api/v1/vm/{id}/payments/{payment_id}/invoice` — Now backed by `subscription_payment`
+  - `POST /api/v1/vm/{id}/renew` — Returns payment from `subscription_payment`
+  - `POST /api/v1/vm/{id}/upgrade` — Returns payment from `subscription_payment`; upgrade parameters stored in `metadata` JSON field
+  - `GET /api/admin/v1/vms/{id}/payments` — Now backed by `subscription_payment`; uses real DB-level pagination
+  - `GET /api/admin/v1/vms/{id}/payments/{payment_id}` — Now looks up by `subscription_payment.id`
+  - `POST /api/admin/v1/vms/{id}/payments/{payment_id}/complete` — Now completes a `subscription_payment`
+  - `GET /api/admin/v1/reports/time-series` — Revenue data now sourced from `subscription_payment`
+  - `GET /api/admin/v1/reports/referral-usage/time-series` — Referral data now sourced from `subscription_payment`
+  - **Requires data migration**: Run `migrate_vm_subscriptions` binary to backfill existing VMs with subscriptions before upgrading
+  - **Schema migrations**: `20260302151134_vm_subscription_link.sql` and `20260302154256_vm_subscription_not_null.sql`
+
+- **2026-03-03** - Every VM is now linked to a `subscription` and `subscription_line_item`
+  - `vm` table has a new `subscription_line_item_id` column (NOT NULL) linking it to the subscriptions system
+  - New VMs provisioned via `POST /api/v1/vm` or `POST /api/v1/vm/custom` automatically get a subscription created
+  - The subscription interval is copied from the cost plan (standard VMs) or defaults to 1 month (custom VMs)
+
+- **2026-03-03** - `IntervalType` enum renamed from `VmCostPlanIntervalType`
+  - Affects admin responses that include cost plan or subscription interval information
+
+### Added
+
+- **2026-03-03** - Multi-interval VM renewal support
+  - `POST /api/v1/vm/{id}/renew` — Accepts optional `intervals` query parameter to pre-pay multiple billing periods at once
+  - `POST /api/admin/v1/vms/{id}/renew` — Same `intervals` support in admin renewal endpoint
+
 ## [v0.2.0] - 2026-02-22
 
 ### Changed

docs/agents/api-guidelines.md

@@ -5,6 +5,7 @@
 - **Always return amounts in API responses as cents / milli-sats**
 - **Never add JavaScript code examples to API documentation**
 - **Never expose secrets in admin API responses** — tokens, API keys, webhook secrets, and other sensitive values must never be returned in GET/list responses. Use sanitized structs with boolean indicators (e.g., `has_token: true`) instead of actual values.
+- **All `list_*` APIs must use database-level pagination** — never fetch all rows and paginate in Rust (skip/take). Use `LIMIT ? OFFSET ?` in the SQL query, and return a separate `COUNT(*)` or equivalent for the `total` field in the paginated response. Results must be ordered deterministically (typically `ORDER BY id DESC` or `ORDER BY created DESC`) so pagination is stable across requests.
 
 ## Documentation Requirements
 

docs/agents/migrations.md

@@ -27,3 +27,39 @@ Fix by using a completely unique timestamp:
 - Use `NOT NULL DEFAULT <value>` for new columns to avoid breaking existing rows
 - Test migrations against a database with production-like data
 - Never modify a migration that has already been applied to any environment
+
+## Notable Migrations
+
+### vm_payment → subscription_payment (2026-03-02)
+
+Two schema migrations and a data migration binary were added as part of migrating VM payments
+from the legacy `vm_payment` table to the unified `subscription_payment` table.
+
+**Schema migrations** (applied automatically by sqlx at startup):
+
+- `20260302151134_vm_subscription_link.sql` — Adds `subscription_line_item_id` to `vm`; adds
+  `interval_amount`/`interval_type` back to `subscription`; adds `time_value`/`metadata` to
+  `subscription_payment`. All new columns have safe defaults so existing rows are unaffected.
+- `20260302154256_vm_subscription_not_null.sql` — Makes `vm.subscription_line_item_id` NOT NULL
+  after the data migration has been run.
+
+**Data migration** (must be run manually before the NOT NULL migration):
+
+```bash
+cargo run --bin migrate_vm_subscriptions -- --database-url <URL>
+# Dry-run first:
+cargo run --bin migrate_vm_subscriptions -- --database-url <URL> --dry-run
+```
+
+The binary iterates all VMs that do not yet have a `subscription_line_item_id` set, creates a
+`subscription` + `subscription_line_item` (type `VmRenewal`) for each, and links the VM. It is
+idempotent — VMs that already have a subscription are skipped.
+
+**Finalization** (after production verification — do not run until confirmed):
+
+Once the data migration has been verified in production and all new VMs are going through the
+subscription path, `vm_payment` can be dropped:
+
+```sql
+DROP TABLE vm_payment;
+```

lnvps_api/src/api/ip_space.rs

@@ -23,23 +23,16 @@ async fn v1_list_ip_space(
     let limit = q.limit.unwrap_or(50).min(100);
     let offset = q.offset.unwrap_or(0);
 
-    // Get all available IP spaces
-    let all_spaces = this.db.list_available_ip_space().await?;
-
-    // Filter to only show available ones (not reserved)
-    let available_spaces: Vec<_> = all_spaces
-        .into_iter()
-        .filter(|space| space.is_available && !space.is_reserved)
-        .collect();
-
-    let total = available_spaces.len() as u64;
-
-    // Paginate
-    let paginated_spaces: Vec<_> = available_spaces
-        .into_iter()
-        .skip(offset as usize)
-        .take(limit as usize)
-        .collect();
+    let (paginated_spaces, total) = this
+        .db
+        .list_available_ip_space_paginated(
+            Some(true),  // is_available = true
+            Some(false), // is_reserved = false
+            None,
+            limit,
+            offset,
+        )
+        .await?;
 
     // Convert to API format with pricing
     let mut ip_spaces = Vec::new();

lnvps_api/src/api/legal.rs

@@ -228,22 +228,17 @@ async fn v1_generate_lir_agreement_from_subscription(
         .map(|li| {
             let resource_type = match li.subscription_type {
                 lnvps_db::SubscriptionType::IpRange => {
-                    // Try to extract IP range info from configuration
                     li.configuration
                         .as_ref()
                         .and_then(|cfg| cfg.get("cidr").and_then(|c| c.as_str()))
-                        .map(|cidr| {
-                            if cidr.contains(':') {
-                                "IPv6 PI"
-                            } else {
-                                "IPv4 PI"
-                            }
-                        })
+                        .map(|cidr| if cidr.contains(':') { "IPv6 PI" } else { "IPv4 PI" })
                         .unwrap_or("IP Range")
                         .to_string()
                 }
                 lnvps_db::SubscriptionType::AsnSponsoring => "AS Number".to_string(),
                 lnvps_db::SubscriptionType::DnsHosting => "DNS Hosting".to_string(),
+                lnvps_db::SubscriptionType::VmRenewal => "VM Renewal".to_string(),
+                lnvps_db::SubscriptionType::VmUpgrade => "VM Upgrade".to_string(),
             };
 
             let quantity = li

lnvps_api/src/api/model.rs

@@ -252,6 +252,75 @@ impl ApiInvoiceItem {
             payment.time_value,
         )
     }
+
+    /// Creates a formatted invoice item from a SubscriptionPayment
+    pub fn from_subscription_payment(
+        payment: &lnvps_db::SubscriptionPayment,
+    ) -> Result<Self, anyhow::Error> {
+        Self::from_payment_data(
+            payment.amount,
+            payment.tax,
+            payment.processing_fee,
+            &payment.currency,
+            payment.time_value.unwrap_or(0),
+        )
+    }
+}
+
+impl ApiVmPayment {
+    /// Convert a `SubscriptionPayment` to an `ApiVmPayment`.
+    /// The `vm_id` must be provided because `SubscriptionPayment` only knows the subscription.
+    pub fn from_subscription_payment(
+        value: lnvps_db::SubscriptionPayment,
+        vm_id: u64,
+    ) -> Self {
+        let upgrade_params = value
+            .metadata
+            .as_ref()
+            .map(|m| serde_json::to_string(m).unwrap_or_default());
+        let is_upgrade =
+            value.payment_type == lnvps_db::SubscriptionPaymentType::Upgrade;
+        let data = match &value.payment_method {
+            PaymentMethod::Lightning => ApiPaymentData::Lightning(value.external_data.into()),
+            PaymentMethod::Revolut => {
+                #[derive(Deserialize)]
+                struct RevolutData {
+                    pub token: String,
+                }
+                let data: RevolutData =
+                    serde_json::from_str(value.external_data.as_str()).unwrap();
+                ApiPaymentData::Revolut { token: data.token }
+            }
+            PaymentMethod::Paypal => todo!(),
+            PaymentMethod::Stripe => {
+                #[derive(Deserialize)]
+                struct StripeData {
+                    pub session_id: String,
+                }
+                let data: StripeData =
+                    serde_json::from_str(value.external_data.as_str()).unwrap();
+                ApiPaymentData::Stripe {
+                    session_id: data.session_id,
+                }
+            }
+        };
+        Self {
+            id: hex::encode(&value.id),
+            vm_id,
+            created: value.created,
+            expires: value.expires,
+            amount: value.amount,
+            tax: value.tax,
+            processing_fee: value.processing_fee,
+            currency: value.currency,
+            is_paid: value.is_paid,
+            paid_at: value.paid_at,
+            time: value.time_value.unwrap_or(0),
+            is_upgrade,
+            upgrade_params,
+            data,
+        }
+    }
 }
 
 impl From<lnvps_db::VmPayment> for ApiVmPayment {
@@ -621,13 +690,15 @@ pub struct ApiSubscriptionPayment {
 pub enum ApiSubscriptionPaymentType {
     Purchase,
     Renewal,
+    Upgrade,
 }
 
 impl From<lnvps_db::SubscriptionPaymentType> for ApiSubscriptionPaymentType {
     fn from(payment_type: lnvps_db::SubscriptionPaymentType) -> Self {
         match payment_type {
             lnvps_db::SubscriptionPaymentType::Purchase => ApiSubscriptionPaymentType::Purchase,
             lnvps_db::SubscriptionPaymentType::Renewal => ApiSubscriptionPaymentType::Renewal,
+            lnvps_db::SubscriptionPaymentType::Upgrade => ApiSubscriptionPaymentType::Upgrade,
         }
     }
 }