Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add display_name field to user model (#357) #358

Merged
merged 1 commit into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions hpcaccess/users/migrations/0009_user_display_name.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 4.2.17 on 2024-12-17 16:19

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("users", "0008_user_consented_to_terms"),
]

operations = [
migrations.AddField(
model_name="user",
name="display_name",
field=models.CharField(
blank=True, max_length=255, null=True, verbose_name="Display Name"
),
),
]
1 change: 1 addition & 0 deletions hpcaccess/users/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class User(AbstractUser):
phone = CharField(_("Phone number of User"), blank=True, null=True, max_length=32)
email = EmailField(_("email address"), blank=True, null=True)
uid = IntegerField(_("UID of User"), blank=True, null=True)
display_name = CharField(_("Display Name"), blank=True, null=True, max_length=255)
consented_to_terms = BooleanField(
_("Terms consent status"),
default=False,
Expand Down
5 changes: 5 additions & 0 deletions usersec/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class HpcUserAbstractSerializer(HpcObjectAbstractSerializer):
full_name = serializers.SerializerMethodField()
first_name = serializers.SerializerMethodField()
last_name = serializers.SerializerMethodField()
display_name = serializers.SerializerMethodField()
phone_number = serializers.SerializerMethodField()
home_directory = serializers.CharField()
login_shell = serializers.CharField()
Expand All @@ -65,12 +66,16 @@ def get_phone_number(self, obj) -> Optional[str]:
def get_uid(self, obj) -> Optional[int]:
return obj.user.uid

def get_display_name(self, obj) -> Optional[str]:
return obj.user.display_name

class Meta:
fields = HpcObjectAbstractSerializer.Meta.fields + [
"email",
"full_name",
"first_name",
"last_name",
"display_name",
"phone_number",
"primary_group",
"resources_requested",
Expand Down
1 change: 1 addition & 0 deletions usersec/tests/snapshots/snap_test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
"current_version": 1,
"date_created": "2019-01-01T00:00:00Z",
"description": "this is a user",
"display_name": None,
"email": "email_placeholder",
"expiration": "2050-01-01T00:00:00Z",
"first_name": "first_name_placeholder",
Expand Down
Loading