Q20-15 - story/Q20-15

quadriga/.classpath

@@ -34,5 +34,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

quadriga/pom.xml

@@ -20,9 +20,10 @@
         <admin.password>$2a$04$oQo44vqcDIFRoYKiAXoNheurzkwX9dcNmowvTX/hsWuBMwijqn44i</admin.password>
 
         <db.driver>com.mysql.jdbc.Driver</db.driver>
-        <db.database.url>jdbc-url-to-db</db.database.url>
-        <db.user>db-user</db.user>
-        <db.password>db-password</db.password>
+        <db.database.url>jdbc:mysql://localhost:3306/quadriga</db.database.url>
+        <db.user></db.user>
+        <db.password></db.password>
+
 
         <email.user></email.user>
         <email.password></email.password>
@@ -41,10 +42,19 @@
         <neo4j.url>http://neo4j:quadriga@localhost:7474/</neo4j.url>
         <neo4j.database>quadriga</neo4j.database>
 
-        <citesphere.base.url></citesphere.base.url>
+        <quadriga.base.url></quadriga.base.url>
+        <quadriga.jobstatus.api></quadriga.jobstatus.api>
+        <quadriga.collectionpage.url></quadriga.collectionpage.url>
+
+        <citesphere.base.url>https://diging-dev.asu.edu/citesphere-review/</citesphere.base.url>
+        <citesphere.client.id></citesphere.client.id>
+        <citesphere.client.secret></citesphere.client.secret>
+
         <citesphere.client.id></citesphere.client.id>
         <citesphere.client.secret></citesphere.client.secret>
 
+
+        <conceptpower.base.url></conceptpower.base.url>
         <log.level>info</log.level>
 
         <tomcat.deploy.path></tomcat.deploy.path>

quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/JobStatusController.java

@@ -0,0 +1,26 @@
+package edu.asu.diging.quadriga.api.v1;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import edu.asu.diging.quadriga.core.model.jobs.Job;
+import edu.asu.diging.quadriga.core.service.JobManager;
+
+public class JobStatusController {
+
+    @Autowired
+    private JobManager jobManager;
+
+
+    @GetMapping(value = "/api/v1/job/{jobId}/status")
+    public ResponseEntity<Job> getJobStatus(@PathVariable String jobId) {
+        Job job = jobManager.get(jobId);
+        if(job == null){
+            return new ResponseEntity<>(null,HttpStatus.NOT_FOUND);
+        }
+        return new ResponseEntity<>(job, HttpStatus.OK);
+    }       
+}

quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/MapGraphToTripleController.java

@@ -0,0 +1,119 @@
+package edu.asu.diging.quadriga.api.v1;
+
+import java.util.ArrayList;
+
+import java.util.List;
+
+import org.bson.types.ObjectId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import edu.asu.diging.quadriga.api.v1.model.PatternMapping;
+import edu.asu.diging.quadriga.api.v1.model.PatternMappingList;
+import edu.asu.diging.quadriga.core.model.EventGraph;
+import edu.asu.diging.quadriga.core.model.MappedTripleGroup;
+import edu.asu.diging.quadriga.core.model.jobs.Job;
+import edu.asu.diging.quadriga.core.service.AsyncPatternProcessor;
+import edu.asu.diging.quadriga.core.service.EventGraphService;
+import edu.asu.diging.quadriga.core.service.JobManager;
+
+@Controller
+public class MapGraphToTripleController {
+
+    @Value("${quadriga_base_url}")
+    private String quadrigaBaseUri;
+
+    @Value("${quadriga_job_status_api}")
+    private String quadrigaJobStatusUri;
+
+    @Value("${quadriga_collection_page}")
+    private String quadrigaCollectionPageUri;
+
+    @Autowired
+    private AsyncPatternProcessor asyncPatternProcessor;
+
+    @Autowired
+    private EventGraphService eventGraphService;
+
+    @Autowired
+    private JobManager jobManager;
+
+    @PostMapping(value = "/api/v1/collection/{collectionId}/network/map")
+    public ResponseEntity<List<JobPatternInfo>> mapPatternToTriples(@PathVariable String collectionId,
+            @RequestBody PatternMappingList patternMappingList) {
+
+        List<EventGraph> eventGraphs = eventGraphService.getEventGraphs(new ObjectId(collectionId));
+        if (eventGraphs == null) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+
+        List<JobPatternInfo> jobInfos = new ArrayList<>();
+
+        MappedTripleGroup mappedTripleGroup = new MappedTripleGroup();
+        mappedTripleGroup.set_id(new ObjectId());
+        mappedTripleGroup.setCollectionId(new ObjectId(collectionId));
+
+        String jobId = jobManager.createJob(collectionId, mappedTripleGroup.get_id().toString(), eventGraphs.size());
+
+        List<Thread> transformationThreads = new ArrayList<>();
+        for (PatternMapping pattern : patternMappingList.getPatternMappings()) {
+            Thread transformationThread = new Thread(() -> {
+                asyncPatternProcessor.processPattern(jobId, collectionId, pattern, eventGraphs);
+                JobPatternInfo jobInfo = new JobPatternInfo();
+                jobInfo.setJobId(jobId);
+                jobInfo.setTrack(quadrigaBaseUri + quadrigaJobStatusUri + jobId + "/status");
+                jobInfo.setExplore(quadrigaBaseUri + quadrigaCollectionPageUri + collectionId);
+                jobInfos.add(jobInfo);
+            });
+            transformationThreads.add(transformationThread);
+            transformationThread.start();
+        }
+        for (Thread thread : transformationThreads) {
+            try {
+                thread.join();
+            } catch (InterruptedException e) {
+                System.out.println("Job thread was interrupted due to the exception:"+e);
+            }
+        }
+        return new ResponseEntity<>(jobInfos, HttpStatus.OK);
+    }
+
+    @GetMapping(value = "/api/v1/job/{jobId}/status")
+    public ResponseEntity<Job> getJobStatus(@PathVariable String jobId) {
+        return new ResponseEntity<>(jobManager.get(jobId), HttpStatus.OK);
+    }
+
+    class JobPatternInfo {
+        private String jobId;
+        private String track;
+        private String explore;
+
+        public String getJobId() {
+            return jobId;
+        }
+        public void setJobId(String jobId) {
+            this.jobId = jobId;
+        }
+        public String getTrack() {
+            return track;
+        }
+        public void setTrack(String track) {
+            this.track = track;
+        }
+        public String getExplore() {
+            return explore;
+        }
+        public void setExplore(String explore) {
+            this.explore = explore;
+        }
+
+    }
+
+}

quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/model/PatternMapping.java

@@ -0,0 +1,38 @@
+package edu.asu.diging.quadriga.api.v1.model;
+
+import java.util.List;
+import java.util.Map;
+
+public class PatternMapping {
+
+    private String mappedTripleGroupId;
+    private Metadata metadata;
+    private Map<String, PatternNodeData> nodes;
+    private List<Edge> edges;
+
+    public String getMappedTripleGroupId() {
+        return mappedTripleGroupId;
+    }
+    public void setMappedTripleGroupId(String mappedTripleGroupId) {
+        this.mappedTripleGroupId = mappedTripleGroupId;
+    }
+    public Metadata getMetadata() {
+        return metadata;
+    }
+    public void setMetadata(Metadata metadata) {
+        this.metadata = metadata;
+    }
+    public Map<String, PatternNodeData> getNodes() {
+        return nodes;
+    }
+    public void setNodes(Map<String, PatternNodeData> nodes) {
+        this.nodes = nodes;
+    }
+    public List<Edge> getEdges() {
+        return edges;
+    }
+    public void setEdges(List<Edge> edges) {
+        this.edges = edges;
+    }
+
+}

quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/model/PatternMappingList.java

@@ -0,0 +1,17 @@
+package edu.asu.diging.quadriga.api.v1.model;
+
+import java.util.List;
+
+public class PatternMappingList {
+
+    private List<PatternMapping> patternMappings;
+
+    public List<PatternMapping> getPatternMappings() {
+        return patternMappings;
+    }
+
+    public void setPatternMappings(List<PatternMapping> patternMappings) {
+        this.patternMappings = patternMappings;
+    }
+
+}

quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/model/PatternNodeData.java

@@ -0,0 +1,28 @@
+package edu.asu.diging.quadriga.api.v1.model;
+
+public class PatternNodeData {
+
+    private String type;
+    private String interpretation;
+    private String conceptType;
+
+    public String getType() {
+        return type;
+    }
+    public void setType(String type) {
+        this.type = type;
+    }
+    public String getInterpretation() {
+        return interpretation;
+    }
+    public void setInterpretation(String interpretation) {
+        this.interpretation = interpretation;
+    }
+    public String getConceptType() {
+        return conceptType;
+    }
+    public void setConceptType(String conceptType) {
+        this.conceptType = conceptType;
+    }
+
+}

quadriga/src/main/java/edu/asu/diging/quadriga/config/PersistenceConfig.java

@@ -70,7 +70,7 @@ public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
     Properties additionalProperties() {
         Properties properties = new Properties();
         properties.setProperty("hibernate.hbm2ddl.auto", "update");
-        properties.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQL5Dialect");
+        properties.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQL8Dialect");
         properties.setProperty("hibernate.show_sql", "true");
         properties.setProperty("hibernate.id.new_generator_mappings", "true");
 

quadriga/src/main/java/edu/asu/diging/quadriga/config/RootConfig.java

@@ -16,9 +16,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @Configuration
+@EnableAsync
 @EnableCaching
 @EnableWebMvc
 @EnableAspectJAutoProxy

quadriga/src/main/java/edu/asu/diging/quadriga/core/conceptpower/ConceptpowerConnector.java

@@ -0,0 +1,22 @@
+package edu.asu.diging.quadriga.core.conceptpower;
+
+import edu.asu.diging.quadriga.core.model.conceptpower.ConceptEntry;
+import edu.asu.diging.quadriga.core.model.conceptpower.ConceptpowerResponse;
+
+public interface ConceptpowerConnector {
+
+    /**
+     * Retrieves the concept for the given id from Conceptpower
+     * @param id is the concept id
+     * @return the retrieved concept
+     */
+    ConceptEntry getConceptEntry(String id);
+
+    /**
+     * Retrieves the concept entries which are equal to the given interpretation
+     * @param uri URI of interpretation
+     * @return the retrieved results
+     */
+    ConceptpowerResponse findConceptEqualTo(String uri);
+
+}