Story/CITE-173 : Reprocessing Documents

citesphere/pom.xml

@@ -648,8 +648,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>

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

@@ -85,4 +85,8 @@ CloseableIterator<ICitation> getAllGroupItems(IUser user, String groupId, String
 
     void deleteLocalGroupCitations(String groupId);
 
-}
+    void reprocessFile(IUser user, String zoteroGroupId, String itemId, String documentId)
+            throws GroupDoesNotExistException, CannotFindCitationException, ZoteroHttpStatusException,
+            ZoteroConnectionException, CitationIsOutdatedException, ZoteroItemCreationFailedException;
+
+}

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/impl/CitationManager.java

@@ -1,13 +1,17 @@
 package edu.asu.diging.citesphere.core.service.impl;
 
+import java.io.IOException;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.function.BiFunction;
+import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 import javax.transaction.Transactional;
@@ -18,12 +22,16 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.util.CloseableIterator;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.social.zotero.api.ZoteroUpdateItemsStatuses;
 import org.springframework.social.zotero.exception.ZoteroConnectionException;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import edu.asu.diging.citesphere.core.exceptions.AccessForbiddenException;
 import edu.asu.diging.citesphere.core.exceptions.CannotFindCitationException;
@@ -37,16 +45,21 @@
 import edu.asu.diging.citesphere.core.service.ICitationManager;
 import edu.asu.diging.citesphere.core.service.ICitationStore;
 import edu.asu.diging.citesphere.core.service.IGroupManager;
+import edu.asu.diging.citesphere.core.service.giles.GilesUploadChecker;
+import edu.asu.diging.citesphere.core.service.giles.IGilesConnector;
 import edu.asu.diging.citesphere.core.zotero.IZoteroManager;
 import edu.asu.diging.citesphere.data.bib.CitationGroupRepository;
 import edu.asu.diging.citesphere.data.bib.ICitationDao;
+import edu.asu.diging.citesphere.model.bib.GilesStatus;
 import edu.asu.diging.citesphere.model.bib.ICitation;
 import edu.asu.diging.citesphere.model.bib.ICitationCollection;
 import edu.asu.diging.citesphere.model.bib.ICitationGroup;
+import edu.asu.diging.citesphere.model.bib.IGilesUpload;
 import edu.asu.diging.citesphere.model.bib.ItemType;
 import edu.asu.diging.citesphere.model.bib.impl.BibField;
 import edu.asu.diging.citesphere.model.bib.impl.CitationGroup;
 import edu.asu.diging.citesphere.model.bib.impl.CitationResults;
+import edu.asu.diging.citesphere.model.bib.impl.GilesUpload;
 import edu.asu.diging.citesphere.user.IUser;
 
 @Service
@@ -83,6 +96,12 @@ public class CitationManager implements ICitationManager {
 
     @Autowired
     private IAsyncCitationProcessor asyncCitationProcessor;
+
+    @Autowired
+    private IGilesConnector gilesConnector;
+
+    @Autowired
+    private GilesUploadChecker gilesUploadChecker;
 
     private Map<String, BiFunction<ICitation, ICitation, Integer>> sortFunctions;
 
@@ -494,4 +513,76 @@ public CitationPage getPrevAndNextCitation(IUser user, String groupId, String co
     public void deleteLocalGroupCitations(String groupId) {
         citationStore.deleteCitationByGroupId(groupId);
     }
+
+    @Override
+    public void reprocessFile(IUser user, String zoteroGroupId, String itemId, String documentId)
+            throws GroupDoesNotExistException, CannotFindCitationException, ZoteroHttpStatusException,
+            ZoteroConnectionException, CitationIsOutdatedException, ZoteroItemCreationFailedException {
+        ICitation citation = getCitation(user, zoteroGroupId, itemId);
+        List<IGilesUpload> uploadsToReprocess = citation.getGilesUploads().stream()
+        .filter(upload -> upload.getDocumentId() != null && upload.getDocumentId().equals(documentId)).collect(Collectors.toList());
+        for(IGilesUpload upload : uploadsToReprocess) {
+            initiateReprocessing(user, documentId, citation);
+        }
+    }
+
+    private void initiateReprocessing(IUser user, String documentId, ICitation citation) {
+        ResponseEntity<String> reprocessingResponse = gilesConnector.reprocessDocument(user, documentId);
+        if (reprocessingResponse.getStatusCode().equals(HttpStatus.OK)) {
+            IGilesUpload reprocessedUpload = new GilesUpload();
+            String responseBody = reprocessingResponse.getBody();
+            ObjectMapper objectMapper = new ObjectMapper();
+            String progressId = null;
+            try {
+                JsonNode jsonNode = objectMapper.readTree(responseBody);
+                progressId = jsonNode.get("id").asText();
+            } catch (IOException e) {
+                logger.error("Could not deserialize response.", e);
+            }
+            reprocessedUpload.setUploadingUser(user.getUsername());
+            reprocessedUpload.setProgressId(progressId);
+            Set<IGilesUpload> checkedUploads = new HashSet<>();
+            checkedUploads.add(reprocessedUpload);
+            updateReprocessedUpload(checkedUploads, user, citation, documentId);
+            gilesUploadChecker.add(citation);
+        }
+    }
+
+    private void updateReprocessedUpload(Set<IGilesUpload> checkedUploads, IUser user, ICitation citation, String documentId) {
+        ICitation currentCitation = getCurrentCitation(citation, user);
+        if (currentCitation != null) {
+            for (IGilesUpload upload : checkedUploads) {
+                Optional<IGilesUpload> oldUpload = currentCitation
+                        .getGilesUploads().stream()
+                        .filter(u -> u.getDocumentId() != null && u
+                                .getDocumentId().equals(documentId))
+                        .findFirst();
+                if (oldUpload.isPresent()) {
+                    currentCitation.getGilesUploads().remove(oldUpload.get());
+                }
+                currentCitation.getGilesUploads().add(upload);
+            }
+            try {
+                updateCitation(user, citation.getGroup(),
+                        currentCitation);
+            } catch (ZoteroConnectionException | CitationIsOutdatedException
+                    | ZoteroHttpStatusException | ZoteroItemCreationFailedException e) {
+                logger.error("Could not update citation.", e);
+            }
+        }
+    }
+
+    private ICitation getCurrentCitation(ICitation citation, IUser user) {
+        try {
+            return getCitation(user,
+                    citation.getGroup(), citation.getKey());
+        } catch (GroupDoesNotExistException e) {
+            logger.error("Could not get citation.", e);
+        } catch (CannotFindCitationException e) {
+            logger.error("Could not get citation.", e);
+        } catch (ZoteroHttpStatusException e) {
+            logger.error("Could not get citation.", e);
+        }
+        return null;
+    }
 }

citesphere/src/main/java/edu/asu/diging/citesphere/web/user/ItemController.java

@@ -5,16 +5,22 @@
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
+import org.springframework.social.zotero.exception.ZoteroConnectionException;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import edu.asu.diging.citesphere.core.exceptions.CannotFindCitationException;
+import edu.asu.diging.citesphere.core.exceptions.CitationIsOutdatedException;
 import edu.asu.diging.citesphere.core.exceptions.GroupDoesNotExistException;
 import edu.asu.diging.citesphere.core.exceptions.ZoteroHttpStatusException;
+import edu.asu.diging.citesphere.core.exceptions.ZoteroItemCreationFailedException;
 import edu.asu.diging.citesphere.core.search.service.SearchEngine;
 import edu.asu.diging.citesphere.core.service.ICitationManager;
 import edu.asu.diging.citesphere.core.service.impl.CitationPage;
@@ -66,4 +72,15 @@ public String getItem(Authentication authentication, Model model, @PathVariable(
         }
         return "auth/group/item";
     }
+
+    @RequestMapping(value = "/auth/group/{zoteroGroupId}/file/reprocess", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteFile(Authentication authentication,
+            @PathVariable("zoteroGroupId") String zoteroGroupId,
+            @RequestParam(value = "documentId", required = false) String documentId,
+            @RequestParam(value = "itemId", required = false) String itemId)
+            throws GroupDoesNotExistException, CannotFindCitationException, ZoteroHttpStatusException,
+            ZoteroConnectionException, CitationIsOutdatedException, ZoteroItemCreationFailedException {
+        citationManager.reprocessFile((IUser) authentication.getPrincipal(), zoteroGroupId, itemId, documentId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }

citesphere/src/main/resources/config.properties

@@ -88,5 +88,6 @@ elasticsearch.connect.timeout=${elasticsearch.connect.timeout}
 giles_upload_endpoint=/api/v2/files/upload
 giles_check_endpoint=/api/v2/files/upload/check/
 giles_file_endpoint=/api/v2/resources/files/{0}/content
+giles_file_reprocessing_endpoint=/api/v2/resources/documents/{0}/reprocess
 
 javers_default_author=${javers.default.author}