Skip to content
Merged
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
6 changes: 3 additions & 3 deletions aikido_zen/context/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ def set_user(user):
cache = thread_cache.get_cache()
if cache:
cache.users.add_user(
user_id=validated_user["id"],
user_name=validated_user["name"],
user_ip=validated_user["lastIpAddress"],
user_id=validated_user.get("id"),
user_name=validated_user.get("name"),
user_ip=validated_user.get("lastIpAddress"),
current_time=t.get_unixtime_ms(),
)

Expand Down
20 changes: 20 additions & 0 deletions aikido_zen/context/users_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,26 @@ def test_set_valid_user():
assert user_1["firstSeenAt"] == user_1["lastSeenAt"]


def test_set_valid_user_without_name():
context1 = set_context_and_lifecycle()
assert context1.user is None

user = {"id": 456}
set_user(user)

assert context1.user == {
"id": "456",
"lastIpAddress": "198.51.100.23",
}

assert len(get_cache().users.as_array()) == 1
user_1 = get_cache().users.as_array()[0]
assert user_1["id"] == "456"
assert user_1["lastIpAddress"] == "198.51.100.23"
assert user_1["name"] is None
assert user_1["firstSeenAt"] == user_1["lastSeenAt"]


def test_re_set_valid_user():
context1 = set_context_and_lifecycle()
assert context1.user is None
Expand Down
22 changes: 22 additions & 0 deletions aikido_zen/storage/users_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,28 @@ def test_as_array_with_multiple_users(users):
assert user_array[1]["id"] == user_id_2


def test_as_array_with_multiple_users_but_one_without_name(users):
user_id_1 = "1"
user_name_1 = "Test User 1"
user_ip_1 = "127.0.0.1"
current_time_1 = datetime.now()

user_id_2 = "2"
user_name_2 = None
user_ip_2 = "192.168.1.1"
current_time_2 = datetime.now()

users.add_user(user_id_1, user_name_1, user_ip_1, current_time_1)
users.add_user(user_id_2, user_name_2, user_ip_2, current_time_2)

user_array = users.as_array()

assert len(user_array) == 2
assert user_array[0]["id"] == user_id_1
assert user_array[1]["id"] == user_id_2
assert user_array[1]["name"] is None


def test_clear_with_multiple_users(users):
user_id_1 = "1"
user_name_1 = "Test User 1"
Expand Down
Loading