Added WorkspaceAvailability and UnavailabilityReason to re-exports

Author: yusuftomilola

contracts/Cargo.lock

@@ -11,7 +11,9 @@ mod types;
 mod test;
 
 pub use errors::Error;
-pub use types::{Booking, BookingStatus, Workspace, WorkspaceType};
+pub use types::{
+    Booking, BookingStatus, UnavailabilityReason, Workspace, WorkspaceAvailability, WorkspaceType,
+};
 
 use soroban_sdk::{
     contract, contractimpl, contracttype, symbol_short, token, Address, Env, String, Vec,
@@ -130,14 +132,14 @@ impl WorkspaceBookingContract {
         name: String,
         workspace_type: WorkspaceType,
         capacity: u32,
-        hourly_rate: i128,
+        hourly_rate: u128,
     ) -> Result<(), Error> {
         Self::require_admin(&env, &caller)?;
 
         if capacity == 0 {
             return Err(Error::InvalidCapacity);
         }
-        if hourly_rate <= 0 {
+        if hourly_rate == 0 {
             return Err(Error::InvalidRate);
         }
         if env
@@ -154,7 +156,7 @@ impl WorkspaceBookingContract {
             workspace_type: workspace_type.clone(),
             capacity,
             hourly_rate,
-            is_available: true,
+            availability: WorkspaceAvailability::Available,
             created_at: env.ledger().timestamp(),
         };
 
@@ -193,7 +195,11 @@ impl WorkspaceBookingContract {
             .get(&DataKey::Workspace(workspace_id.clone()))
             .ok_or(Error::WorkspaceNotFound)?;
 
-        workspace.is_available = is_available;
+        workspace.availability = if is_available {
+            WorkspaceAvailability::Available
+        } else {
+            WorkspaceAvailability::Unavailable(UnavailabilityReason::AdminHold)
+        };
         env.storage()
             .persistent()
             .set(&DataKey::Workspace(workspace_id.clone()), &workspace);
@@ -208,11 +214,11 @@ impl WorkspaceBookingContract {
         env: Env,
         caller: Address,
         workspace_id: String,
-        hourly_rate: i128,
+        hourly_rate: u128,
     ) -> Result<(), Error> {
         Self::require_admin(&env, &caller)?;
 
-        if hourly_rate <= 0 {
+        if hourly_rate == 0 {
             return Err(Error::InvalidRate);
         }
 
@@ -274,7 +280,7 @@ impl WorkspaceBookingContract {
             .get(&DataKey::Workspace(workspace_id.clone()))
             .ok_or(Error::WorkspaceNotFound)?;
 
-        if !workspace.is_available {
+        if workspace.availability != WorkspaceAvailability::Available {
             return Err(Error::WorkspaceUnavailable);
         }
 
@@ -285,14 +291,14 @@ impl WorkspaceBookingContract {
         // Cost = hourly_rate × ⌈duration_seconds / 3600⌉
         let duration_secs = end_time - start_time;
         let duration_hours = duration_secs.div_ceil(3600);
-        let amount: i128 = workspace.hourly_rate * duration_hours as i128;
+        let amount: u128 = workspace.hourly_rate * duration_hours as u128;
 
         // Collect payment from member → contract
         let payment_token = Self::get_payment_token(&env)?;
         token::Client::new(&env, &payment_token).transfer(
             &member,
             env.current_contract_address(),
-            &amount,
+            &(amount as i128),
         );
 
         let booking = Booking {
@@ -304,6 +310,8 @@ impl WorkspaceBookingContract {
             status: BookingStatus::Active,
             amount_paid: amount,
             created_at: now,
+            cancelled_at: None,
+            completed_at: None,
         };
 
         env.storage()
@@ -365,10 +373,11 @@ impl WorkspaceBookingContract {
         token::Client::new(&env, &payment_token).transfer(
             &env.current_contract_address(),
             &booking.member,
-            &booking.amount_paid,
+            &(booking.amount_paid as i128),
         );
 
         booking.status = BookingStatus::Cancelled;
+        booking.cancelled_at = Some(env.ledger().timestamp());
         env.storage()
             .persistent()
             .set(&DataKey::Booking(booking_id.clone()), &booking);
@@ -397,6 +406,7 @@ impl WorkspaceBookingContract {
         }
 
         booking.status = BookingStatus::Completed;
+        booking.completed_at = Some(env.ledger().timestamp());
         env.storage()
             .persistent()
             .set(&DataKey::Booking(booking_id.clone()), &booking);
@@ -468,7 +478,7 @@ impl WorkspaceBookingContract {
             None => return false,
         };
 
-        if !workspace.is_available {
+        if workspace.availability != WorkspaceAvailability::Available {
             return false;
         }
 

contracts/workspace_booking/src/lib.rs

@@ -90,8 +90,8 @@ fn test_register_workspace_success() {
     assert_eq!(ws.name, String::from_str(&env, "Hot Desk A"));
     assert_eq!(ws.workspace_type, WorkspaceType::HotDesk);
     assert_eq!(ws.capacity, 1u32);
-    assert_eq!(ws.hourly_rate, 500i128);
-    assert!(ws.is_available);
+    assert_eq!(ws.hourly_rate, 500u128);
+    assert_eq!(ws.availability, WorkspaceAvailability::Available);
 
     let all = client.get_all_workspaces();
     assert_eq!(all.len(), 1u32);
@@ -192,7 +192,7 @@ fn test_book_workspace_success() {
     assert_eq!(booking.workspace_id, String::from_str(&env, "ws-001"));
     assert_eq!(booking.member, member);
     assert_eq!(booking.status, BookingStatus::Active);
-    assert_eq!(booking.amount_paid, 2_000i128); // 2 hrs × 1000
+    assert_eq!(booking.amount_paid, 2_000u128); // 2 hrs × 1000
 
     // Member balance should have decreased
     let balance = TokenClient::new(&env, &token_address).balance(&member);
@@ -582,7 +582,7 @@ fn test_hourly_rate_update_applies_to_future_bookings() {
     client.set_workspace_rate(&admin, &String::from_str(&env, "ws-001"), &2_000i128);
 
     let ws = client.get_workspace(&String::from_str(&env, "ws-001"));
-    assert_eq!(ws.hourly_rate, 2_000i128);
+    assert_eq!(ws.hourly_rate, 2_000u128);
 
     let now = env.ledger().timestamp();
     let start = now + 60;
@@ -597,5 +597,5 @@ fn test_hourly_rate_update_applies_to_future_bookings() {
     );
 
     let booking = client.get_booking(&String::from_str(&env, "bk-001"));
-    assert_eq!(booking.amount_paid, 2_000i128); // new rate applied
+    assert_eq!(booking.amount_paid, 2_000u128); // new rate applied
 }

contracts/workspace_booking/src/test.rs

@@ -1,9 +1,11 @@
 use soroban_sdk::{contracttype, Address, String};
 
 /// Maximum allowed length for workspace identifiers.
+#[allow(dead_code)]
 pub const MAX_ID_LEN: u32 = 64;
 
 /// Maximum allowed length for workspace names.
+#[allow(dead_code)]
 pub const MAX_NAME_LEN: u32 = 128;
 
 /// Category of workspace being registered.