feat: let APIs return more info about role assignments

Author: vera

src/main/java/edu/harvard/iq/dataverse/DvObject.java

@@ -140,6 +140,8 @@ public String visit(DataFile df) {
 
     @Column(insertable = false, updatable = false) private String dtype;
 
+    public String getDtype() { return dtype; }
+
     @OneToMany(mappedBy="dvobject",fetch = FetchType.LAZY,cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
     private List<DataverseFeaturedItem> dataverseFeaturedItems;
 

src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java

@@ -90,17 +90,22 @@ public class JsonPrinter {
     @EJB
     static InAppNotificationsJsonPrinter inAppNotificationsJsonPrinter;
 
+    @EJB
+    static RoleAssigneeServiceBean roleAssigneeService;
+
     public static void injectSettingsService(SettingsServiceBean ssb,
                                              DatasetFieldServiceBean dfsb,
                                              DataverseFieldTypeInputLevelServiceBean dfils,
                                              DatasetServiceBean ds,
                                              MailServiceBean ms,
-                                             InAppNotificationsJsonPrinter njp) {
+                                             InAppNotificationsJsonPrinter njp,
+                                             RoleAssigneeServiceBean ras) {
             settingsService = ssb;
             datasetFieldService = dfsb;
             datasetService = ds;
             mailService = ms;
             inAppNotificationsJsonPrinter = njp;
+            roleAssigneeService = ras;
     }
 
     public JsonPrinter() {
@@ -155,14 +160,24 @@ public static JsonArrayBuilder jsonRoleAssignments(List<RoleAssignment> roleAssi
     }
 
     public static JsonObjectBuilder json(RoleAssignment ra) {
-        return jsonObjectBuilder()
-                .add("id", ra.getId())
-                .add("assignee", ra.getAssigneeIdentifier())
-                .add("roleId", ra.getRole().getId())
-                .add("roleName", ra.getRole().getName())
-                .add("_roleAlias", ra.getRole().getAlias())
-                .add("privateUrlToken", ra.getPrivateUrlToken())
-                .add("definitionPointId", ra.getDefinitionPoint().getId());
+        JsonObjectBuilder job = jsonObjectBuilder()
+                                    .add("id", ra.getId())
+                                    .add("assignee", ra.getAssigneeIdentifier())
+                                    .add("assigneeName", roleAssigneeService.getRoleAssignee(ra.getAssigneeIdentifier()).getDisplayInfo().getTitle())
+                                    .add("roleId", ra.getRole().getId())
+                                    .add("roleName", ra.getRole().getName())
+                                    .add("roleDescription", ra.getRole().getDescription())
+                                    .add("_roleAlias", ra.getRole().getAlias())
+                                    .add("privateUrlToken", ra.getPrivateUrlToken())
+                                    .add("definitionPointId", ra.getDefinitionPoint().getId())
+                                    .add("definitionPointName", ra.getDefinitionPoint().getDisplayName())
+                                    .add("definitionPointType", ra.getDefinitionPoint().getDtype());
+
+        if (ra.getDefinitionPoint().getGlobalId() != null) {
+            job.add("definitionPointGlobalId", ra.getDefinitionPoint().getGlobalId().toString());
+        }
+
+        return job;
     }
 
     public static JsonArrayBuilder json(Set<Permission> permissions) {
@@ -296,12 +311,12 @@ public static JsonObjectBuilder json(Workflow wf){
 
         return bld;
     }
-    
+
     public static JsonObjectBuilder json(Dataverse dv, boolean minimal) {
         if (!minimal){
             return json(dv, false, false, false, null);
         } else {
-            return json(dv, false, false, true, null);        
+            return json(dv, false, false, true, null);
         }
     }
 
@@ -315,7 +330,7 @@ public static JsonObjectBuilder json(Dataverse dv, Boolean hideEmail, Boolean re
                 .add("id", dv.getId())
                 .add("alias", dv.getAlias())
                 .add("name", dv.getName());
-        //minimal refers to only returning the id alias and name for 
+        //minimal refers to only returning the id alias and name for
         //used in selecting collections available for linking
         if (minimal) {
             return bld;
@@ -1715,7 +1730,7 @@ public static JsonArrayBuilder json(List<UserNotification> notifications, Authen
 
         return notificationsArray;
     }
-    
+
     public static JsonObjectBuilder jsonLanguage(String locale, String title) {
         // returns a single metadata language entry
         return jsonObjectBuilder().add("locale", locale).add("title", title);
@@ -1725,7 +1740,7 @@ public static JsonArrayBuilder jsonLanguage(Map<String, String> langMap) {
         // returns an array of metadatalanguages
         return Json.createArrayBuilder(langMap.entrySet().stream().map(entry -> jsonLanguage(entry.getKey(), entry.getValue())).toList());
     }
-    
+
     public static JsonArrayBuilder jsonDatasetVersionSummaries(List<DatasetVersionSummary> summaries) {
         JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
         summaries.stream()

src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinterHelper.java

@@ -1,9 +1,6 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevelServiceBean;
-import edu.harvard.iq.dataverse.MailServiceBean;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 
 import jakarta.annotation.PostConstruct;
@@ -37,6 +34,9 @@ public class JsonPrinterHelper {
     @EJB
     InAppNotificationsJsonPrinter inAppNotificationsJsonPrinter;
 
+    @EJB
+    RoleAssigneeServiceBean roleAssigneeService;
+
     @PostConstruct
     public void injectService() {
         JsonPrinter.injectSettingsService(
@@ -45,7 +45,8 @@ public void injectService() {
                 datasetFieldInpuLevelSvc,
                 datasetSvc,
                 mailSvc,
-                inAppNotificationsJsonPrinter
+                inAppNotificationsJsonPrinter,
+                roleAssigneeService
         );
     }
 }

src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java

@@ -105,6 +105,7 @@ public void setUp() {
 
     @Test
     public void testJson_RoleAssignment() {
+        JsonPrinter.injectSettingsService(null, null, null, null, null, null, new MockRoleAssigneeService());
         DataverseRole aRole = new DataverseRole();
         PrivateUrlUser privateUrlUserIn = new PrivateUrlUser(42);
         RoleAssignee anAssignee = privateUrlUserIn;
@@ -122,6 +123,7 @@ public void testJson_RoleAssignment() {
 
     @Test
     public void testJson_PrivateUrl() {
+        JsonPrinter.injectSettingsService(null, null, null, null, null, null, new MockRoleAssigneeService());
         DataverseRole aRole = new DataverseRole();
         PrivateUrlUser privateUrlUserIn = new PrivateUrlUser(42);
         RoleAssignee anAssignee = privateUrlUserIn;
@@ -205,7 +207,7 @@ public void testDatasetContactOutOfBoxNoPrivacy() {
         datasetContactField.setDatasetFieldCompoundValues(vals);
         fields.add(datasetContactField);
 
-        JsonPrinter.injectSettingsService(null, null, null, null, null, null);
+        JsonPrinter.injectSettingsService(null, null, null, null, null, null, null);
 
         JsonObject jsonObject = JsonPrinter.json(block, fields).build();
         assertNotNull(jsonObject);
@@ -246,7 +248,7 @@ public void testDatasetContactWithPrivacy() {
         datasetContactField.setDatasetFieldCompoundValues(vals);
         fields.add(datasetContactField);
 
-        JsonPrinter.injectSettingsService(new MockSettingsSvc(), null, null, null, null, null);
+        JsonPrinter.injectSettingsService(new MockSettingsSvc(), null, null, null, null, null, null);
 
         JsonObject jsonObject = JsonPrinter.json(block, fields).build();
         assertNotNull(jsonObject);
@@ -296,7 +298,7 @@ public void testDatasetFieldTypesWithChildren() {
 
         block.setDatasetFieldTypes(datasetFieldTypes);
 
-        JsonPrinter.injectSettingsService(new MockSettingsSvc(), null, null ,null, null, null);
+        JsonPrinter.injectSettingsService(new MockSettingsSvc(), null, null ,null, null, null, null);
 
         JsonObject jsonObject = JsonPrinter.json(block).build();
         assertNotNull(jsonObject);
@@ -361,6 +363,15 @@ public boolean isTrueForKey(SettingsServiceBean.Key key, boolean defaultValue) {
 
     }
 
+    private static class MockRoleAssigneeService extends RoleAssigneeServiceBean {
+
+        @Override
+        public RoleAssignee getRoleAssignee(String identifier) {
+            return new PrivateUrlUser(42);
+        }
+
+    }
+
     @Test
     public void testEnum() throws JsonParseException {
         JsonArrayBuilder arr = JsonPrinter.enumsToJson(Arrays.asList(Type.REVOKEROLE, Type.ASSIGNROLE));