Feature/issue1659 #1663
Feature/issue1659 #1663
Conversation
| @@ -1820,6 +1820,12 @@ class BioActivityController { | |||
| in = ParameterIn.PATH, | |||
| required = true, | |||
| description = "Activity id" | |||
| ), | |||
| @Parameter( | |||
| name = "includeSiteData", | |||
There was a problem hiding this comment.
add includeSiteData as a query parameter.
| @@ -1872,6 +1878,10 @@ class BioActivityController { | |||
| model.error = "No project associated with the activity" | |||
| } else if (projectService.isUserAdminForProject(userId, projectId) || activityService.isUserOwnerForActivity(userId, activity?.activityId)) { | |||
| model = [activity: activity] | |||
| if (includeSiteData) { | |||
| model = activityAndOutputModel(activity, activity.projectId) | |||
There was a problem hiding this comment.
we don't want to add all the information supplied by activityAndOutputModel. Instead add a property site with values name, siteId and geoJSON. Use siteService.get(model.activity.siteId, [view: 'brief', version: version]).
There was a problem hiding this comment.
Hi @temi , do I need to add this as well?
model.mapFeatures = model.site ? siteService.getMapFeatures(model.site) : []
There was a problem hiding this comment.
No. The output should look like below.
{
"activity" : {
"activityId": "...",
"site": {
"name": "...",
"siteId": "...",
"geoJson": {}
}
}
}
| @@ -1862,6 +1862,9 @@ class BioActivityController { | |||
| ) | |||
| @Path("ws/bioactivity/data/simplified/{id}/{includeSiteData}") | |||
There was a problem hiding this comment.
this needs to be updated as well.
| @@ -1879,7 +1882,7 @@ class BioActivityController { | |||
| } else if (projectService.isUserAdminForProject(userId, projectId) || activityService.isUserOwnerForActivity(userId, activity?.activityId)) { | |||
| model = [activity: activity] | |||
| if (includeSiteData) { | |||
| model = activityAndOutputModel(activity, activity.projectId) | |||
| model.site = model.activity?.siteId ? siteService.get(model.activity.siteId, [view:'brief']) : null | |||
There was a problem hiding this comment.
siteService.get() returns a lot of properties. Use collect to return only necessary properties.
There was a problem hiding this comment.
@temi what can i use to get the values for geoJson?
if (includeSiteData) {
model.site = siteService.get(activity.siteId).collect {
[
siteId: it.siteId,
name : it.name
]
}
}
There was a problem hiding this comment.
geoJSON can be found in property geoIndex.
| @@ -1871,6 +1881,10 @@ class BioActivityController { | |||
| } else if (!projectId) { | |||
| model.error = "No project associated with the activity" | |||
| } else if (projectService.isUserAdminForProject(userId, projectId) || activityService.isUserOwnerForActivity(userId, activity?.activityId)) { | |||
| if (includeSiteData) { | |||
| activity.site = new JSONObject([siteId:activity.site.siteId, name:activity.site.name, geoJson:activity.site.geoIndex]) | |||
| activity.remove('siteId') | |||
| @@ -310,7 +310,7 @@ class ProjectSearchResponse { | |||
| List<Facet> facets | |||
| } | |||
|
|
|||
| // classes for "ws/bioactivity/data/simplified/{id} | |||
| // classes for "ws/bioactivity/data/simplified/{id}/{includeSiteData} | |||
|
Still failing |
but even the dev branch is also failing.. |
|
https://github.com/AtlasOfLivingAustralia/biocollect/blob/feature/issue1659/gradle.properties#L1 increase to snapshot version |
No description provided.