Fix linter issues in user management (#54)

Author: lavjain

components/user_management/src/routes/discipline_association_group_test.py

@@ -24,11 +24,11 @@
 from routes.discipline_association_group import router
 from testing.test_config import API_URL
 from schemas.schema_examples import (BASIC_ASSOCIATION_GROUP_EXAMPLE,
-                                      BASIC_USER_MODEL_EXAMPLE,
-                                      TEST_CURRICULUM_PATHWAY,
-                                      FULL_DISCIPLINE_ASSOCIATION_GROUP_EXAMPLE,
-                                      FULL_USER_MODEL_EXAMPLE,
-                                      BASIC_CURRICULUM_PATHWAY_EXAMPLE)
+                                     BASIC_USER_MODEL_EXAMPLE,
+                                     TEST_CURRICULUM_PATHWAY,
+                                     FULL_DISCIPLINE_ASSOCIATION_GROUP_EXAMPLE,
+                                     FULL_USER_MODEL_EXAMPLE,
+                                     BASIC_CURRICULUM_PATHWAY_EXAMPLE)
 from common.models import AssociationGroup, UserGroup, User, CurriculumPathway
 from common.testing.firestore_emulator import (firestore_emulator,
                                                clean_firestore)
@@ -62,11 +62,11 @@ def test_get_association_group(clean_firestore):
   json_response = resp.json()
 
   assert resp.status_code == 200, "Status 200"
-  assert json_response["data"]["association_type"] == \
-          association_group_dict["association_type"]
+  assert (json_response["data"]["association_type"] ==
+          association_group_dict["association_type"])
   assert json_response["data"]["name"] == association_group_dict["name"]
-  assert json_response["data"]["description"] == \
-          association_group_dict["description"]
+  assert (json_response["data"]["description"] ==
+          association_group_dict["description"])
 
 
 def test_get_association_group_negative(clean_firestore):
@@ -198,8 +198,9 @@ def test_post_association_group_negative(clean_firestore):
 
   assert post_resp_json.get("success") is False, "Success not False"
   assert post_resp.status_code == 409
-  assert post_resp_json.get("message") == \
-    "AssociationGroup with the given name: Association Group1 already exists"
+  assert (post_resp_json.get("message") ==
+          "AssociationGroup with the given name: "
+          "Association Group1 already exists")
 
 
 def test_update_association_group(clean_firestore):
@@ -221,8 +222,8 @@ def test_update_association_group(clean_firestore):
   update_response = resp.json()
 
   assert update_response.get("success") is True, "Success not true"
-  assert update_response["message"] == \
-                "Successfully updated the association group"
+  assert (update_response["message"] ==
+          "Successfully updated the association group")
   assert update_response["data"]["name"] == "new group name"
   assert update_response["data"]["description"] == "new group description"
 
@@ -257,8 +258,9 @@ def test_update_association_group_negative_1(clean_firestore):
 
   assert update_response.get("success") is False, "Success not False"
   assert resp.status_code == 409
-  assert update_response.get("message") == \
-    "AssociationGroup with the given name: Association Group already exists"
+  assert (update_response.get("message") ==
+          "AssociationGroup with the given name: "
+          "Association Group already exists")
 
 
 def test_update_association_group_negative_2(clean_firestore):
@@ -318,7 +320,6 @@ def test_delete_association_group(clean_firestore):
   association_group.uuid = association_group.id
   association_group.update()
 
-
   learner_association_group_dict = {
       **BASIC_ASSOCIATION_GROUP_EXAMPLE, "association_type": "learner"
   }
@@ -350,7 +351,7 @@ def test_delete_association_group(clean_firestore):
   assert resp.status_code == 200, "Status code not 200"
   assert del_json_response == expected_data, "Expected response not same"
 
-  get_learner_association_group =  AssociationGroup.find_by_uuid(
+  get_learner_association_group = AssociationGroup.find_by_uuid(
                                   learner_association_group_uuid)
   assert get_learner_association_group.associations["instructors"] == []
 
@@ -405,7 +406,7 @@ def test_add_discipline_to_discipline_association_group(clean_firestore):
   # test for ResourceNotFound
   url = f"{api_url}/wrong_id/discipline/add"
   resp = client_with_emulator.post(url, json=request_body)
-  json_response = resp.json()["data"]
+  _ = resp.json()["data"]
   assert resp.status_code == 404, f"Status Code = {resp.status_code}"
 
   # test for ValidationError
@@ -446,13 +447,13 @@ def test_remove_discipline_from_discipline_association_group(clean_firestore):
   resp = client_with_emulator.post(url, json=request_body)
   json_response = resp.json()["data"]
   assert resp.status_code == 200, f"Status {resp.status_code}"
-  assert json_response["associations"]["curriculum_pathways"] == [], \
-  "Associations not same"
+  assert (json_response["associations"]["curriculum_pathways"] ==
+          []), "Associations not same"
 
   # test for ResourceNotFound
   url = f"{api_url}/wrong_id/discipline/remove"
   resp = client_with_emulator.post(url, json=request_body)
-  json_response = resp.json()["data"]
+  _ = resp.json()["data"]
   assert resp.status_code == 404, f"Status Code = {resp.status_code}"
 
   # test for ValidationError
@@ -488,7 +489,9 @@ def create_user_and_group(user_group_name, user_type):
   user_dict.update()
   user_id2 = user_dict.user_id
 
-  GROUP_EXAMPLE = {"name": user_group_name, "users": [user_id1, user_id2], "description" : "example group"}
+  GROUP_EXAMPLE = {"name": user_group_name,
+                   "users": [user_id1, user_id2],
+                   "description": "example group"}
 
   group_dict = UserGroup.from_dict({**GROUP_EXAMPLE})
   group_dict.uuid = ""
@@ -540,7 +543,7 @@ def test_remove_user_from_discipline_association_group(clean_firestore):
   assert len(post_resp_json.get("data").get("users")) == 2
   assert post_resp_json["data"]["users"][0]["user"] in add_users["users"]
 
-  # Remove user from the assication group
+  # Remove user from the association group
   url = api_url + f"/{uuid}/user/remove"
   remove_user = {"user": add_users["users"][0]}
   post_resp = client_with_emulator.post(url, json=remove_user)
@@ -594,8 +597,8 @@ def test_update_association_status(clean_firestore):
   update_response = resp.json()
 
   assert update_response.get("success") is True, "Success not true"
-  assert update_response["message"] == \
-                "Successfully updated the association group"
+  assert (update_response["message"] ==
+          "Successfully updated the association group")
   assert update_response["data"]["users"][0]["status"] == "inactive"
 
 
@@ -641,8 +644,9 @@ def test_update_association_status_negative_1(clean_firestore):
   update_response = resp.json()
 
   assert update_response.get("success") is False, "Success not False"
-  assert update_response["message"] == \
-    "User for given user_id is not present in the discipline association group"
+  assert (update_response["message"] ==
+          "User for given user_id is not present "
+          "in the discipline association group")
 
 
 def test_update_association_status_negative_2(clean_firestore):
@@ -701,7 +705,7 @@ def test_get_instructors_associated_to_discipline(clean_firestore):
     user.update()
 
     users.append({"user": user.user_id, "status": "active"})
-    users[i]["user_type"] = "assessor" if i%2 == 0 else "instructor"
+    users[i]["user_type"] = "assessor" if i % 2 == 0 else "instructor"
 
   curriculum_pathway_dict = deepcopy(BASIC_CURRICULUM_PATHWAY_EXAMPLE)
   curriculum_pathway = CurriculumPathway.from_dict(curriculum_pathway_dict)
@@ -743,7 +747,7 @@ def test_add_user_to_discipline_association_group_negative(clean_firestore):
   add_users = {"users": add_users, "status": "active"}
   url = api_url + f"/{uuid}/users/add"
   post_resp = client_with_emulator.post(url, json=add_users)
-  post_resp_json = post_resp.json()
+  _ = post_resp.json()
   assert post_resp.status_code == 200, "Status 200"
 
   url = api_url + f"/{uuid}/users/add"

components/user_management/src/routes/learner_association_group_test.py

@@ -177,10 +177,10 @@ def test_post_association_group(clean_firestore):
 
 def test_post_association_group_negative(clean_firestore):
   # Create learner association group:
-  active_cp=create_curriculum_pathway(
+  active_cp = create_curriculum_pathway(
     payload={**BASIC_CURRICULUM_PATHWAY_EXAMPLE,
              "is_active": True, "alias": "program",
-              "is_deleted": False})
+             "is_deleted": False})
   input_group = {**BASIC_ASSOCIATION_GROUP_EXAMPLE, "name": "Learner Group1"}
   url = api_url
   post_resp = client_with_emulator.post(url, json=input_group)
@@ -437,7 +437,7 @@ def test_update_association_status_2(clean_firestore):
   discipline_group.users = [{"user": user_2.user_id, "status": "active"}]
   discipline_group.associations = {
     "curriculum_pathways": [{
-    "curriculum_pathway_id": curriculum_pathway_id, "status": "active"
+      "curriculum_pathway_id": curriculum_pathway_id, "status": "active"
     }]
   }
   discipline_group.update()
@@ -468,7 +468,7 @@ def test_update_association_status_2(clean_firestore):
   url = f"{api_url}/{association_group_uuid}/user-association/status"
   request_body = {
     "instructor": {"instructor_id": user_2.user_id,
-                   "curriculum_pathway_id":curriculum_pathway_id,
+                   "curriculum_pathway_id": curriculum_pathway_id,
                    "status": "active"}
   }
 
@@ -615,7 +615,7 @@ def test_update_association_status_negative_3(clean_firestore):
   discipline_group.users = [{"user": user_2.user_id, "status": "inactive"}]
   discipline_group.associations = {
     "curriculum_pathways": [{
-    "curriculum_pathway_id": curriculum_pathway_id, "status": "active"
+      "curriculum_pathway_id": curriculum_pathway_id, "status": "active"
     }]
   }
   discipline_group.update()
@@ -646,7 +646,7 @@ def test_update_association_status_negative_3(clean_firestore):
   url = f"{api_url}/{association_group_uuid}/user-association/status"
   request_body = {
     "instructor": {"instructor_id": user_2.user_id,
-                   "curriculum_pathway_id":curriculum_pathway_id,
+                   "curriculum_pathway_id": curriculum_pathway_id,
                    "status": "active"}
   }
 
@@ -683,7 +683,9 @@ def create_user_and_group(user_group_name, user_type):
   user_dict.update()
   user_id2 = user_dict.user_id
 
-  group_example = {"name": user_group_name, "users": [user_id1, user_id2], "description" : "example group"}
+  group_example = {"name": user_group_name,
+                   "users": [user_id1, user_id2],
+                   "description": "example group"}
 
   group_dict = UserGroup.from_dict(group_example)
   group_dict.uuid = ""
@@ -894,6 +896,7 @@ def create_learner_association_group(payload: dict,
   Parameters
   ----------
   payload: dict
+  program_id: str
 
   Returns
   -------
@@ -942,7 +945,7 @@ def test_add_instructor_positive_1(mocker, clean_firestore):
   }]
   discipline_assoc.associations = {
     "curriculum_pathways": [
-    {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
+      {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
     ]
   }
   discipline_assoc.update()
@@ -973,12 +976,12 @@ def test_add_instructor_positive_2(mocker, clean_firestore):
   Add Instructor for various curriculum pathway
   """
   # Create curriculum pathway
-  pathway_id, pathway_id_1, pathway_id_2, program_id = \
-    create_disciplines_and_programs()
+  pathway_id, pathway_id_1, pathway_id_2, program_id = (
+    create_disciplines_and_programs())
 
   mocker.patch(
       "routes.learner_association_group.get_all_discipline_for_given_program",
-      return_value=[pathway_id,pathway_id_1, pathway_id_2])
+      return_value=[pathway_id, pathway_id_1, pathway_id_2])
 
   # Create User as type faculty
   user = {**BASIC_USER_MODEL_EXAMPLE, "user_type": "instructor"}
@@ -1000,7 +1003,7 @@ def test_add_instructor_positive_2(mocker, clean_firestore):
   }]
   discipline_assoc.associations = {
     "curriculum_pathways": [
-    {"curriculum_pathway_id": pathway_id, "status": "active"}
+      {"curriculum_pathway_id": pathway_id, "status": "active"}
     ]
   }
   discipline_assoc.update()
@@ -1041,8 +1044,8 @@ def test_add_instructor_positive_3(mocker, clean_firestore):
   Add Instructor for existing removed instructor curriculum pathway
   """
   # Create curriculum pathway
-  curriculum_pathway_id, _, pathway_id_2, program_id = \
-    create_disciplines_and_programs()
+  curriculum_pathway_id, _, pathway_id_2, program_id = (
+    create_disciplines_and_programs())
 
   mocker.patch(
       "routes.learner_association_group.get_all_discipline_for_given_program",
@@ -1068,7 +1071,7 @@ def test_add_instructor_positive_3(mocker, clean_firestore):
   }]
   discipline_assoc.associations = {
     "curriculum_pathways": [
-    {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
+      {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
     ]
   }
   discipline_assoc.update()
@@ -1215,8 +1218,8 @@ def test_add_instructor_negative_6(mocker, clean_firestore):
   """
 
   # Create curriculum pathway
-  curriculum_pathway_id, _, pathway_id_2, program_id = \
-    create_disciplines_and_programs()
+  curriculum_pathway_id, _, pathway_id_2, program_id = (
+    create_disciplines_and_programs())
 
   mocker.patch(
       "routes.learner_association_group.get_all_discipline_for_given_program",
@@ -1242,7 +1245,7 @@ def test_add_instructor_negative_6(mocker, clean_firestore):
   }]
   discipline_assoc.associations = {
     "curriculum_pathways": [
-    {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
+      {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
     ]
   }
   discipline_assoc.update()
@@ -1270,8 +1273,8 @@ def test_remove_instructor_positive_1(mocker, clean_firestore):
   Remove Instructor with correct payload
   """
   # Create curriculum pathway
-  curriculum_pathway_id, _, pathway_id_2, program_id = \
-    create_disciplines_and_programs()
+  curriculum_pathway_id, _, pathway_id_2, program_id = (
+    create_disciplines_and_programs())
 
   mocker.patch(
       "routes.learner_association_group.get_all_discipline_for_given_program",
@@ -1297,7 +1300,7 @@ def test_remove_instructor_positive_1(mocker, clean_firestore):
   }]
   discipline_assoc.associations = {
     "curriculum_pathways": [
-    {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
+      {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
     ]
   }
   discipline_assoc.update()
@@ -1328,8 +1331,8 @@ def test_remove_instructor_positive_2(mocker, clean_firestore):
   Remove Instructor from multiple instructors
   """
   # Create curriculum pathway
-  pathway_id, pathway_id_1, pathway_id_2, program_id = \
-    create_disciplines_and_programs()
+  pathway_id, pathway_id_1, pathway_id_2, program_id = (
+    create_disciplines_and_programs())
 
   mocker.patch(
       "routes.learner_association_group.get_all_discipline_for_given_program",
@@ -1355,7 +1358,7 @@ def test_remove_instructor_positive_2(mocker, clean_firestore):
   }]
   discipline_assoc.associations = {
     "curriculum_pathways": [
-    {"curriculum_pathway_id": pathway_id_1, "status": "active"}
+      {"curriculum_pathway_id": pathway_id_1, "status": "active"}
     ]
   }
   discipline_assoc.update()
@@ -1522,7 +1525,7 @@ def test_remove_instructor_negative_6(mocker, clean_firestore):
   }]
   discipline_assoc.associations = {
     "curriculum_pathways": [
-    {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
+      {"curriculum_pathway_id": curriculum_pathway_id, "status": "active"}
     ]
   }
   discipline_assoc.update()
@@ -1589,8 +1592,8 @@ def test_remove_instructor_negative_8(mocker, clean_firestore):
   """
   Remove instructor wrong curriculum pathway ID
   """
-  curriculum_pathway_id, pathway_id_1, pathway_2, program_id = \
-    create_disciplines_and_programs()
+  curriculum_pathway_id, pathway_id_1, pathway_2, program_id = (
+    create_disciplines_and_programs())
 
   mocker.patch(
       "routes.learner_association_group.get_all_discipline_for_given_program",
@@ -1687,8 +1690,8 @@ def test_get_all_the_learner_for_instructor(clean_firestore):
   res_data = res.json()
   assert res.status_code == 200
   assert res_data["success"] is True
-  assert res_data["message"] == "Successfully fetched the learners "\
-        "for the given instructor"
+  assert (res_data["message"] == "Successfully fetched the learners "
+                                 "for the given instructor")
   assert user_1.user_id in res_data["data"]
 
 def test_get_all_the_learner_for_coach(clean_firestore):
@@ -1730,8 +1733,8 @@ def test_get_all_the_learner_for_coach(clean_firestore):
   res_data = res.json()
   assert res.status_code == 200
   assert res_data["success"] is True
-  assert res_data["message"] == "Successfully fetched the learners "\
-        "for the given coach"
+  assert (res_data["message"] ==
+          "Successfully fetched the learners for the given coach")
   assert user_1.user_id in res_data["data"]
 
 def test_get_all_the_learner_for_coach_and_instructor_negative(clean_firestore):