feat: more ids returned on endpoints

Issue: #23

test/test_iam.py

@@ -221,10 +221,18 @@ async def test_get_group_users_success(default_client: AsyncClient):
 
 	user = data["users"][0]
 	assert user["id"] == 1
-	assert user["first_name"] == "Admin"
-	assert user["last_name"] == "Test"
 	assert user["email"] == "admin@test.com"
 
+	assert "group" in data
+	assert isinstance(data["group"], dict)
+	assert data["group"]["id"] == 1
+	assert data["group"]["name"] == "Test Group"
+
+	assert "organisation" in data
+	assert isinstance(data["organisation"], dict)
+	assert data["organisation"]["id"] == 1
+	assert data["organisation"]["name"] == "Test Org"
+
 
 @pytest.mark.parametrize(
 	"query, expected_status", generate_query_and_status(["group_id", "org_id"])

test/test_organisation.py

@@ -265,9 +265,16 @@ async def test_post_org_user_success(default_client: AsyncClient, db_session):
 
 	data = resp.json()
 
+	assert "organisation" in data
+	assert isinstance(data["organisation"], dict)
+	assert data["organisation"]["id"] == 1
+	assert data["organisation"]["name"] == "Test Org"
+
 	assert "users" in data
 	assert isinstance(data["users"], list)
-	assert "user@test.org" in data["users"]
+	assert (
+		len([user for user in data["users"] if user["email"] == "user@test.org"]) == 1
+	)
 
 
 @pytest.mark.parametrize(
@@ -386,9 +393,17 @@ async def test_get_org_groups_success(default_client: AsyncClient):
 
 	data = resp.json()
 
+	assert "organisation" in data
+	assert isinstance(data["organisation"], dict)
+	assert data["organisation"]["id"] == 1
+	assert data["organisation"]["name"] == "Test Org"
+
 	assert "groups" in data
 	assert isinstance(data["groups"], list)
-	assert "Test Group" in data["groups"]
+	group = data["groups"][0]
+	assert isinstance(group, dict)
+	assert group["id"] == 1
+	assert group["name"] == "Test Group"
 
 
 @pytest.mark.parametrize(