Skip to content
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

RCS org changes #1042

Merged
merged 17 commits into from
Dec 12, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Updated homepage project activities indexing to use projectActivitySe…
…rvice, project activities now only return a subset of required fields
  • Loading branch information
jack-brinkman authored and temi committed Nov 26, 2024
commit 144ddd0a39cd0dad58b802979f1b79ef92da5f49
Original file line number Diff line number Diff line change
@@ -1166,7 +1166,16 @@ class ElasticSearchService {
// todo: Check if BioCollect requires all sites in `sites` property. If no, merge `projectArea` with `sites`.
projectMap.projectArea = siteService.getSimpleProjectArea(projectMap.projectSiteId)
projectMap.containsActivity = activityService.searchAndListActivityDomainObjects([projectId: projectMap.projectId], null, null, null, [max: 1, offset: 0])?.totalCount > 0
projectMap.activities = activityService.findAllForProjectId(project.projectId, LevelOfDetail.NO_OUTPUTS.name()).findAll({ it.status == "active" })
projectMap.projectActivities = projectActivityService.getAllByProject(project.projectId).collect({
[
id: it.id,
projectId: it.projectId,
projectActivityId: it.projectActivityId,
name: it.name,
startDate: it.startDate,
endDate: it.endDate,
]
})
}
projectMap.sites?.each { site ->
// Not useful for the search index and there is a bug right now that can result in invalid POI