tfgrid/projectmycelium
11
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: rename farmer to resource provider across codebase and update terminology

Browse Source
This commit is contained in:
mik-tf
2025-09-06 23:27:14 -04:00
parent bf273102cb
commit c8e28cf8ed
34 changed files with 511 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/services/user_persistence.rs
View File

@@ -46,10 +46,10 @@ pub struct UserPersistentData {
pub deleted: Option<bool>,
pub deleted_at: Option<String>,
pub deletion_reason: Option<String>,
// Farmer-specific data
// ResourceProvider-specific data
pub nodes: Vec<crate::models::user::FarmNode>,
pub farmer_earnings: Vec<crate::models::user::EarningsRecord>,
pub farmer_settings: Option<crate::models::user::FarmerSettings>,
pub resource_provider_earnings: Vec<crate::models::user::EarningsRecord>,
pub resource_provider_settings: Option<crate::models::user::FarmerSettings>,
#[serde(default)]
pub slice_products: Vec<crate::models::product::Product>,
// User activity tracking
@@ -63,10 +63,10 @@ pub struct UserPersistentData {
#[serde(default)]
pub active_product_rentals: Vec<ProductRental>,
#[serde(default)]
pub farmer_rental_earnings: Vec<crate::models::user::FarmerRentalEarning>,
pub resource_provider_rental_earnings: Vec<crate::models::user::FarmerRentalEarning>,
#[serde(default)]
pub node_rentals: Vec<crate::models::user::NodeRental>,
// Node groups for farmer organization
// Node groups for resource_provider organization
#[serde(default)]
pub node_groups: Vec<crate::models::user::NodeGroup>,
// NEW: Slice rental tracking for users
@@ -142,15 +142,15 @@ impl Default for UserPersistentData {
deleted_at: None,
deletion_reason: None,
nodes: Vec::new(),
farmer_earnings: Vec::new(),
farmer_settings: None,
resource_provider_earnings: Vec::new(),
resource_provider_settings: None,
slice_products: Vec::new(),
user_activities: Vec::new(),
user_preferences: None,
usage_statistics: None,
orders: Vec::new(),
active_product_rentals: Vec::new(),
farmer_rental_earnings: Vec::new(),
resource_provider_rental_earnings: Vec::new(),
node_rentals: Vec::new(),
node_groups: Vec::new(),
slice_rentals: Vec::new(),
@@ -1306,19 +1306,19 @@ impl UserPersistence {
}
}
/// Get farmer earnings for a user
pub fn get_farmer_earnings(user_email: &str) -> Vec<crate::models::user::EarningsRecord> {
/// Get resource_provider earnings for a user
pub fn get_resource_provider_earnings(user_email: &str) -> Vec<crate::models::user::EarningsRecord> {
if let Some(data) = Self::load_user_data(user_email) {
data.farmer_earnings
data.resource_provider_earnings
} else {
Vec::default()
}
}
/// Get farmer settings for a user
pub fn get_farmer_settings(user_email: &str) -> Option<crate::models::user::FarmerSettings> {
/// Get resource_provider settings for a user
pub fn get_resource_provider_settings(user_email: &str) -> Option<crate::models::user::FarmerSettings> {
if let Some(data) = Self::load_user_data(user_email) {
data.farmer_settings
data.resource_provider_settings
} else {
None
}