fix: ensure now & expired are exactly the same

lnvps_api/invoice.html

@@ -98,6 +98,7 @@
             <div>{{user.state}}</div>
             <div>{{user.postcode}}</div>
             <div>{{user.country}}</div>
+            <div>{{user.country_code}}</div>
             <div>{{user.tax_id}}</div>
         </div>
         {{#company}}
@@ -110,6 +111,7 @@
             <div>{{company.state}}</div>
             <div>{{company.postcode}}</div>
             <div>{{company.country}}</div>
+            <div>{{company.country_code}}</div>
             <div>{{company.tax_id}}</div>
         </div>
         {{/company}}

lnvps_api/src/exchange.rs

@@ -1,6 +1,6 @@
 use anyhow::{anyhow, ensure, Result};
 use lnvps_db::async_trait;
-use log::info;
+use log::{info, trace};
 use rocket::serde::Deserialize;
 use schemars::JsonSchema;
 use serde::Serialize;
@@ -210,7 +210,7 @@ impl ExchangeRateService for DefaultRateCache {
 
     async fn set_rate(&self, ticker: Ticker, amount: f32) {
         let mut cache = self.cache.write().await;
-        info!("{}: {}", &ticker, amount);
+        trace!("{}: {}", &ticker, amount);
         cache.insert(ticker, amount);
     }
 

lnvps_api/src/provisioner/lnvps.rs

@@ -459,6 +459,7 @@ impl LNVpsProvisioner {
         // insert custom templates
         let template_id = self.db.insert_custom_vm_template(&template).await?;
 
+        let now = Utc::now();
         let mut new_vm = Vm {
             id: 0,
             host_id: host.host.id,
@@ -467,8 +468,8 @@ impl LNVpsProvisioner {
             template_id: None,
             custom_template_id: Some(template_id),
             ssh_key_id: ssh_key.id,
-            created: Utc::now(),
+            created: now,
-            expires: Utc::now(),
+            expires: now,
             disk_id: pick_disk.disk.id,
             mac_address: "ff:ff:ff:ff:ff:ff".to_string(),
             deleted: false,

lnvps_api/src/worker.rs

@@ -196,7 +196,8 @@ impl Worker {
             self.check_vm(vm).await?;
 
             // delete vm if not paid (in new state)
-            if vm.expires < Utc::now().sub(Days::new(1)) {
+            if vm.created == vm.expires && !vm.deleted && vm.expires < Utc::now().sub(Days::new(1))
+            {
                 info!("Deleting unpaid VM {}", vm.id);
                 self.provisioner.delete_vm(vm.id).await?;
             }