Skip to content

Add properties and individuals endpoints for ols4 v1 controller #186

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.

Sign up for GitHub

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
jusa3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add properties and individuals endpoints for ols4 v1 controller #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 33 additions & 0 deletions src/main/java/org/semantics/apigateway/controller/ols/Ols3Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.ws.rs.QueryParam;
import org.semantics.apigateway.api.OlsTransformer;
import org.semantics.apigateway.artefacts.data.ArtefactsDataService;
import org.semantics.apigateway.artefacts.metadata.ArtefactsService;
import org.semantics.apigateway.artefacts.search.SearchService;
Expand All @@ -10,6 +11,8 @@
import org.semantics.apigateway.model.user.User;
import org.semantics.apigateway.service.auth.AuthService;
import org.springdoc.core.annotations.ParameterObject;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*;

Expand All @@ -25,6 +28,8 @@ public class Ols3Controller {
private final ArtefactsService artefactsService;
private final ArtefactsDataService artefactsDataService;
private final AuthService authService;

private final OlsTransformer olsTransformer = new OlsTransformer(); // TODO This breaks decoupling. Better pass original request through the services, so that we know how to construct the response in the transformers.

public Ols3Controller(SearchService searchService, ArtefactsService artefactsService, ArtefactsDataService artefactsDataService, AuthService authService) {
this.searchService = searchService;
Expand Down Expand Up @@ -95,5 +100,33 @@ public Object getArtefactsInOLSTargetDBSchema(@ParameterObject CommonRequestPara
User user = authService.tryGetCurrentUser();
return this.artefactsService.getArtefacts(params, user, null);
}

@CrossOrigin
@GetMapping("/ontologies/{onto}/individuals")
public Object getAllIndividualsForOntologyInOLSTargetDBSchema(@PathVariable String onto, @ParameterObject CommonRequestParams params, @PageableDefault(page = 0, size = 20) Pageable pageable, @QueryParam("iri") String iri) {
if (iri == null) return artefactsDataService.getArtefactIndividuals(onto, params, pageable.getPageNumber() + 1, null, authService.tryGetCurrentUser());
AggregatedApiResponse response = (AggregatedApiResponse) artefactsDataService.getArtefactIndividual(onto, iri, params, null, authService.tryGetCurrentUser());
return olsTransformer.constructResponse(response.getCollection(), "individuals", true, true, 1, response.getCollection().size());
}

@CrossOrigin
@GetMapping("/ontologies/{onto}/individuals/{individual}")
public Object getIndividualForOntologyInOLSTargetDBSchema(@PathVariable String onto, @PathVariable String individual, @ParameterObject CommonRequestParams params) {
return artefactsDataService.getArtefactIndividual(onto, individual, params, null, authService.tryGetCurrentUser());
}

@CrossOrigin
@GetMapping("/ontologies/{onto}/properties")
public Object getPropertiesForOntologyInOLSTargetDBSchema(@PathVariable String onto, @ParameterObject CommonRequestParams params, @PageableDefault(page = 0, size = 20) Pageable pageable, @QueryParam("iri") String iri) {
if (iri == null) return artefactsDataService.getArtefactProperties(onto, params, pageable.getPageNumber() + 1, null, authService.tryGetCurrentUser());
AggregatedApiResponse response = (AggregatedApiResponse) artefactsDataService.getArtefactProperty(onto, iri, params, null, authService.tryGetCurrentUser());
return olsTransformer.constructResponse(response.getCollection(), "properties", true, true, 1, response.getCollection().size());
}

@CrossOrigin
@GetMapping("/ontologies/{onto}/properties/{property}")
public Object getPropertyInOLSTargetDBSchema(@PathVariable String onto, @PathVariable String property, @ParameterObject CommonRequestParams params) {
return artefactsDataService.getArtefactProperty(onto, property, params, null, authService.tryGetCurrentUser());
}
}

Loading