Fix issue with canViewRecord when calling related api (geonetwork#7373)

* Switch getAndCheckMetadataId to getInternalId in recent canViewRecord changes as it supports both uuid and internal id.

* Fix bug in getInternalId that failed if an id was passed.

Author: ianwallen

services/src/main/java/org/fao/geonet/api/ApiUtils.java

@@ -23,8 +23,6 @@
 
 package org.fao.geonet.api;
 
-import static org.fao.geonet.api.records.attachments.AbstractStore.getAndCheckMetadataId;
-
 import com.google.common.collect.Sets;
 import jeeves.constants.Jeeves;
 import jeeves.server.UserSession;
@@ -115,7 +113,11 @@ public static String getInternalId(String uuidOrInternalId, Boolean approved)
         throws Exception {
 
         IMetadataUtils metadataUtils = ApplicationContextHolder.get().getBean(IMetadataUtils.class);
-        String id = String.valueOf(metadataUtils.findOneByUuid(uuidOrInternalId).getId());
+        AbstractMetadata metadata = metadataUtils.findOneByUuid(uuidOrInternalId);
+        String id = null;
+        if (metadata != null) {
+            id = String.valueOf(metadata.getId());
+        }
 
         if (StringUtils.isEmpty(id)) {
             //It wasn't a UUID
@@ -295,7 +297,7 @@ public static AbstractMetadata canViewRecord(String metadataUuid, boolean approv
         String metadataId;
         if (!approved) {
             // If the record is not approved then we need to get the id of the record.
-            metadataId = String.valueOf(getAndCheckMetadataId(metadataUuid, approved));
+            metadataId = getInternalId(metadataUuid, approved);
         } else {
             // Otherwise use the uuid or id that was supplied.
             metadataId = metadataUuid;

services/src/main/java/org/fao/geonet/api/records/MetadataApi.java

@@ -73,7 +73,7 @@
 import java.util.stream.Stream;
 
 import static org.fao.geonet.api.ApiParams.*;
-import static org.fao.geonet.api.records.attachments.AbstractStore.getAndCheckMetadataId;
+
 import static org.fao.geonet.kernel.mef.MEFLib.Version.Constants.MEF_V1_ACCEPT_TYPE;
 import static org.fao.geonet.kernel.mef.MEFLib.Version.Constants.MEF_V2_ACCEPT_TYPE;
 

services/src/main/java/org/fao/geonet/api/records/MetadataAssociatedApi.java

@@ -52,11 +52,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static org.fao.geonet.api.ApiParams.*;
-import static org.fao.geonet.api.records.attachments.AbstractStore.getAndCheckMetadataId;
 
 @RequestMapping(value = {
     "/{portal}/api/records"

services/src/main/java/org/fao/geonet/api/related/Related.java

@@ -58,8 +58,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import static org.fao.geonet.api.records.attachments.AbstractStore.getAndCheckMetadataId;
-
 @RequestMapping(value = {
     "/{portal}/api/related"
 })