fix: Make validated items to be default preferred source for grouping

ORCID · Jun 6, 2024 · 305779e · 305779e
1 parent 78fddb9
commit 305779e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/impl/WorkManagerImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/impl/WorkManagerImpl.java
@@ -477,9 +477,12 @@ public void createNewWorkGroup(List<Long> workIds, String orcid) throws MissingG
         MinimizedWorkEntity userPreferred = null;
 
         boolean groupableExternalIdFound = false;
-        for (MinimizedWorkEntity work : works) {
+        for (MinimizedWorkEntity work : works) {     	
             if (orcid.equals(work.getSourceId())) {
                 userVersions.add(work);
+                work.setDisplayIndex(0L);
+            } else {
+                work.setDisplayIndex(1L);
             }
             if (userPreferred == null || userPreferred.getDisplayIndex() < work.getDisplayIndex()) {
                 userPreferred = work;

diff --git a/orcid-core/src/test/java/org/orcid/core/manager/v3/WorkManagerTest.java b/orcid-core/src/test/java/org/orcid/core/manager/v3/WorkManagerTest.java
@@ -220,7 +220,7 @@ public void displayIndexIsSetTo_1_FromUI() {
         WorkEntity w = workDao.find(w1.getPutCode());
 
         assertNotNull(w1);
-        assertEquals(Long.valueOf(1), w.getDisplayIndex());
+        assertEquals(Long.valueOf(0), w.getDisplayIndex());
     }
 
     @Test
@@ -1435,7 +1435,7 @@ public void testCreateNewWorkGroup() throws MissingGroupableExternalIDException,
 
         // full work matching user preferred id should be loaded from db (10 is
         // highest display index)
-        Mockito.when(mockDao.find(Mockito.eq(4l))).thenReturn(getUserPreferredWork());
+        Mockito.when(mockDao.find(Mockito.eq(1l))).thenReturn(getUserPreferredWork());
 
         workManager.createNewWorkGroup(Arrays.asList(1l, 2l, 3l, 4l), "some-orcid");