Merge pull request #6673 from ORCID/IgnoreRecordOwnerInBibtex

If the work was created through bibtex we dont care if it contains th…

Author: amontenegro

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

@@ -55,6 +55,8 @@
 import org.orcid.pojo.grouping.WorkGroupingSuggestion;
 import org.orcid.pojo.grouping.WorkGroupingSuggestions;
 import org.orcid.pojo.grouping.WorkGroupingSuggestionsCount;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -71,6 +73,8 @@
 @RequestMapping(value = { "/works" })
 public class WorksController extends BaseWorkspaceController {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(WorksController.class);
+    
     private static final Pattern LANGUAGE_CODE = Pattern.compile("([a-zA-Z]{2})(_[a-zA-Z]{2}){0,2}");
     private static final String PAGE_SIZE_DEFAULT = "50";
 
@@ -534,21 +538,30 @@ private void initializePublicationDate(WorkForm w) {
         }
 
         return null;
-    }
+    }    
+    
     /**
      * Creates a new work
      * 
      * @throws Exception
      */
     @RequestMapping(value = "/work.json", method = RequestMethod.POST)
-    public @ResponseBody WorkForm postWork(HttpServletRequest request, @RequestBody WorkForm workForm) throws Exception {
+    public @ResponseBody WorkForm postWork(HttpServletRequest request, @RequestBody WorkForm workForm,
+            @RequestParam(value = "isBibtex", required = false, defaultValue = "false") Boolean isBibtex) throws Exception {
         validateWork(workForm);
         if (workForm.getErrors().size() == 0) {
             removeEmptyExternalIdentifiers(workForm);
             if (isRecordHolderNotInContributors(workForm)) {
-                List<String> errors = workForm.getErrors();
-                errors.add(getMessage("web.orcid.record_holder_not_contributor.exception"));
-                return workForm;
+                if (Boolean.TRUE.equals(isBibtex)) {
+                    // For now, if the request comes from bibtex, we just need
+                    // to ignore the record owner, we can't validate if it is
+                    // already in one of the provided contributors
+                } else {
+                    LOGGER.error("Record owner is not in contributors list, orcid id: " + getCurrentUserOrcid());
+                    List<String> errors = workForm.getErrors();
+                    errors.add(getMessage("web.orcid.record_holder_not_contributor.exception"));
+                    return workForm;
+                }
             }
             if (workForm.getPutCode() != null)
                 updateWork(workForm);

orcid-web/src/test/java/org/orcid/frontend/web/controllers/WorksControllerTest.java

@@ -318,7 +318,7 @@ public void testAddWork() throws Exception {
             work.getCitation().setCitationType(Text.valueOf("formatted-unspecified"));
         }
 
-        work = worksController.postWork(null, work);
+        work = worksController.postWork(null, work, false);
         assertNotNull(work);
         assertFalse(PojoUtil.isEmpty(work.getPutCode()));
         assertEquals(1, work.getWorkExternalIdentifiers().size());
@@ -336,7 +336,7 @@ public void testEditOtherSourceThrowsError() throws Exception {
         WorkForm work = worksController.getWorkInfo(Long.valueOf("7"));
         boolean throwsError = false;
         try {
-            worksController.postWork(null, work);
+            worksController.postWork(null, work, false);
         } catch (Exception e) {
             throwsError = true;
         }
@@ -383,7 +383,7 @@ public void testUpdateWork() throws Exception {
             work.getErrors().forEach(n -> System.out.println(n));
             fail("invalid work update");
         }
-        worksController.postWork(null, work);
+        worksController.postWork(null, work, false);
 
         WorkForm updatedWork = worksController.getWorkInfo(Long.valueOf("6"));
         assertNotNull(updatedWork);