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

backend/apps/farms/serializers.py

@@ -5,7 +5,7 @@ from apps.farms.models import Cycle, Flock, Kandang, Site
 
 
 class SiteSerializer(PkAsIdMixin, serializers.ModelSerializer):
-    owner_name = serializers.CharField(source="user.user_name", read_only=True)
+    owner_name = serializers.CharField(source="user.display_name", read_only=True)
 
     class Meta:
         model = Site

backend/apps/farms/tests.py

@@ -23,9 +23,9 @@ def _gm_visible_site(*, owner: User, site_name: str, code: str) -> Site:
 
 class FarmAPITests(TestCase):
     def setUp(self):
-        self.user = User.objects.create_user(user_login="tester", password="secret")
+        self.user = User.objects.create_user(user_name="tester", password="secret")
         self.admin = User.objects.create_user(
-            user_login="admin",
+            user_name="admin",
             password="secret",
             status=User.STATUS_DIRECTOR_ADMIN,
         )
@@ -124,7 +124,7 @@ class FarmAPITests(TestCase):
         self.assertEqual(cycle.status, Cycle.STATUS_ACTIVE)
 
     def test_gm_can_approve_cycle_close(self):
-        gm = User.objects.create_user(user_login="gm_approver", password="x", status=User.STATUS_GM)
+        gm = User.objects.create_user(user_name="gm_approver", password="x", status=User.STATUS_GM)
         site = _gm_visible_site(owner=gm, site_name="GM Site", code="gm-approve")
         kandang = Kandang.objects.create(kandang_name="Kandang GM", site=site)
         self.client.force_authenticate(gm)
@@ -154,7 +154,7 @@ class FarmAPITests(TestCase):
         self.assertEqual(cycle.end_date, proposed)
 
     def test_gm_can_reject_cycle_close(self):
-        gm = User.objects.create_user(user_login="gm_rejector", password="x", status=User.STATUS_GM)
+        gm = User.objects.create_user(user_name="gm_rejector", password="x", status=User.STATUS_GM)
         site = _gm_visible_site(owner=gm, site_name="GM Reject Site", code="gm-reject")
         kandang = Kandang.objects.create(kandang_name="Kandang R", site=site)
         self.client.force_authenticate(gm)
@@ -181,7 +181,7 @@ class FarmAPITests(TestCase):
 
     def test_gm_admin_cannot_approve_cycle_close(self):
         gm_admin = User.objects.create_user(
-            user_login="gm_admin_user", password="x", status=User.STATUS_GM_ADMIN
+            user_name="gm_admin_user", password="x", status=User.STATUS_GM_ADMIN
         )
         site = _gm_visible_site(
             owner=gm_admin, site_name="GM Admin Site", code="gm-admin-site"

backend/apps/farms/tests_feed_in_button.py

@@ -6,14 +6,14 @@ from apps.farms.models import Kandang, Site
 
 class KandangFeedInButtonUrlTests(TestCase):
     def setUp(self):
-        self.owner = User.objects.create_user(user_login="owner", password="secret")
+        self.owner = User.objects.create_user(user_name="owner", password="secret")
         self.admin = User.objects.create_user(
-            user_login="admin",
+            user_name="admin",
             password="admin123",
             status=User.STATUS_DIRECTOR_ADMIN,
         )
         self.staff = User.objects.create_user(
-            user_login="staff",
+            user_name="staff",
             password="staff123",
             status=User.STATUS_GM,
         )
@@ -27,11 +27,11 @@ class KandangFeedInButtonUrlTests(TestCase):
         token = client.cookies["csrftoken"].value
         return {"HTTP_X_CSRFTOKEN": token}
 
-    def _login(self, client: Client, user_login: str, password: str) -> None:
+    def _login(self, client: Client, user_name: str, password: str) -> None:
         client.get("/api/v1/auth/csrf/")
         response = client.post(
             "/api/v1/auth/login/",
-            {"user_login": user_login, "password": password},
+            {"user_name": user_name, "password": password},
             content_type="application/json",
             **self._csrf_headers(client),
         )