8000 Exposed features for external services by VojtechLunak · Pull Request #92 · kbss-cvut/record-manager · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Exposed features for external services #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package cz.cvut.kbss.study.rest;

import cz.cvut.kbss.study.exception.NotFoundException;
import cz.cvut.kbss.study.model.PatientRecord;
import cz.cvut.kbss.study.model.RecordPhase;
import cz.cvut.kbss.study.service.PatientRecordService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/external")
public class ExternalServicesController {
private final PatientRecordService recordService;

public ExternalServicesController(PatientRecordService recordService) {
this.recordService = recordService;
}

@GetMapping(value = "/open/{key}")
public void openRecord(@PathVariable("key") String recordId) {
PatientRecord record = findInternal(recordId);
record.setPhase(RecordPhase.open);
recordService.updateFromExternal(record);
}

@GetMapping(value = "/open/all")
public void openAllRecords() {
recordService.findAll().forEach(record -> {
record.setPhase(RecordPhase.open);
recordService.updateFromExternal(record);
});
}

private PatientRecord findInternal(String key) {
final PatientRecord record = recordService.findByKey(key);
if (record == null) {
throw NotFoundException.create("PatientRecord", key);
}
return record;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,5 @@ public interface PatientRecordService extends BaseService<PatientRecord> {
void setPhase(Set<String> recordUris, RecordPhase targetPhase);


void updateFromExternal(PatientRecord record);
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ protected void prePersist(PatientRecord instance) {
recordDao.requireUniqueNonEmptyLocalName(instance);
}

@Transactional
@Override
public void updateFromExternal(PatientRecord instance) {
if(instance.getPhase() != RecordPhase.rejected) {
instance.setRejectReason(null);
}
instance.setLastModified(new Date());
recordDao.requireUniqueNonEmptyLocalName(instance);
recordDao.update(instance);
}

@Override
protected void preUpdate(PatientRecord instance) {
if(instance.getPhase() != RecordPhase.rejected) {
Expand Down
36 changes: 28 additions & 8 deletions src/main/resources/query/findFormTemplates.rq
Original file line number Diff line number Diff line change
@@ -1,14 +1,34 @@
prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
prefix form: <http://onto.fel.cvut.cz/ontologies/form/>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX form: <http://onto.fel.cvut.cz/ontologies/form/>
PREFIX dct: <http://purl.org/dc/terms/>

CONSTRUCT {
?formTemplate a form:form-template .
?formTemplate rdfs:label ?formTemplateLabel .
?formTemplate rdfs:comment ?formTemplateComment .
?formTemplate a form:form-template .
?formTemplate rdfs:label ?formTemplateLabel .
?formTemplate rdfs:comment ?formTemplateComment .
?formTemplate dct:hasVersion ?formTemplateVersion .
} WHERE {
GRAPH ?formTemplate {
?formTemplate a form:form-template .
{
SELECT ?origin (MAX(?created) AS ?latestCreated)
WHERE {
GRAPH ?g {
?template a form:form-template ;
form:has-question-origin ?origin ;
dct:created ?created .
}
}
GROUP BY ?origin
}

GRAPH ?g {
?formTemplate a form:form-template ;
form:has-question-origin ?origin ;
dct:created ?created .

FILTER (?created = ?latestCreated)

?formTemplate rdfs:label ?formTemplateLabel .
?formTemplate rdfs:comment ?formTemplateComment .
OPTIONAL { ?formTemplate dct:hasVersion ?formTemplateVersion . }
}
}
}
0