Story/CITE-173 : Reprocessing Documents

citesphere/src/main/java/edu/asu/diging/citesphere/core/service/ICitationManager.java

@@ -4,6 +4,7 @@
 import java.util.concurrent.ExecutionException;
 
 import org.springframework.data.util.CloseableIterator;
+import org.springframework.http.HttpStatus;
 import org.springframework.social.zotero.api.ZoteroUpdateItemsStatuses;
 import org.springframework.social.zotero.exception.ZoteroConnectionException;
 
@@ -88,10 +89,15 @@ CloseableIterator<ICitation> getAllGroupItems(IUser user, String groupId, String
 
     void deleteLocalGroupCitations(String groupId);
 
+    HttpStatus reprocessFile(IUser user, String zoteroGroupId, String itemId, String documentId)
+            throws GroupDoesNotExistException, CannotFindCitationException, ZoteroHttpStatusException,
+            ZoteroConnectionException, CitationIsOutdatedException, ZoteroItemCreationFailedException;
+
+
     Citations findAuthorityCitations(IAuthorityEntry entry, IUser user);
 
     ICitation addCitationToReferences(IUser user, ICitation citation, String zoteroGroupId, String referenceCitationKey, 
             String reference) throws SelfCitationException, ZoteroConnectionException, CitationIsOutdatedException, 
             ZoteroHttpStatusException, ZoteroItemCreationFailedException;
 
-}
+}

citesphere/src/main/java/edu/asu/diging/citesphere/core/service/giles/GilesUploadChecker.java

@@ -1,5 +1,6 @@
 package edu.asu.diging.citesphere.core.service.giles;
 
+import edu.asu.diging.citesphere.model.bib.IGilesUpload;
 import edu.asu.diging.citesphere.user.IUser;
 
 public interface GilesUploadChecker {
@@ -12,5 +13,7 @@ public interface GilesUploadChecker {
     void checkUploadStatus(String citationKey);
 
     void checkFileUploadStatus(String itemId, IUser principal, String fileId);
+
+    boolean canReprocess(IGilesUpload upload, IUser user);
 
 }

citesphere/src/main/java/edu/asu/diging/citesphere/core/service/giles/IGilesConnector.java

@@ -1,15 +1,17 @@
 package edu.asu.diging.citesphere.core.service.giles;
 
+import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.HttpClientErrorException;
 
 import edu.asu.diging.citesphere.user.IUser;
 
 public interface IGilesConnector {
 
-    <T> ResponseEntity<T> sendRequest(IUser user, String endpoint, Class<T> returnType)
+    <T> ResponseEntity<T> sendRequest(IUser user, String endpoint, Class<T> returnType, HttpMethod httpMethod)
             throws HttpClientErrorException;
 
     byte[] getFile(IUser user, String fileId);
-
-}
+
+    ResponseEntity<String> reprocessDocument(IUser user, String documentId);
+}

citesphere/src/main/java/edu/asu/diging/citesphere/core/service/giles/impl/GilesConnector.java

@@ -8,6 +8,7 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.util.MultiValueMap;
@@ -29,6 +30,9 @@ public class GilesConnector implements IGilesConnector {
     @Value("${giles_file_endpoint}")
     private String fileEndpoint;
 
+    @Value("${giles_file_reprocessing_endpoint}")
+    private String reprocessingEndpoint;
+
     @Autowired
     private InternalTokenManager internalTokenManager;
 
@@ -44,7 +48,7 @@ public void init() {
      * @see edu.asu.diging.citesphere.core.service.giles.impl.IGilesConnector#sendRequest(edu.asu.diging.citesphere.user.IUser, java.lang.String, java.lang.Class)
      */
     @Override
-    public <T> ResponseEntity<T> sendRequest(IUser user, String endpoint,Class<T> returnType) throws HttpClientErrorException {
+    public <T> ResponseEntity<T> sendRequest(IUser user, String endpoint,Class<T> returnType, HttpMethod httpMethod) throws HttpClientErrorException {
         String token = internalTokenManager.getAccessToken(user).getValue();
 
         HttpHeaders headers = new HttpHeaders();
@@ -54,15 +58,20 @@ public <T> ResponseEntity<T> sendRequest(IUser user, String endpoint,Class<T> re
 
         return restTemplate.exchange(
                     gilesBaseurl + endpoint,
-                    HttpMethod.GET, requestEntity, returnType);
+                    httpMethod, requestEntity, returnType);
     }
 
     /* (non-Javadoc)
      * @see edu.asu.diging.citesphere.core.service.giles.impl.IGilesConnector#getFile(edu.asu.diging.citesphere.user.IUser, java.lang.String)
      */
     @Override
     public byte[] getFile(IUser user, String fileId) {
-        ResponseEntity<byte[]> content = sendRequest(user, fileEndpoint.replace("{0}",  fileId), byte[].class);
+        ResponseEntity<byte[]> content = sendRequest(user, fileEndpoint.replace("{0}",  fileId), byte[].class, HttpMethod.GET);
         return content.getBody();
     }
+
+    @Override
+    public ResponseEntity<String> reprocessDocument(IUser user, String documentId) {
+        return sendRequest(user, reprocessingEndpoint.replace("{0}", documentId), String.class, HttpMethod.POST);
+    }
 }

citesphere/src/main/java/edu/asu/diging/citesphere/core/service/giles/impl/GilesUploadCheckerImpl.java

@@ -298,4 +298,33 @@ public void checkFileUploadStatus(String citationKey, IUser user, String process
             updateCitation(citation, checkedUploads, user, currentCitation);
         }        
     }
+
+    /**
+     * Check if an upload can be reprocessed based on Giles API v2 status
+     * @param upload The upload to check
+     * @param user The user making the request
+     * @return true if upload can be reprocessed, false otherwise
+     */
+    public boolean canReprocess(IGilesUpload upload, IUser user) {
+        if (upload.getProgressId() == null) {
+            return false;
+        }
+
+        String token = internalTokenManager.getAccessToken(user).getValue();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setBearerAuth(token);
+        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(headers);
+
+        try {
+            ResponseEntity<String> response = restTemplate.exchange(
+                gilesBaseurl + gilesCheckEndpoint + upload.getProgressId(),
+                HttpMethod.GET, requestEntity, String.class);
+
+            return response.getStatusCode() == HttpStatus.OK;
+
+        } catch (HttpClientErrorException ex) {
+            return ex.getStatusCode() == HttpStatus.NOT_FOUND || 
+                   ex.getStatusCode() == HttpStatus.INTERNAL_SERVER_ERROR;
+        }
+    }
 }