Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions contracts/sorosave/src/group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ pub fn join_group(env: &Env, member: Address, group_id: u64) -> Result<(), Contr
storage::add_member_group(env, &member, group_id);

env.events()
.publish((crate::symbol_short!("grp_join"),), (group_id, member));
.publish(
(crate::symbol_short!("mem_join"),),
(group_id, member, env.ledger().timestamp(), group.members.len()),
);

Ok(())
}
Expand Down Expand Up @@ -116,7 +119,10 @@ pub fn leave_group(env: &Env, member: Address, group_id: u64) -> Result<(), Cont
storage::remove_member_group(env, &member, group_id);

env.events()
.publish((crate::symbol_short!("grp_leav"),), (group_id, member));
.publish(
(crate::symbol_short!("mem_leav"),),
(group_id, member, env.ledger().timestamp(), group.members.len()),
);

Ok(())
}
Expand Down
59 changes: 59 additions & 0 deletions contracts/sorosave/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,3 +222,62 @@ fn test_set_group_admin() {
let group = client.get_group(&group_id);
assert_eq!(group.admin, new_admin);
}

#[test]
fn test_member_join_event() {
let (env, admin, client, token) = setup_env();
let group_id = create_test_group(&env, &client, &admin, &token);

let member1 = Address::generate(&env);

// Join and verify event
client.join_group(&member1, &group_id);

let events = env.events().all();
let join_event = events.last().unwrap();

// Verify event structure: (topic, (group_id, member, timestamp, member_count))
assert!(join_event.0.contains(&symbol_short!("mem_join")));
}

#[test]
fn test_member_leave_event() {
let (env, admin, client, token) = setup_env();
let group_id = create_test_group(&env, &client, &admin, &token);

let member1 = Address::generate(&env);
client.join_group(&member1, &group_id);

// Leave and verify event
client.leave_group(&member1, &group_id);

let events = env.events().all();
let leave_event = events.last().unwrap();

// Verify event structure: (topic, (group_id, member, timestamp, member_count))
assert!(leave_event.0.contains(&symbol_short!("mem_leav")));
}

#[test]
fn test_member_count_in_events() {
let (env, admin, client, token) = setup_env();
let group_id = create_test_group(&env, &client, &admin, &token);

let member1 = Address::generate(&env);
let member2 = Address::generate(&env);

// Join member1 (count should be 2: admin + member1)
client.join_group(&member1, &group_id);
let group = client.get_group(&group_id);
assert_eq!(group.members.len(), 2);

// Join member2 (count should be 3)
client.join_group(&member2, &group_id);
let group = client.get_group(&group_id);
assert_eq!(group.members.len(), 3);

// Leave member1 (count should be 2)
client.leave_group(&member1, &group_id);
let group = client.get_group(&group_id);
assert_eq!(group.members.len(), 2);
}