Skip to content

Implement delivery creation with auto-incrementing IDs #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tybravo merged 1 commit into from
Apr 24, 2026
Merged

Implement delivery creation with auto-incrementing IDs #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions contracts/delivery_contract/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,20 @@ pub struct DeliveryMetadata {
#[contracttype]
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct DeliveryRecord {
pub delivery_id: DeliveryId,
pub sender: Address,
pub driver: Option<Address>,
pub status: DeliveryStatus,
pub metadata: DeliveryMetadata,
pub created_at: u64,
pub delivered_at: Option<u64>,
}

#[contracttype]
#[derive(Clone)]
pub enum DataKey {
Delivery(DeliveryId),
DeliveryCounter,
Admin,
EscrowContract,
}
Expand All @@ -60,16 +63,37 @@ impl DeliveryContract {
env.storage().instance().set(&DataKey::EscrowContract, &escrow);
}

pub fn create_delivery(env: Env, sender: Address, recipient: Address, delivery_id: DeliveryId) {
pub fn create_delivery(env: Env, sender: Address, metadata: DeliveryMetadata) -> DeliveryId {
sender.require_auth();

let mut counter: u64 = env.storage().persistent().get(&DataKey::DeliveryCounter).unwrap_or(0);
counter += 1;
env.storage().persistent().set(&DataKey::DeliveryCounter, &counter);

let delivery_id = counter;

let record = DeliveryRecord {
delivery_id,
sender: sender.clone(),
driver: None,
status: DeliveryStatus::Pending,
metadata: DeliveryMetadata { recipient },
metadata,
created_at: env.ledger().timestamp(),
delivered_at: None,
};
env.storage().persistent().set(&DataKey::Delivery(delivery_id), &record);

let key = DataKey::Delivery(delivery_id);
env.storage().persistent().set(&key, &record);

// Extend TTL
env.storage().persistent().extend_ttl(&key, 518400, 518400);

env.events().publish(
(soroban_sdk::Symbol::new(&env, "delivery_created"),),
(delivery_id, sender),
);

delivery_id
}

pub fn cancel_delivery(
Expand Down
101 changes: 68 additions & 33 deletions contracts/delivery_contract/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ fn setup_test() -> (Env, DeliveryContractClient<'static>, Address, Address, Addr
#[test]
fn test_successful_assignment_by_admin() {
let (env, client, admin, driver, _) = setup_test();

let delivery_id = 1;
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };
let delivery_id = client.create_delivery(&sender, &metadata);

client.assign_driver(&admin, &delivery_id, &driver);

Expand Down Expand Up @@ -62,11 +61,10 @@ fn test_successful_assignment_by_admin() {
#[test]
fn test_successful_self_assignment_by_driver() {
let (env, client, _, driver, _) = setup_test();

let delivery_id = 2;
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };
let delivery_id = client.create_delivery(&sender, &metadata);

client.assign_driver(&driver, &delivery_id, &driver);

Expand All @@ -86,11 +84,10 @@ fn test_successful_self_assignment_by_driver() {
#[should_panic(expected = "NotAuthorized")]
fn test_unauthorized_caller_rejected() {
let (env, client, _, driver, unauthorized) = setup_test();

let delivery_id = 3;
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };
let delivery_id = client.create_delivery(&sender, &metadata);

client.assign_driver(&unauthorized, &delivery_id, &driver);
}
Expand All @@ -99,11 +96,10 @@ fn test_unauthorized_caller_rejected() {
#[should_panic(expected = "InvalidState")]
fn test_assignment_when_status_not_pending() {
let (env, client, admin, driver, _) = setup_test();

let delivery_id = 4;
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };
let delivery_id = client.create_delivery(&sender, &metadata);

// First assignment changes status to Active
client.assign_driver(&admin, &delivery_id, &driver);
Expand Down Expand Up @@ -132,11 +128,10 @@ fn test_cancel_delivery_pending() {
let (env, client, admin, _, _) = setup_test();
let escrow_id = env.register(MockEscrow, ());
client.set_escrow_contract(&admin, &escrow_id);

let delivery_id = 10;
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };
let delivery_id = client.create_delivery(&sender, &metadata);

client.cancel_delivery(&sender, &delivery_id);

Expand All @@ -149,24 +144,17 @@ fn test_cancel_delivery_pending() {
});

assert_eq!(delivery.status, DeliveryStatus::Cancelled);

let events = env.events().all();
std::println!("EVENTS LEN: {}", events.len());
let last_event = events.last().unwrap();
let topic0: Symbol = Symbol::try_from_val(&env, &last_event.1.get(0).unwrap()).unwrap();
assert_eq!(topic0, Symbol::new(&env, "delivery_cancelled"));
}

#[test]
fn test_cancel_delivery_active() {
let (env, client, admin, driver, _) = setup_test();
let escrow_id = env.register(MockEscrow, ());
client.set_escrow_contract(&admin, &escrow_id);

let delivery_id = 11;
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };
let delivery_id = client.create_delivery(&sender, &metadata);
client.assign_driver(&admin, &delivery_id, &driver);

client.cancel_delivery(&sender, &delivery_id);
Expand All @@ -188,11 +176,10 @@ fn test_cancel_delivery_unauthorized() {
let (env, client, admin, _, unauthorized) = setup_test();
let escrow_id = env.register(MockEscrow, ());
client.set_escrow_contract(&admin, &escrow_id);

let delivery_id = 12;
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };
let delivery_id = client.create_delivery(&sender, &metadata);

client.cancel_delivery(&unauthorized, &delivery_id);
}
Expand All @@ -203,11 +190,10 @@ fn test_cancel_delivery_invalid_state() {
let (env, client, admin, _, _) = setup_test();
let escrow_id = env.register(MockEscrow, ());
client.set_escrow_contract(&admin, &escrow_id);

let delivery_id = 13;
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };
let delivery_id = client.create_delivery(&sender, &metadata);

client.cancel_delivery(&sender, &delivery_id); // Now Cancelled

Expand All @@ -221,14 +207,63 @@ fn test_cancel_delivery_escrow_failure() {
let (env, client, admin, _, _) = setup_test();
let escrow_id = env.register(MockEscrow, ());
client.set_escrow_contract(&admin, &escrow_id);

let delivery_id = 999; // trigger failure in mock
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
client.create_delivery(&sender, &recipient, &delivery_id);
let metadata = DeliveryMetadata { recipient: recipient.clone() };

env.as_contract(&client.address, || {
env.storage().persistent().set(&DataKey::DeliveryCounter, &998u64);
});

let delivery_id = client.create_delivery(&sender, &metadata);

client.cancel_delivery(&sender, &delivery_id);
}




#[test]
fn test_create_delivery_success_and_storage() {
let (env, client, _, _, _) = setup_test();
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
let metadata = DeliveryMetadata { recipient: recipient.clone() };

// 1. Successful creation returns a delivery_id
let delivery_id = client.create_delivery(&sender, &metadata);
assert_eq!(delivery_id, 1);

// 3. DeliveryRecord stored correctly
let delivery: DeliveryRecord = env
.as_contract(&client.address, || {
env.storage()
.persistent()
.get(&DataKey::Delivery(delivery_id))
.unwrap()
});

assert_eq!(delivery.delivery_id, delivery_id);
assert_eq!(delivery.sender, sender);
assert_eq!(delivery.driver, None);
assert_eq!(delivery.status, DeliveryStatus::Pending);
assert_eq!(delivery.metadata.recipient, recipient);
}

#[test]
fn test_create_delivery_incrementing_ids_and_persistence() {
let (env, client, _, _, _) = setup_test();
let sender = Address::generate(&env);
let recipient = Address::generate(&env);
let metadata = DeliveryMetadata { recipient: recipient.clone() };

// 2. Multiple calls produce unique, incrementing IDs
// 4. Counter persists correctly across calls
let id1 = client.create_delivery(&sender, &metadata);
let id2 = client.create_delivery(&sender, &metadata);
let id3 = client.create_delivery(&sender, &metadata);

assert_eq!(id1, 1);
assert_eq!(id2, 2);
assert_eq!(id3, 3);
}
Loading