Skip to content
This repository has been archived by the owner on Dec 18, 2023. It is now read-only.

Pack flag for /v2/observations #121

Open
wants to merge 40 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
3e631bb
Add plugins for subscription job triggering and email sending
ewelinagr Dec 19, 2017
f1e4890
Add query subscription controllers and services
ewelinagr Dec 20, 2017
ffae3c1
Add userQuery related changes for query subscription
ewelinagr Dec 20, 2017
54ca3e2
Add query subscription tables, update query table
ewelinagr Dec 21, 2017
e1c6d33
Add new query subscription tables to ddl tables declatations
ewelinagr Dec 21, 2017
e533735
Add scanning for query result changes
ewelinagr Dec 22, 2017
eeb0ae0
Add max number of queryDiff results parameter for pagination
ewelinagr Dec 28, 2017
b98a466
Add swagger doc for query subscription endpoints
ewelinagr Dec 28, 2017
f09ae0e
Add tests and improvements for query subscription
ewelinagr Dec 29, 2017
84e6153
Refactor QueryDiffService methods
ewelinagr Dec 29, 2017
1a80e50
Rename QueryDiffSubscriptionService to QueryDiffSubscriptionMailService
ewelinagr Jan 4, 2018
8232d1e
Refactor ChangeFlag and SubscriptionFrequency enums
ewelinagr Jan 4, 2018
490316f
Minor refactoring
ewelinagr Jan 4, 2018
45612f4
Fix MultidimensionalDataResourceService.findQueryResultByConstraint m…
ewelinagr Jan 4, 2018
9b3b001
Fix updating patientSet QueryResults
ewelinagr Jan 4, 2018
8d62864
Add integration tests for query subscription
ewelinagr Jan 8, 2018
90d9030
Add email-sending job disabled by default
ewelinagr Jan 10, 2018
8dbd390
Fix returning empty query_diffs list
ewelinagr Jan 17, 2018
79209a7
Fix result of /v2/query_diffs/scan call
ewelinagr Jan 17, 2018
c1eca18
Fix finding patientSet by constraints
ewelinagr Jan 17, 2018
b226033
Refactor subscription email body building
ewelinagr Jan 17, 2018
27aebaa
Fix updating subscription_freq for user queries
ewelinagr Jan 18, 2018
6062d73
Change the query subscription feature implementation
ewelinagr Jan 22, 2018
ae5a7b0
Fix swagger doc
ewelinagr Jan 22, 2018
e6f396d
Fix scan call
ewelinagr Jan 22, 2018
2709763
Update core-db integration tests for query subscription
ewelinagr Jan 22, 2018
db351d6
Fix an email service
ewelinagr Jan 23, 2018
783e053
Fix tabs in Makefile
ewelinagr Jan 24, 2018
8bcd9e2
Add UserQuerySet marshallers
ewelinagr Jan 31, 2018
d3d37b1
Remove duplicated access check in UserQuerySetService
ewelinagr Jan 31, 2018
4b185d6
Use enums instead of strings for userQueries
ewelinagr Feb 5, 2018
f2a960e
Fix query restrictions for daily/weekly jobs
ewelinagr Feb 16, 2018
fbcb337
Query subscription refactoring
ewelinagr Feb 16, 2018
e417f50
Remove build config.
Feb 28, 2018
d19a670
Merge branch 'transmart-17.1-RC' into release
Mar 6, 2018
abb4ad1
Set snapshot version and repo.
Mar 6, 2018
2d7f390
Merge branch 'query_subscription' into dev
Mar 6, 2018
9725f40
Fix transmart-core-api version.
Mar 6, 2018
1a465f3
Merge pull request #49 from thehyve/docs-clinical
forus Mar 7, 2018
a3614c3
Pack flag for /v2/observations
JanKanis Dec 4, 2017
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ apply plugin: 'idea'
apply plugin: 'maven-publish'

ext {
transmartVersion = '17.1-RC7'
transmartVersion = '17.12-SNAPSHOT'

assetPipelineVersion = '2.11.6'
gradleWrapperVersion = '2.13'
Expand Down Expand Up @@ -126,7 +126,7 @@ subprojects { project ->
repositories {
maven {
name "nl.thehyve.nexus"
url "https://repo.thehyve.nl/content/repositories/releases/"
url "https://repo.thehyve.nl/content/repositories/snapshots/"
}
}
}
Expand Down
183 changes: 181 additions & 2 deletions open-api/swagger.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"version": 2,
"version": "2.1-dev",
"title": "Transmart",
"license": {
"name": "Apache 2.0",
Expand Down Expand Up @@ -2029,7 +2029,7 @@
},
"/v2/export/{jobId}/status": {
"get": {
"description": "Gets a status of specified data export job.\n",
"description": "Gets a status of specified data export job. Deprecated. Use /v2/export/{jobId} instead.\n",
"tags": [
"v2"
],
Expand All @@ -2052,6 +2052,73 @@
}
}
},
"/v2/export/{jobId}": {
"get": {
"description": "Gets an export job.\n",
"tags": [
"v2"
],
"parameters": [
{
"name": "jobId",
"required": true,
"in": "path",
"description": "Id of the export job.",
"type": "string"
}
],
"responses": {
"200": {
"description": "an object with the export job.\n",
"schema": {
"$ref": "#/definitions/export_job"
}
}
}
},
"delete": {
"description": "Deletes an export job.\n",
"tags": [
"v2"
],
"parameters": [
{
"name": "jobId",
"required": true,
"in": "path",
"description": "Id of the export job.",
"type": "string"
}
],
"responses": {
"200": {
"description": "200 http status when job has been deleted.\n"
}
}
}
},
"/v2/export/{jobId}/cancel": {
"post": {
"description": "Cancels an export job.\n",
"tags": [
"v2"
],
"parameters": [
{
"name": "jobId",
"required": true,
"in": "path",
"description": "Id of the export job.",
"type": "string"
}
],
"responses": {
"200": {
"description": "200 http status when job has been cancelled.\n"
}
}
}
},
"/v2/export/jobs": {
"get": {
"description": "Gets all export jobs accessible by the user.\n",
Expand Down Expand Up @@ -2190,6 +2257,12 @@
},
"bookmarked": {
"type": "boolean"
},
"subscribed": {
"type": "boolean"
},
"subscriptionFreq": {
"type": "string"
}
}
}
Expand Down Expand Up @@ -2258,6 +2331,12 @@
},
"bookmarked": {
"type": "boolean"
},
"subscribed": {
"type": "boolean"
},
"subscriptionFreq": {
"type": "string"
}
}
}
Expand Down Expand Up @@ -2288,6 +2367,60 @@
}
}
}
},
"/v2/queries/{queryId}/sets": {
"get": {
"description": "Gets a list of query result change entries by query id.\nHistory of data changes for specific query.\n",
"tags": [
"v2"
],
"parameters": [
{
"name": "queryId",
"required": true,
"in": "path",
"description": "Id of a user query.",
"type": "integer"
}
],
"responses": {
"200": {
"description": "an object that contains an array of all querySets related to the query with a set change history.\n",
"schema": {
"type": "object",
"properties": {
"querySets": {
"type": "array",
"items": {
"$ref": "#/definitions/userQuerySet"
}
}
}
}
}
}
}
},
"/v2/queries/sets/scan": {
"post": {
"description": "Scans for changes in results of the stored user queries and updates stored sets.\nOnly for administrators.\n",
"tags": [
"v2"
],
"responses": {
"201": {
"description": "Successful response",
"schema": {
"type": "object",
"properties": {
"numberOfUpdatedSets": {
"type": "integer"
}
}
}
}
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -3043,6 +3176,12 @@
"bookmarked": {
"type": "boolean"
},
"subscribed": {
"type": "boolean"
},
"subscriptionFreq": {
"type": "string"
},
"createDate": {
"type": "string",
"format": "date-time"
Expand All @@ -3053,6 +3192,42 @@
}
}
},
"userQuerySet": {
"type": "object",
"properties": {
"id": {
"type": "integer"
},
"queryId": {
"type": "integer"
},
"queryName": {
"type": "string"
},
"setSize": {
"type": "integer"
},
"setTyp": {
"type": "string"
},
"createDate": {
"type": "string",
"format": "date-time"
},
"objectsAdded": {
"type": "array",
"items": {
"type": "integer"
}
},
"objectsRemoved": {
"type": "array",
"items": {
"type": "integer"
}
}
}
},
"AggregatesMap": {
"type": "object",
"description": "Map from string to aggregates.",
Expand Down Expand Up @@ -3103,6 +3278,10 @@
"additionalProperties": {
"type": "number"
}
},
"nullValueCounts": {
"description": "count of null values",
"type": "number"
}
}
}
Expand Down
Loading