Add route for removing a single user from a group

Author: ml-evs

pydatalab/src/pydatalab/routes/v0_1/admin.py

@@ -452,13 +452,38 @@ def add_user_to_group(group_immutable_id: str):
         {"$addToSet": {"groups": {"immutable_id": ObjectId(group_immutable_id)}}},
     )
 
-    if update_user.modified_count == 1:
-        return jsonify({"status": "success", "message": "User added to group."}), 200
+    if update_user.matched_count == 0:
+        raise BadRequest("Unable to add user to group: user does not exist.")
 
-    if not update_user.modified_count == 1:
-        if update_user.matched_count == 0:
-            raise BadRequest("Unable to add user to group: user does not exist.")
-        if update_user.matched_count == 1:
-            return jsonify({"status": "success", "message": "User already in group."}), 304
+    if update_user.modified_count == 0:
+        return jsonify({"status": "success", "message": "User already in group."}), 304
 
-    raise BadRequest("Unable to add user to group.")
+    return jsonify({"status": "success", "message": "User added to group."}), 200
+
+
+@ADMIN.route("/groups/<group_immutable_id>/members/<user_id>", methods=["DELETE"])
+def remove_user_from_group(group_immutable_id: str, user_id: str):
+    group_exists = flask_mongo.db.groups.find_one(
+        {"_id": ObjectId(group_immutable_id)},
+    )
+    if not group_exists:
+        raise NotFound("Group does not exist.")
+
+    update_user = flask_mongo.db.users.update_one(
+        {"_id": ObjectId(user_id)},
+        {"$pull": {"groups": {"immutable_id": ObjectId(group_immutable_id)}}},
+    )
+
+    if update_user.matched_count == 0:
+        raise BadRequest("Unable to remove user from group: user does not exist.")
+
+    # Also remove user from group's managers list if they are a manager
+    flask_mongo.db.groups.update_one(
+        {"_id": ObjectId(group_immutable_id)},
+        {"$pull": {"managers": ObjectId(user_id)}},
+    )
+
+    if update_user.modified_count == 0:
+        return jsonify({"status": "success", "message": "User was not in group."}), 304
+
+    return jsonify({"status": "success", "message": "User removed from group."}), 200

pydatalab/tests/server/test_users.py

@@ -221,3 +221,13 @@ def test_groups(
     resp = admin_client.patch(f"/groups/{group_immutable_id}", json=new_details)
     assert resp.status_code == 200
     assert database.groups.find_one({"group_id": new_details["group_id"]}) is not None
+
+    # Now remove the user from the group and make sure they are also removed from the managers list
+    resp = admin_client.delete(f"/groups/{group_immutable_id}/members/{another_user_id}")
+
+    assert resp.status_code == 200
+    user_groups = database.users.find_one({"_id": ObjectId(another_user_id)})["groups"]
+    assert len(user_groups) == 1
+
+    managers = database.groups.find_one({"_id": group_immutable_id})["managers"]
+    assert ObjectId(another_user_id) not in managers