diff --git a/config.json b/config.json index cddfe38..e0d8aac 100644 --- a/config.json +++ b/config.json @@ -1,5 +1,5 @@ { - "apiUrl": "https://consent.dsde-consent-prod.broadinstitute.org/", + "apiUrl": "https://consent.dsde-consent-prod.broadinstitute.org/api/", "ontologyApiUrl": "https://consent-ontology.dsde-consent-prod.broadinstitute.org/", "clientId": "1019469328169-uk6592ph25b0nijc0nm7s2dss4qm2nbu.apps.googleusercontent.com", "gwasUrl":"http://epi.grants.cancer.gov/dac/examples.html" diff --git a/src/app/configuration/config.js b/src/app/configuration/config.js index 1aaee31..88b4ac0 100644 --- a/src/app/configuration/config.js +++ b/src/app/configuration/config.js @@ -1,5 +1,5 @@ angular.module('ConsentConfiguration', []) - .constant('apiUrl', "https://consent.dsde-consent-prod.broadinstitute.org/") + .constant('apiUrl', "https://consent.dsde-consent-prod.broadinstitute.org/api/") .constant('ontologyApiUrl', "https://consent-ontology.dsde-consent-prod.broadinstitute.org/") .constant('clientId', "1019469328169-uk6592ph25b0nijc0nm7s2dss4qm2nbu.apps.googleusercontent.com") .constant('gwasUrl', "http://epi.grants.cancer.gov/dac/examples.html"); diff --git a/swagger/consents-swagger.yaml b/swagger/consents-swagger.yaml index 7ecd5a1..c4d6504 100644 --- a/swagger/consents-swagger.yaml +++ b/swagger/consents-swagger.yaml @@ -734,15 +734,14 @@ paths: - name: dar in: body description: The fields that represent a DAR, json format. + required: true schema: - type: string + $ref: '#/definitions/DataAccessRequest' tags: - Data Access Request responses: '200': description: Returns the created Data Access Request, json file. - schema: - $ref: '#/definitions/DataAccessRequest' '500': description: Internal Server Error. get: @@ -823,7 +822,7 @@ paths: '200': description: 'Returns a DARModalDetailsDTO initialized with the DAR associated with the provided Id.' '/dar/find/{id}': - delete: + get: summary: describeSpecificFields description: Returns the requested fields present in the DAR identified by the ID parameters: @@ -847,7 +846,7 @@ paths: '404': description: The requested DAR couldn't be found. '/dar/find/{id}/consent': - delete: + get: summary: describeConsentForDAR description: Returns the consent related to this DAR. parameters: @@ -1923,6 +1922,111 @@ definitions: description: The datetime the election was created/updated (the last updated). DataAccessRequest: type: object + properties: + investigator: + type: string + description: 'Describes the name of the Principal Investigator.' + institution: + type: string + description: 'Describes the name of Institution.' + department: + type: string + description: 'Describes the name of the Institution Department.' + division: + type: string + description: 'Describes the name of the Division.' + address1: + type: string + description: 'Describes the principal address.' + address2: + type: string + description: 'Describes the secondary address. Optional.' + city: + type: string + description: 'Describes the name of the City.' + state: + type: string + description: 'Describes the name of the State.' + zipcode: + type: string + description: 'Describes the Zip Code number.' + country: + type: string + description: 'Describes the name of the Country.' + projectTitle: + type: string + description: 'Describes the Project Title.' + datasetId: + type: array + items: + type: string + description: 'Array of Dataset Ids.' + rus: + type: string + description: 'Describes the Research Use Statement.' + non_tech_rus: + type: string + description: 'Describes the Non Technical Summary.' + diseases: + type: boolean + description: 'Defines if the purpose of the study is disease-related.' + methods: + type: boolean + description: 'Defines if the purpose of the study is for Methods development.' + controls: + type: boolean + description: 'Defines if the purpose of the study is to increase the number of controls available for a comparison group.' + population: + type: boolean + description: 'Defines if the purpose of the study is to understand variation in the general population.' + other: + type: boolean + description: 'Defines if the purpose of the study is other than the above. If TRUE, triggers MANUAL REVIEW.' + othertext: + type: string + description: 'Describes above field.' + ontologies: + type: array + items: + type: string + description: 'Array of Ontologies.' + forProfit: + type: boolean + description: 'Describes if data will be used for commercial purposes.' + oneGender: + type: boolean + description: 'Describes if study is gender specific.' + pediatric: + type: boolean + description: 'Describes if study is restricted to a pediatric population.' + illegalbehave: + type: boolean + description: 'If TRUE, triggers MANUAL REVIEW.' + addiction: + type: boolean + description: 'If TRUE, triggers MANUAL REVIEW.' + sexualdiseases: + type: boolean + description: 'If TRUE, triggers MANUAL REVIEW.' + stigmatizediseases: + type: boolean + description: 'If TRUE, triggers MANUAL REVIEW.' + vulnerablepop: + type: boolean + description: 'If TRUE, triggers MANUAL REVIEW.' + popmigration: + type: boolean + description: 'If TRUE, triggers MANUAL REVIEW.' + psychtraits: + type: boolean + description: 'If TRUE, triggers MANUAL REVIEW.' + nothealth: + type: boolean + description: 'If TRUE, triggers MANUAL REVIEW.' + userId: + type: integer + format: int32 + description: 'Describes the id of the User (Researcher).' DataAccessRequestManage: type: object properties: diff --git a/swagger/ontology-swagger.yaml b/swagger/ontology-swagger.yaml index 5ec41ae..a8a3d1b 100644 --- a/swagger/ontology-swagger.yaml +++ b/swagger/ontology-swagger.yaml @@ -112,10 +112,28 @@ paths: - Autocomplete responses: '200': - description: The consent association representation is present in the body of the response. + description: Array of results. default: description: Unexpected error + '/search': + + get: + summary: search + description: Find ontologies based on the id. + parameters: + - name: id + in: query + description: The ontology id which the service us to find it (e.g. DOID_4). + required: true + type: string + tags: + - Search + responses: + '200': + description: The given id was found. Json result with ontology information. + default: + description: Unexpected error definitions: Restriction: @@ -153,3 +171,4 @@ definitions: items: type: string description: Array of ontologies. +