Changed: installationBrandName param relying on BrandingUtils

Author: GPortas

doc/sphinx-guides/source/api/native-api.rst

@@ -6020,8 +6020,7 @@ The expected OK (200) response looks something like this:
                   "type": "CREATEACC",
                   "displayAsRead": false,
                   "sentTimestamp": "2025-08-08T08:00:16Z",
-                  "rootDataverseName": "Root",
-                  "installationName": "Your Installation Name",
+                  "installationBrandName": "Your Installation Name",
                   "userGuidesBaseUrl": "https://guides.dataverse.org",
                   "userGuidesVersion": "6.7.1",
                   "userGuidesSectionPath": "user/index.html"

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

@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import jakarta.ejb.EJB;
 import jakarta.ejb.Stateless;
@@ -32,14 +32,13 @@ public class InAppNotificationsJsonPrinter {
     public static final String KEY_REQUESTOR_EMAIL = "requestorEmail";
     public static final String KEY_DATAFILE_ID = "dataFileId";
     public static final String KEY_DATAFILE_DISPLAY_NAME = "dataFileDisplayName";
-    public static final String KEY_ROOT_DATAVERSE_NAME = "rootDataverseName";
     public static final String KEY_GUIDES_BASE_URL = "userGuidesBaseUrl";
     public static final String KEY_GUIDES_VERSION = "userGuidesVersion";
     public static final String KEY_GUIDES_SECTION_PATH = "userGuidesSectionPath";
     public static final String KEY_CURATION_STATUS = "currentCurationStatus";
     public static final String KEY_ADDITIONAL_INFO = "additionalInfo";
     public static final String KEY_OBJECT_DELETED = "objectDeleted";
-    public static final String KEY_INSTALLATION_NAME = "installationName";
+    public static final String KEY_INSTALLATION_BRAND_NAME = "installationBrandName";
 
     public static final String GUIDES_SECTION_PATH_DATAVERSE_MANAGEMENT_HTML = "user/dataverse-management.html";
     public static final String GUIDES_SECTION_PATH_DATASET_MANAGEMENT_HTML = "user/dataset-management.html";
@@ -58,8 +57,6 @@ public class InAppNotificationsJsonPrinter {
     private PermissionServiceBean permissionService;
     @EJB
     private SystemConfig systemConfig;
-    @EJB
-    private SettingsServiceBean settingsService;
 
     /**
      * Populates a JSON builder with fields specific to the notification type.
@@ -173,8 +170,7 @@ private void addCreateDataverseFields(final NullSafeJsonBuilder notificationJson
     }
 
     private void addCreateAccountFields(final NullSafeJsonBuilder notificationJson) {
-        notificationJson.add(KEY_ROOT_DATAVERSE_NAME, dataverseService.findRootDataverse().getName());
-        notificationJson.add(KEY_INSTALLATION_NAME, settingsService.getValueForKey(SettingsServiceBean.Key.InstallationName));
+        notificationJson.add(KEY_INSTALLATION_BRAND_NAME, BrandingUtil.getInstallationBrandName());
         addGuidesFields(notificationJson, GUIDES_SECTION_PATH_USER_HTML);
     }
 

src/test/java/edu/harvard/iq/dataverse/api/NotificationsIT.java

@@ -168,7 +168,7 @@ public void testNotifications() {
                 .body("data.notifications[0].displayAsRead", equalTo(false))
                 .body("data.notifications.size()", equalTo(1))
                 // In-App fields should be null
-                .body("data.notifications[0].rootDataverseName", equalTo(null))
+                .body("data.notifications[0].installationBrandName", equalTo(null))
                 .body("data.notifications[0].userGuidesBaseUrl", equalTo(null))
                 .body("data.notifications[0].userGuidesVersion", equalTo(null))
                 .body("data.notifications[0].userGuidesSectionPath", equalTo(null))
@@ -189,7 +189,7 @@ public void testNotifications() {
                 .body("data.notifications[0].displayAsRead", equalTo(false))
                 .body("data.notifications.size()", equalTo(1))
                 // In-App fields should be present
-                .body("data.notifications[0].rootDataverseName", equalTo("Root"))
+                .body("data.notifications[0].installationBrandName", equalTo("Root"))
                 .body("data.notifications[0].userGuidesBaseUrl", equalTo("https://guides.dataverse.org"))
                 .body("data.notifications[0].userGuidesSectionPath", equalTo("user/index.html"))
                 .body("data.notifications[0].userGuidesVersion", not(equalTo(null)))

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

@@ -2,15 +2,16 @@
 
 import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import jakarta.json.JsonArrayBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.Collections;
@@ -34,8 +35,6 @@ public class InAppNotificationsJsonPrinterTest {
     @Mock
     private PermissionServiceBean permissionService;
     @Mock
-    private SettingsServiceBean settingsService;
-    @Mock
     private SystemConfig systemConfig;
 
     @InjectMocks
@@ -401,22 +400,19 @@ public void testAddFieldsByType_statusUpdated_objectDeleted() {
     @Test
     public void testAddFieldsByType_createAcc() {
         userNotification.setType(UserNotification.Type.CREATEACC);
+        try (MockedStatic<BrandingUtil> mockedBrandingUtil = mockStatic(BrandingUtil.class)) {
+            mockedBrandingUtil.when(BrandingUtil::getInstallationBrandName).thenReturn("My Test Brand Name");
 
-        Dataverse rootDataverse = mock(Dataverse.class);
-        when(rootDataverse.getName()).thenReturn("Root");
-        when(dataverseService.findRootDataverse()).thenReturn(rootDataverse);
-        when(settingsService.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn("InstallationName");
+            when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
+            when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
 
-        when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
-        when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
+            sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
 
-        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
-
-        verify(notificationJson).add(KEY_ROOT_DATAVERSE_NAME, "Root");
-        verify(notificationJson).add(KEY_INSTALLATION_NAME, "InstallationName");
-        verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
-        verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
-        verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_USER_HTML);
+            verify(notificationJson).add(KEY_INSTALLATION_BRAND_NAME, "My Test Brand Name");
+            verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
+            verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
+            verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_USER_HTML);
+        }
     }
 
     @Test