Merge branch 'main' into papi_exceeded_limit_cleanup

Author: Camelia-Orcid

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v2.76.7 - 2025-03-27
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.76.6...v2.76.7)
+
 ## v2.76.6 - 2025-03-27
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.76.5...v2.76.6)

orcid-core/src/main/java/org/orcid/core/manager/v3/ProfileInterstitialFlagManager.java

@@ -10,4 +10,5 @@
  */
 public interface ProfileInterstitialFlagManager extends ProfileInterstitialFlagManagerReadOnly {
     ProfileInterstitialFlagEntity addInterstitialFlag(String orcid, String interstitialName);
+
 }

orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/ProfileInterstitialFlagManagerReadOnly.java

@@ -1,10 +1,14 @@
 package org.orcid.core.manager.v3.read_only;
 
+import java.util.List;
+
 /**
  * 
  * @author Andrej Romanov
  * 
  */
 public interface ProfileInterstitialFlagManagerReadOnly {
     boolean hasInterstitialFlag(String orcid, String interstitialName);
+
+    List<String> findByOrcid(String orcid);
 }

orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ProfileInterstitialFlagManagerReadOnlyImpl.java

@@ -4,8 +4,10 @@
 import org.orcid.core.manager.read_only.impl.ManagerReadOnlyBaseImpl;
 import org.orcid.core.manager.v3.read_only.ProfileInterstitialFlagManagerReadOnly;
 import org.orcid.persistence.dao.ProfileInterstitialFlagDao;
+import org.orcid.persistence.jpa.entities.ProfileInterstitialFlagEntity;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,4 +26,13 @@ public void setProfileInterstitialFlagDao(ProfileInterstitialFlagDao profileInte
     public boolean hasInterstitialFlag(String orcid, String interstitialName) {
         return profileInterstitialFlagDaoReadOnly.hasInterstitialFlag(orcid, interstitialName);
     };
+
+    public List<String> findByOrcid(String orcid) {
+        List<ProfileInterstitialFlagEntity> entities = profileInterstitialFlagDaoReadOnly.findByOrcid(orcid);
+        List<String> interstitialNames = new ArrayList<String>();
+        for (ProfileInterstitialFlagEntity entity : entities) {
+            interstitialNames.add(entity.getInterstitialName());
+        }
+        return interstitialNames;
+    }
 }

orcid-core/src/test/java/org/orcid/core/manager/v3/ProfileInterstitialFlagManagerTest.java

@@ -0,0 +1,80 @@
+package org.orcid.core.manager.v3;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.orcid.core.manager.v3.impl.ProfileInterstitialFlagManagerImpl;
+import org.orcid.persistence.dao.ProfileInterstitialFlagDao;
+import org.orcid.persistence.jpa.entities.ProfileInterstitialFlagEntity;
+import org.orcid.test.TargetProxyHelper;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+public class ProfileInterstitialFlagManagerTest {
+    @Mock
+    private ProfileInterstitialFlagDao profileInterstitialFlagDao;
+
+    @Mock
+    private ProfileInterstitialFlagDao profileInterstitialFlagDaoReadOnly;
+
+    ProfileInterstitialFlagManager pifm = new ProfileInterstitialFlagManagerImpl();
+
+
+    private static final String ORCID = "0000-0000-0000-0001";
+    private static final String ORCID_TWO = "0000-0000-0000-0002";
+    private static final String INTERSTITIAL_FLAG = "DOMAIN_INTERSTITIAL";
+    private static final String INTERSTITIAL_FLAG_TWO = "AFFILIATION_INTERSTITIAL";
+
+
+    @Before
+    public void before() {
+        MockitoAnnotations.initMocks(this);
+        TargetProxyHelper.injectIntoProxy(pifm, "profileInterstitialFlagDao", profileInterstitialFlagDao);
+        TargetProxyHelper.injectIntoProxy(pifm, "profileInterstitialFlagDaoReadOnly", profileInterstitialFlagDaoReadOnly);
+
+        ProfileInterstitialFlagEntity pif1 = new ProfileInterstitialFlagEntity();
+        ProfileInterstitialFlagEntity pif2 = new ProfileInterstitialFlagEntity();
+
+        pif1.setInterstitialName(INTERSTITIAL_FLAG);
+        pif1.setOrcid(ORCID);
+
+        pif2.setInterstitialName(INTERSTITIAL_FLAG_TWO);
+        pif2.setOrcid(ORCID);
+
+        when(profileInterstitialFlagDaoReadOnly.findByOrcid(eq(ORCID))).thenReturn(List.of(pif1, pif2));
+        when(profileInterstitialFlagDaoReadOnly.findByOrcid(eq(ORCID_TWO))).thenReturn(List.of(pif2));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void addFlag_nullOrcid() {
+        pifm.addInterstitialFlag(null, INTERSTITIAL_FLAG);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void addFlag_nullInterstitialName() {
+        pifm.addInterstitialFlag(ORCID, null);
+    }
+
+    @Test
+    public void addFlag_success() {
+        pifm.addInterstitialFlag(ORCID, INTERSTITIAL_FLAG);
+        verify(profileInterstitialFlagDao, times(1)).addInterstitialFlag(eq(ORCID), eq(INTERSTITIAL_FLAG));
+    }
+
+    @Test
+    public void findByOrcid() {
+        List<String> flags = pifm.findByOrcid(ORCID);
+        assertEquals(flags.size(), 2);
+        assertEquals(flags.get(0), INTERSTITIAL_FLAG);
+        assertEquals(flags.get(1), INTERSTITIAL_FLAG_TWO);
+
+        List<String> flags2 = pifm.findByOrcid(ORCID_TWO);
+        assertEquals(flags2.size(), 1);
+        assertEquals(flags2.get(0), INTERSTITIAL_FLAG_TWO);
+    }
+}

orcid-persistence/src/main/java/org/orcid/persistence/dao/ProfileInterstitialFlagDao.java

@@ -9,4 +9,6 @@ public interface ProfileInterstitialFlagDao extends GenericDao<ProfileInterstiti
     ProfileInterstitialFlagEntity addInterstitialFlag(String orcid, String interstitialName);
 
     boolean hasInterstitialFlag(String orcid, String interstitialName);
+
+    List<ProfileInterstitialFlagEntity> findByOrcid(String orcid);
 }

orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileInterstitialFlagDaoImpl.java

@@ -6,7 +6,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.Query;
+import javax.persistence.TypedQuery;
 import java.math.BigInteger;
+import java.util.List;
 
 public class ProfileInterstitialFlagDaoImpl extends GenericDaoImpl<ProfileInterstitialFlagEntity, Long> implements ProfileInterstitialFlagDao {
 
@@ -32,4 +34,12 @@ public boolean hasInterstitialFlag(String orcid, String interstitialName) {
         long result = ((BigInteger)query.getSingleResult()).longValue();
         return result > 0;
     }
+
+    @Override
+    public List<ProfileInterstitialFlagEntity> findByOrcid(String orcid) {
+        TypedQuery<ProfileInterstitialFlagEntity> query = entityManager.createQuery("from ProfileInterstitialFlagEntity where orcid = :orcid", ProfileInterstitialFlagEntity.class);
+        query.setParameter("orcid", orcid);
+        List<ProfileInterstitialFlagEntity> results = query.getResultList();
+        return results.isEmpty() ? null : results;
+    }
 }

orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java

@@ -1068,4 +1068,10 @@ private void verifyPrimaryEmailIfNeeded(String orcid) {
         String orcid = getCurrentUserOrcid();
         return profileInterstitialFlagManager.addInterstitialFlag(orcid, interstitialName);
     }
+
+    @RequestMapping(value = "/getInterstitialFlags")
+    public @ResponseBody List<String> getInterstitialFlags() {
+        String orcid = getCurrentUserOrcid();
+        return profileInterstitialFlagManagerReadOnly.findByOrcid(orcid);
+    }
 }