fix: Recipe comments display a username/id rather than … (#4726)

Co-authored-by: Kuchenpirat <jojow@gmx.net>
Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageComments.vue

@@ -34,7 +34,7 @@
       <UserAvatar :tooltip="false" size="40" :user-id="comment.userId" />
       <v-card outlined class="flex-grow-1">
         <v-card-text class="pa-3 pb-0">
-          <p class="">{{ comment.user.username }} • {{ $d(Date.parse(comment.createdAt), "medium") }}</p>
+          <p class="">{{ comment.user.fullName }} • {{ $d(Date.parse(comment.createdAt), "medium") }}</p>
           <SafeMarkdown :source="comment.text" />
         </v-card-text>
         <v-card-actions class="justify-end mt-0 pt-0">

mealie/schema/recipe/recipe_comments.py

@@ -15,6 +15,7 @@ class UserBase(MealieModel):
     id: UUID4
     username: str | None = None
     admin: bool
+    full_name: str | None = None
     model_config = ConfigDict(from_attributes=True)
 
 

tests/fixtures/fixture_admin.py

@@ -48,6 +48,7 @@ def admin_user(session: Session, api_client: TestClient):
             user_id=user_id,
             password=settings._DEFAULT_PASSWORD,
             username=user_data.get("username"),
+            full_name=user_data.get("fullName"),
             email=user_data.get("email"),
             token=token,
             repos=get_repositories(session, group_id=group_id, household_id=household_id),

tests/fixtures/fixture_users.py

@@ -45,6 +45,7 @@ def build_unique_user(session: Session, group: str, api_client: TestClient) -> u
         user_id=user_id,
         email=user_data.get("email"),
         username=user_data.get("username"),
+        full_name=user_data.get("fullName"),
         password=registration.password,
         token=token,
         repos=get_repositories(session, group_id=group_id, household_id=household_id),
@@ -108,6 +109,7 @@ def h2_user(session: Session, admin_token, api_client: TestClient, unique_user:
             token=token,
             email=user_data["email"],
             username=user_data["username"],
+            full_name=user_data["fullName"],
             password=user_data["password"],
             repos=get_repositories(session, group_id=group_id, household_id=household_id),
         )
@@ -165,6 +167,7 @@ def g2_user(session: Session, admin_token, api_client: TestClient):
             token=token,
             email=create_data["email"],  # type: ignore
             username=create_data.get("username"),  # type: ignore
+            full_name=create_data.get("fullName"),  # type: ignore
             password=create_data.get("password"),  # type: ignore
             repos=get_repositories(session, group_id=group_id, household_id=household_id),
         )
@@ -203,6 +206,7 @@ def _unique_user(session: Session, api_client: TestClient):
             user_id=user_id,
             email=user_data.get("email"),
             username=user_data.get("username"),
+            full_name=user_data.get("fullName"),
             password=registration.password,
             token=token,
             repos=get_repositories(session, group_id=group_id, household_id=household_id),
@@ -281,6 +285,7 @@ def user_tuple(session: Session, admin_token, api_client: TestClient) -> Generat
                 _household_id=household_id,
                 user_id=user_id,
                 username=user_data.get("username"),
+                full_name=user_data.get("fullName"),
                 email=user_data.get("email"),
                 password="useruser",
                 token=token,

tests/integration_tests/user_recipe_tests/test_recipe_comments.py

@@ -43,6 +43,7 @@ def test_create_comment(api_client: TestClient, unique_recipe: Recipe, unique_us
     assert response_data["recipeId"] == str(unique_recipe.id)
     assert response_data["text"] == create_data["text"]
     assert response_data["userId"] == str(unique_user.user_id)
+    assert response_data["user"]["fullName"] == unique_user.full_name
 
     # Check for Proper Association
     response = api_client.get(api_routes.recipes_slug_comments(unique_recipe.slug), headers=unique_user.token)

tests/utils/fixture_schemas.py

@@ -11,6 +11,7 @@ class TestUser:
     email: str
     user_id: UUID
     username: str
+    full_name: str
     password: str
     _group_id: UUID
     _household_id: UUID