audrix/dashboard-cpsp-executive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change user_name still used as login and add display_name for dashboard view instead of username on login

Browse Source
This commit is contained in:
Alberto-Audrix committed 2026-09-10 10:51:51 +07:00
1 parent 7a562c18ec
commit 11b0ca26a5
33 files changed
+180 -145
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

backend/apps/accounts/tests_managed_by.py
+10 -10
View File
@@ -8,13 +8,13 @@ class ManagedByRequestTests(TestCase):
def setUp(self):
self.client = APIClient()
self.buh = User.objects.create_user(
user_login="buh1", password="x", status=User.STATUS_BUH
user_name="buh1", password="x", status=User.STATUS_BUH
)
self.buh_other = User.objects.create_user(
user_login="buh2", password="x", status=User.STATUS_BUH
user_name="buh2", password="x", status=User.STATUS_BUH
)
self.gm = User.objects.create_user(
user_login="gm1", password="x", status=User.STATUS_GM
user_name="gm1", password="x", status=User.STATUS_GM
)
def test_gm_requests_and_buh_approves(self):
@@ -30,7 +30,7 @@ class ManagedByRequestTests(TestCase):
self.client.force_authenticate(self.buh)
pending = self.client.get("/api/v1/users/pending-managed/")
self.assertEqual(pending.status_code, 200)
self.assertEqual({row["user_name"] for row in pending.data}, {"gm1"})
self.assertEqual({row["display_name"] for row in pending.data}, {"gm1"})
approve = self.client.post(f"/api/v1/users/{self.gm.pk}/approve-managed-by/", {})
self.assertEqual(approve.status_code, 200)
@@ -39,7 +39,7 @@ class ManagedByRequestTests(TestCase):
self.assertIsNone(self.gm.managed_by_pending_id)
managed = self.client.get("/api/v1/users/")
self.assertEqual({row["user_name"] for row in managed.data["results"]}, {"gm1"})
self.assertEqual({row["display_name"] for row in managed.data["results"]}, {"gm1"})
def test_other_buh_cannot_approve(self):
self.gm.request_managed_by(self.buh)
@@ -60,17 +60,17 @@ class ManagedByRequestTests(TestCase):
def test_gm_lists_buhs_only(self):
User.objects.create_user(
user_login="buadmin1", password="x", status=User.STATUS_BU_ADMIN
user_name="buadmin1", password="x", status=User.STATUS_BU_ADMIN
)
self.client.force_authenticate(self.gm)
response = self.client.get("/api/v1/users/buhs/")
self.assertEqual(response.status_code, 200)
names = {row["user_name"] for row in response.data}
names = {row["display_name"] for row in response.data}
self.assertEqual(names, {"buh1", "buh2"})
def test_gm_admin_cannot_request_buh(self):
gm_admin = User.objects.create_user(
user_login="gma1", password="x", status=User.STATUS_GM_ADMIN
user_name="gma1", password="x", status=User.STATUS_GM_ADMIN
)
self.client.force_authenticate(gm_admin)
response = self.client.post(
@@ -80,7 +80,7 @@ class ManagedByRequestTests(TestCase):
def test_gm_cannot_request_bu_admin(self):
bu_admin = User.objects.create_user(
user_login="buadmin1", password="x", status=User.STATUS_BU_ADMIN
user_name="buadmin1", password="x", status=User.STATUS_BU_ADMIN
)
self.client.force_authenticate(self.gm)
response = self.client.post(
@@ -90,7 +90,7 @@ class ManagedByRequestTests(TestCase):
def test_bu_admin_cannot_approve(self):
bu_admin = User.objects.create_user(
user_login="buadmin1", password="x", status=User.STATUS_BU_ADMIN
user_name="buadmin1", password="x", status=User.STATUS_BU_ADMIN
)
self.gm.managed_by_pending = bu_admin
self.gm.save(update_fields=["managed_by_pending", "updated_at"])