From 4b0f88d0b63033d088ef513595ec4f4a87865d2d Mon Sep 17 00:00:00 2001 From: Nadim Ritter Date: Thu, 27 Jun 2024 16:02:26 +0200 Subject: [PATCH] SEBSP-131 replace fullname with lastname and firstname + fix test --- .../lms/impl/moodle/plugin/MoodlePluginCourseAccess.java | 2 +- .../lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java index 852c6885..ae95c034 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java @@ -356,7 +356,7 @@ public class MoodlePluginCourseAccess extends AbstractCachedCourseAccess impleme additionalAttributes.put("descriptionformat", String.valueOf(userDetails[0].descriptionformat)); return new ExamineeAccountDetails( userDetails[0].id, - userDetails[0].fullname, + userDetails[0].lastname + " " + userDetails[0].firstname, userDetails[0].username, userDetails[0].email, additionalAttributes); diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java index 1a42947a..39223557 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java @@ -252,7 +252,7 @@ public class MoodlePluginCourseAccessTest { assertFalse(userDetailsResult.hasError()); final ExamineeAccountDetails examineeAccountDetails = userDetailsResult.get(); assertEquals( - "ExamineeAccountDetails [id=2, name=test user, username=testuser, email=text@user.mail, " + "ExamineeAccountDetails [id=2, name=user test, username=testuser, email=text@user.mail, " + "additionalAttributes={mailformat=null, firstname=test, auth=null, timezone=null, description=null, firstaccess=null, confirmed=null, suspended=null, lastname=user, lastaccess=null, theme=null, descriptionformat=null, department=null, lang=null}]", examineeAccountDetails.toString());