Skip to content
Snippets Groups Projects
Unverified Commit 177edbc3 authored by Martin Weise's avatar Martin Weise
Browse files

Updated semantics service

parent b9f456a2
No related branches found
No related tags found
No related merge requests found
Pipeline #3444 passed
Stage: configure
Stage: build
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2223 additions and 1046 deletions
swagger/analyse/api.yaml
+ 1
− 1
View file @ 177edbc3
{"definitions":{},"info":{"contact":{"email":"andreas.rauber@tuwien.ac.at","name":"Prof. Andreas Rauber"},"description":"Service that analyses data structures","license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0"},"title":"Database Repository Analyse Service API","version":"1.1.0-alpha"},"openapi":"3.0.0","paths":{"/api/analyse/determinedt":{"post":{"consumes":["application/json"],"description":"This is a simple API which returns the datatypes of a (path) csv file","parameters":[{"description":"to-do description","in":"body","name":"body","required":true,"schema":{"properties":{"enum":{"example":true,"type":"boolean"},"enum_tol":{"example":0.1},"filepath":{"example":"/data/testdt08.csv","type":"string"},"separator":{"example":",","type":"string"}},"type":"object"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Determine datatypes"}},"/api/analyse/determinepk":{"post":{"consumes":["application/json"],"description":"This is a simple API which returns the primary keys + ranking of a (path) csv file","parameters":[{"description":"to-do description","in":"body","name":"body","required":true,"schema":{"properties":{"filepath":{"example":"/data/testdt08.csv","type":"string"},"seperator":{"example":",","type":"string"}},"type":"object"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Determine primary keys"}}},"servers":[{"description":"Generated server url","url":"http://localhost:5000"}]} {"definitions":{},"info":{"contact":{"email":"andreas.rauber@tuwien.ac.at","name":"Prof. Andreas Rauber"},"description":"Service that analyses data structures","license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0"},"title":"Database Repository Analyse Service API","version":"1.1.0-alpha"},"openapi":"3.0.0","paths":{"/api/analyse/determinedt":{"post":{"consumes":["application/json"],"description":"This is a simple API which returns the datatypes of a (path) csv file","parameters":[{"description":"to-do description","in":"body","name":"body","required":true,"schema":{"properties":{"enum":{"example":true,"type":"boolean"},"enum_tol":{"example":0.1},"filepath":{"example":"/data/testdt08.csv","type":"string"},"separator":{"example":",","type":"string"}},"type":"object"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Determine datatypes"}},"/api/analyse/determinepk":{"post":{"consumes":["application/json"],"description":"This is a simple API which returns the primary keys + ranking of a (path) csv file","parameters":[{"description":"to-do description","in":"body","name":"body","required":true,"schema":{"properties":{"filepath":{"example":"/data/testdt08.csv","type":"string"},"seperator":{"example":",","type":"string"}},"type":"object"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Determine primary keys"}}},"servers":[{"description":"Generated server url","url":"http://localhost:5000"},{"description":"DBRepo Sandbox","url":"https://dbrepo2.tuwien.ac.at:5000"}]}
swagger/api-analyse.yaml
+ 1
− 1
View file @ 177edbc3
{"definitions":{},"info":{"contact":{"email":"andreas.rauber@tuwien.ac.at","name":"Prof. Andreas Rauber"},"description":"Service that analyses data structures","license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0"},"title":"Database Repository Analyse Service API","version":"1.1.0-alpha"},"openapi":"3.0.0","paths":{"/api/analyse/determinedt":{"post":{"consumes":["application/json"],"description":"This is a simple API which returns the datatypes of a (path) csv file","parameters":[{"description":"to-do description","in":"body","name":"body","required":true,"schema":{"properties":{"enum":{"example":true,"type":"boolean"},"enum_tol":{"example":0.1},"filepath":{"example":"/data/testdt08.csv","type":"string"},"separator":{"example":",","type":"string"}},"type":"object"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Determine datatypes"}},"/api/analyse/determinepk":{"post":{"consumes":["application/json"],"description":"This is a simple API which returns the primary keys + ranking of a (path) csv file","parameters":[{"description":"to-do description","in":"body","name":"body","required":true,"schema":{"properties":{"filepath":{"example":"/data/testdt08.csv","type":"string"},"seperator":{"example":",","type":"string"}},"type":"object"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Determine primary keys"}}},"servers":[{"description":"Generated server url","url":"http://localhost:5000"}]} {"definitions":{},"info":{"contact":{"email":"andreas.rauber@tuwien.ac.at","name":"Prof. Andreas Rauber"},"description":"Service that analyses data structures","license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0"},"title":"Database Repository Analyse Service API","version":"1.1.0-alpha"},"openapi":"3.0.0","paths":{"/api/analyse/determinedt":{"post":{"consumes":["application/json"],"description":"This is a simple API which returns the datatypes of a (path) csv file","parameters":[{"description":"to-do description","in":"body","name":"body","required":true,"schema":{"properties":{"enum":{"example":true,"type":"boolean"},"enum_tol":{"example":0.1},"filepath":{"example":"/data/testdt08.csv","type":"string"},"separator":{"example":",","type":"string"}},"type":"object"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Determine datatypes"}},"/api/analyse/determinepk":{"post":{"consumes":["application/json"],"description":"This is a simple API which returns the primary keys + ranking of a (path) csv file","parameters":[{"description":"to-do description","in":"body","name":"body","required":true,"schema":{"properties":{"filepath":{"example":"/data/testdt08.csv","type":"string"},"seperator":{"example":",","type":"string"}},"type":"object"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Determine primary keys"}}},"servers":[{"description":"Generated server url","url":"http://localhost:5000"},{"description":"DBRepo Sandbox","url":"https://dbrepo2.tuwien.ac.at:5000"}]}
swagger/api-authentication.yaml
+ 70
− 41
View file @ 177edbc3
...@@ -1378,18 +1378,19 @@ paths: ...@@ -1378,18 +1378,19 @@ paths:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"200": "200":
description: OK description: OK
/api/user/token/{hash}: /api/user/token/{id}:
delete: delete:
tags: tags:
- token-endpoint - token-endpoint
summary: Delete developer token summary: Delete developer token
operationId: delete operationId: delete
parameters: parameters:
- name: hash - name: id
in: path in: path
required: true required: true
schema: schema:
type: string type: integer
format: int64
responses: responses:
"417": "417":
description: Expectation Failed description: Expectation Failed
...@@ -1579,10 +1580,8 @@ components: ...@@ -1579,10 +1580,8 @@ components:
- paused - paused
- exited - exited
- dead - dead
databases: database:
type: array $ref: '#/components/schemas/DatabaseDto'
items:
$ref: '#/components/schemas/DatabaseDto'
image: image:
$ref: '#/components/schemas/ImageBriefDto' $ref: '#/components/schemas/ImageBriefDto'
port: port:
...@@ -1599,17 +1598,20 @@ components: ...@@ -1599,17 +1598,20 @@ components:
type: string type: string
CreatorDto: CreatorDto:
required: required:
- created - firstname
- id - id
- name - lastname
type: object type: object
properties: properties:
id: id:
type: integer type: integer
format: int64 format: int64
name: firstname:
type: string
example: Josiah
lastname:
type: string type: string
example: "Carberry, Josiah" example: Carberry
affiliation: affiliation:
type: string type: string
example: Wesleyan University example: Wesleyan University
...@@ -1619,13 +1621,30 @@ components: ...@@ -1619,13 +1621,30 @@ components:
created: created:
type: string type: string
format: date-time format: date-time
last_modified: lastModified:
type: string
format: date-time
DatabaseAccessDto:
required:
- type
- user
type: object
properties:
user:
$ref: '#/components/schemas/UserDto'
type:
type: string
enum:
- read
- write_own
- write_all
created:
type: string type: string
format: date-time format: date-time
DatabaseDto: DatabaseDto:
required: required:
- creator - creator
- exchange - exchange_name
- id - id
- internal_name - internal_name
- name - name
...@@ -1637,9 +1656,6 @@ components: ...@@ -1637,9 +1656,6 @@ components:
name: name:
type: string type: string
example: Air Quality example: Air Quality
exchange:
type: string
example: air_quality
creator: creator:
$ref: '#/components/schemas/UserBriefDto' $ref: '#/components/schemas/UserBriefDto'
identifier: identifier:
...@@ -1655,12 +1671,16 @@ components: ...@@ -1655,12 +1671,16 @@ components:
$ref: '#/components/schemas/ImageDto' $ref: '#/components/schemas/ImageDto'
container: container:
$ref: '#/components/schemas/ContainerDto' $ref: '#/components/schemas/ContainerDto'
accesses:
type: array
items:
$ref: '#/components/schemas/DatabaseAccessDto'
created: created:
type: string type: string
format: date-time format: date-time
deleted: exchange_name:
type: string type: string
format: date-time example: dbrepo/4/4
internal_name: internal_name:
type: string type: string
example: weather_australia example: weather_australia
...@@ -1676,7 +1696,6 @@ components: ...@@ -1676,7 +1696,6 @@ components:
IdentifierDto: IdentifierDto:
required: required:
- container id - container id
- creator
- creators - creators
- database id - database id
- execution - execution
...@@ -1725,8 +1744,6 @@ components: ...@@ -1725,8 +1744,6 @@ components:
publisher: publisher:
type: string type: string
example: TU Wien example: TU Wien
creator:
$ref: '#/components/schemas/UserDto'
language: language:
type: string type: string
enum: enum:
...@@ -2175,15 +2192,13 @@ components: ...@@ -2175,15 +2192,13 @@ components:
created: created:
type: string type: string
format: date-time format: date-time
deleted:
type: string
format: date-time
last_modified: last_modified:
type: string type: string
format: date-time format: date-time
TableBriefDto: TableBriefDto:
required: required:
- creator - creator
- description
- id - id
- internal_name - internal_name
- name - name
...@@ -2195,6 +2210,9 @@ components: ...@@ -2195,6 +2210,9 @@ components:
name: name:
type: string type: string
example: Air Quality example: Air Quality
description:
type: string
example: Air Quality in Austria
creator: creator:
$ref: '#/components/schemas/UserBriefDto' $ref: '#/components/schemas/UserBriefDto'
internal_name: internal_name:
...@@ -2202,9 +2220,8 @@ components: ...@@ -2202,9 +2220,8 @@ components:
example: air_quality example: air_quality
UserBriefDto: UserBriefDto:
required: required:
- email_verified
- id - id
- theme_dark - roles
- username - username
type: object type: object
properties: properties:
...@@ -2215,6 +2232,10 @@ components: ...@@ -2215,6 +2232,10 @@ components:
type: string type: string
description: Only contains lowercase characters description: Only contains lowercase characters
example: user example: user
titlesBefore:
type: string
titlesAfter:
type: string
firstname: firstname:
type: string type: string
example: Josiah example: Josiah
...@@ -2227,22 +2248,24 @@ components: ...@@ -2227,22 +2248,24 @@ components:
orcid: orcid:
type: string type: string
example: 0000-0002-1825-0097 example: 0000-0002-1825-0097
titles_before: roles:
type: string type: array
example: Prof. description: Roles of the user
titles_after: example: "[ROLE_RESEARCHER]"
type: string items:
theme_dark: type: string
description: Roles of the user
example: "[ROLE_RESEARCHER]"
themeDark:
type: boolean type: boolean
example: true emailVerified:
email_verified:
type: boolean type: boolean
example: true
UserDto: UserDto:
required: required:
- email - email
- email_verified - email_verified
- id - id
- roles
- theme_dark - theme_dark
- username - username
type: object type: object
...@@ -2270,6 +2293,14 @@ components: ...@@ -2270,6 +2293,14 @@ components:
orcid: orcid:
type: string type: string
example: 0000-0002-1825-0097 example: 0000-0002-1825-0097
roles:
type: array
description: Roles of the user
example: "[ROLE_RESEARCHER]"
items:
type: string
description: Roles of the user
example: "[ROLE_RESEARCHER]"
containers: containers:
type: array type: array
items: items:
...@@ -2333,6 +2364,10 @@ components: ...@@ -2333,6 +2364,10 @@ components:
type: array type: array
items: items:
type: string type: string
enum:
- researcher
- developer
- data_steward
UserPasswordDto: UserPasswordDto:
required: required:
- password - password
...@@ -2392,9 +2427,6 @@ components: ...@@ -2392,9 +2427,6 @@ components:
expires: expires:
type: string type: string
format: date-time format: date-time
deleted:
type: string
format: date-time
token: token:
type: string type: string
example: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c example: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
...@@ -2454,9 +2486,6 @@ components: ...@@ -2454,9 +2486,6 @@ components:
expires: expires:
type: string type: string
format: date-time format: date-time
deleted:
type: string
format: date-time
token_hash: token_hash:
type: string type: string
example: 5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03 example: 5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03
......
swagger/api-container.yaml
+ 62
− 32
View file @ 177edbc3
...@@ -776,9 +776,8 @@ components: ...@@ -776,9 +776,8 @@ components:
example: air-quality example: air-quality
UserBriefDto: UserBriefDto:
required: required:
- email_verified
- id - id
- theme_dark - roles
- username - username
type: object type: object
properties: properties:
...@@ -789,6 +788,10 @@ components: ...@@ -789,6 +788,10 @@ components:
type: string type: string
description: Only contains lowercase characters description: Only contains lowercase characters
example: user example: user
titlesBefore:
type: string
titlesAfter:
type: string
firstname: firstname:
type: string type: string
example: Josiah example: Josiah
...@@ -801,17 +804,18 @@ components: ...@@ -801,17 +804,18 @@ components:
orcid: orcid:
type: string type: string
example: 0000-0002-1825-0097 example: 0000-0002-1825-0097
titles_before: roles:
type: string type: array
example: Prof. description: Roles of the user
titles_after: example: "[ROLE_RESEARCHER]"
type: string items:
theme_dark: type: string
description: Roles of the user
example: "[ROLE_RESEARCHER]"
themeDark:
type: boolean type: boolean
example: true emailVerified:
email_verified:
type: boolean type: boolean
example: true
ImageCreateDto: ImageCreateDto:
required: required:
- default_port - default_port
...@@ -900,10 +904,8 @@ components: ...@@ -900,10 +904,8 @@ components:
- paused - paused
- exited - exited
- dead - dead
databases: database:
type: array $ref: '#/components/schemas/DatabaseDto'
items:
$ref: '#/components/schemas/DatabaseDto'
image: image:
$ref: '#/components/schemas/ImageBriefDto' $ref: '#/components/schemas/ImageBriefDto'
port: port:
...@@ -920,17 +922,20 @@ components: ...@@ -920,17 +922,20 @@ components:
type: string type: string
CreatorDto: CreatorDto:
required: required:
- created - firstname
- id - id
- name - lastname
type: object type: object
properties: properties:
id: id:
type: integer type: integer
format: int64 format: int64
name: firstname:
type: string
example: Josiah
lastname:
type: string type: string
example: "Carberry, Josiah" example: Carberry
affiliation: affiliation:
type: string type: string
example: Wesleyan University example: Wesleyan University
...@@ -940,13 +945,30 @@ components: ...@@ -940,13 +945,30 @@ components:
created: created:
type: string type: string
format: date-time format: date-time
last_modified: lastModified:
type: string
format: date-time
DatabaseAccessDto:
required:
- type
- user
type: object
properties:
user:
$ref: '#/components/schemas/UserDto'
type:
type: string
enum:
- read
- write_own
- write_all
created:
type: string type: string
format: date-time format: date-time
DatabaseDto: DatabaseDto:
required: required:
- creator - creator
- exchange - exchange_name
- id - id
- internal_name - internal_name
- name - name
...@@ -958,9 +980,6 @@ components: ...@@ -958,9 +980,6 @@ components:
name: name:
type: string type: string
example: Air Quality example: Air Quality
exchange:
type: string
example: air_quality
creator: creator:
$ref: '#/components/schemas/UserBriefDto' $ref: '#/components/schemas/UserBriefDto'
identifier: identifier:
...@@ -976,12 +995,16 @@ components: ...@@ -976,12 +995,16 @@ components:
$ref: '#/components/schemas/ImageDto' $ref: '#/components/schemas/ImageDto'
container: container:
$ref: '#/components/schemas/ContainerDto' $ref: '#/components/schemas/ContainerDto'
accesses:
type: array
items:
$ref: '#/components/schemas/DatabaseAccessDto'
created: created:
type: string type: string
format: date-time format: date-time
deleted: exchange_name:
type: string type: string
format: date-time example: dbrepo/4/4
internal_name: internal_name:
type: string type: string
example: weather_australia example: weather_australia
...@@ -997,7 +1020,6 @@ components: ...@@ -997,7 +1020,6 @@ components:
IdentifierDto: IdentifierDto:
required: required:
- container id - container id
- creator
- creators - creators
- database id - database id
- execution - execution
...@@ -1046,8 +1068,6 @@ components: ...@@ -1046,8 +1068,6 @@ components:
publisher: publisher:
type: string type: string
example: TU Wien example: TU Wien
creator:
$ref: '#/components/schemas/UserDto'
language: language:
type: string type: string
enum: enum:
...@@ -1376,15 +1396,13 @@ components: ...@@ -1376,15 +1396,13 @@ components:
created: created:
type: string type: string
format: date-time format: date-time
deleted:
type: string
format: date-time
last_modified: last_modified:
type: string type: string
format: date-time format: date-time
TableBriefDto: TableBriefDto:
required: required:
- creator - creator
- description
- id - id
- internal_name - internal_name
- name - name
...@@ -1396,6 +1414,9 @@ components: ...@@ -1396,6 +1414,9 @@ components:
name: name:
type: string type: string
example: Air Quality example: Air Quality
description:
type: string
example: Air Quality in Austria
creator: creator:
$ref: '#/components/schemas/UserBriefDto' $ref: '#/components/schemas/UserBriefDto'
internal_name: internal_name:
...@@ -1406,6 +1427,7 @@ components: ...@@ -1406,6 +1427,7 @@ components:
- email - email
- email_verified - email_verified
- id - id
- roles
- theme_dark - theme_dark
- username - username
type: object type: object
...@@ -1433,6 +1455,14 @@ components: ...@@ -1433,6 +1455,14 @@ components:
orcid: orcid:
type: string type: string
example: 0000-0002-1825-0097 example: 0000-0002-1825-0097
roles:
type: array
description: Roles of the user
example: "[ROLE_RESEARCHER]"
items:
type: string
description: Roles of the user
example: "[ROLE_RESEARCHER]"
containers: containers:
type: array type: array
items: items:
......
swagger/api-database.yaml
+ 450
− 72
View file @ 177edbc3
...@@ -72,24 +72,197 @@ paths: ...@@ -72,24 +72,197 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"403":
description: Forbidden
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"417":
description: Expectation Failed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"502": "502":
description: Bad Gateway description: Bad Gateway
content: content:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"200":
description: OK
content:
'*/*':
schema:
$ref: '#/components/schemas/DatabaseDto'
security:
- bearerAuth: []
/api/container/{id}/database/{databaseId}/access/{username}:
put:
tags:
- access-endpoint
summary: Modify access to some database
operationId: update
parameters:
- name: id
in: path
required: true
schema:
type: integer
format: int64
- name: databaseId
in: path
required: true
schema:
type: integer
format: int64
- name: username
in: path
required: true
schema:
type: string
requestBody:
content:
application/json:
schema:
$ref: '#/components/schemas/DatabaseModifyAccessDto'
required: true
responses:
"404":
description: Not Found
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"406":
description: Not Acceptable
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"409":
description: Conflict
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"400":
description: Bad Request
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"405":
description: Method Not Allowed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"403":
description: Forbidden
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"417": "417":
description: Expectation Failed description: Expectation Failed
content: content:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502":
description: Bad Gateway
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200": "200":
description: OK description: OK
content: content:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/DatabaseDto' type: object
security:
- bearerAuth: []
delete:
tags:
- access-endpoint
summary: Revoke access to some database
operationId: update_1
parameters:
- name: id
in: path
required: true
schema:
type: integer
format: int64
- name: databaseId
in: path
required: true
schema:
type: integer
format: int64
- name: username
in: path
required: true
schema:
type: string
responses:
"404":
description: Not Found
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"406":
description: Not Acceptable
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"409":
description: Conflict
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"400":
description: Bad Request
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"405":
description: Method Not Allowed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"403":
description: Forbidden
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"417":
description: Expectation Failed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"502":
description: Bad Gateway
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200":
description: OK
content:
'*/*':
schema:
type: object
security: security:
- bearerAuth: [] - bearerAuth: []
/api/container/{id}/database: /api/container/{id}/database:
...@@ -136,8 +309,8 @@ paths: ...@@ -136,8 +309,8 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502": "403":
description: Bad Gateway description: Forbidden
content: content:
'*/*': '*/*':
schema: schema:
...@@ -148,6 +321,12 @@ paths: ...@@ -148,6 +321,12 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502":
description: Bad Gateway
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200": "200":
description: OK description: OK
content: content:
...@@ -205,24 +384,187 @@ paths: ...@@ -205,24 +384,187 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"403":
description: Forbidden
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"417":
description: Expectation Failed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"502":
description: Bad Gateway
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200":
description: OK
content:
'*/*':
schema:
$ref: '#/components/schemas/DatabaseBriefDto'
security:
- bearerAuth: []
/api/container/{id}/database/{databaseId}/access:
get:
tags:
- access-endpoint
summary: Check access to some database
operationId: find
parameters:
- name: id
in: path
required: true
schema:
type: integer
format: int64
- name: databaseId
in: path
required: true
schema:
type: integer
format: int64
responses:
"404":
description: Not Found
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"406":
description: Not Acceptable
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"409":
description: Conflict
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"400":
description: Bad Request
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"405":
description: Method Not Allowed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"403":
description: Forbidden
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"417":
description: Expectation Failed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"502": "502":
description: Bad Gateway description: Bad Gateway
content: content:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"200":
description: OK
content:
'*/*':
schema:
$ref: '#/components/schemas/DatabaseAccessDto'
security:
- bearerAuth: []
post:
tags:
- access-endpoint
summary: Give access to some database
operationId: create_1
parameters:
- name: id
in: path
required: true
schema:
type: integer
format: int64
- name: databaseId
in: path
required: true
schema:
type: integer
format: int64
requestBody:
content:
application/json:
schema:
$ref: '#/components/schemas/DatabaseGiveAccessDto'
required: true
responses:
"404":
description: Not Found
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"406":
description: Not Acceptable
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"409":
description: Conflict
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"400":
description: Bad Request
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"405":
description: Method Not Allowed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"403":
description: Forbidden
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"417": "417":
description: Expectation Failed description: Expectation Failed
content: content:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502":
description: Bad Gateway
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200": "200":
description: OK description: OK
content: content:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/DatabaseBriefDto' type: object
security: security:
- bearerAuth: [] - bearerAuth: []
/api/container/{id}/database/{databaseId}: /api/container/{id}/database/{databaseId}:
...@@ -275,8 +617,8 @@ paths: ...@@ -275,8 +617,8 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502": "403":
description: Bad Gateway description: Forbidden
content: content:
'*/*': '*/*':
schema: schema:
...@@ -287,6 +629,12 @@ paths: ...@@ -287,6 +629,12 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502":
description: Bad Gateway
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200": "200":
description: OK description: OK
content: content:
...@@ -344,8 +692,8 @@ paths: ...@@ -344,8 +692,8 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502": "403":
description: Bad Gateway description: Forbidden
content: content:
'*/*': '*/*':
schema: schema:
...@@ -356,6 +704,12 @@ paths: ...@@ -356,6 +704,12 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502":
description: Bad Gateway
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200": "200":
description: OK description: OK
content: content:
...@@ -408,8 +762,8 @@ paths: ...@@ -408,8 +762,8 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502": "403":
description: Bad Gateway description: Forbidden
content: content:
'*/*': '*/*':
schema: schema:
...@@ -420,6 +774,12 @@ paths: ...@@ -420,6 +774,12 @@ paths:
'*/*': '*/*':
schema: schema:
$ref: '#/components/schemas/ApiErrorDto' $ref: '#/components/schemas/ApiErrorDto'
"502":
description: Bad Gateway
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200": "200":
description: OK description: OK
content: content:
...@@ -551,10 +911,8 @@ components: ...@@ -551,10 +911,8 @@ components:
- paused - paused
- exited - exited
- dead - dead
databases: database:
type: array $ref: '#/components/schemas/DatabaseDto'
items:
$ref: '#/components/schemas/DatabaseDto'
image: image:
$ref: '#/components/schemas/ImageBriefDto' $ref: '#/components/schemas/ImageBriefDto'
port: port:
...@@ -571,17 +929,20 @@ components: ...@@ -571,17 +929,20 @@ components:
type: string type: string
CreatorDto: CreatorDto:
required: required:
- created - firstname
- id - id
- name - lastname
type: object type: object
properties: properties:
id: id:
type: integer type: integer
format: int64 format: int64
name: firstname:
type: string
example: Josiah
lastname:
type: string type: string
example: "Carberry, Josiah" example: Carberry
affiliation: affiliation:
type: string type: string
example: Wesleyan University example: Wesleyan University
...@@ -591,13 +952,30 @@ components: ...@@ -591,13 +952,30 @@ components:
created: created:
type: string type: string
format: date-time format: date-time
last_modified: lastModified:
type: string
format: date-time
DatabaseAccessDto:
required:
- type
- user
type: object
properties:
user:
$ref: '#/components/schemas/UserDto'
type:
type: string
enum:
- read
- write_own
- write_all
created:
type: string type: string
format: date-time format: date-time
DatabaseDto: DatabaseDto:
required: required:
- creator - creator
- exchange - exchange_name
- id - id
- internal_name - internal_name
- name - name
...@@ -609,9 +987,6 @@ components: ...@@ -609,9 +987,6 @@ components:
name: name:
type: string type: string
example: Air Quality example: Air Quality
exchange:
type: string
example: air_quality
creator: creator:
$ref: '#/components/schemas/UserBriefDto' $ref: '#/components/schemas/UserBriefDto'
identifier: identifier:
...@@ -627,12 +1002,16 @@ components: ...@@ -627,12 +1002,16 @@ components:
$ref: '#/components/schemas/ImageDto' $ref: '#/components/schemas/ImageDto'
container: container:
$ref: '#/components/schemas/ContainerDto' $ref: '#/components/schemas/ContainerDto'
accesses:
type: array
items:
$ref: '#/components/schemas/DatabaseAccessDto'
created: created:
type: string type: string
format: date-time format: date-time
deleted: exchange_name:
type: string type: string
format: date-time example: dbrepo/4/4
internal_name: internal_name:
type: string type: string
example: weather_australia example: weather_australia
...@@ -648,7 +1027,6 @@ components: ...@@ -648,7 +1027,6 @@ components:
IdentifierDto: IdentifierDto:
required: required:
- container id - container id
- creator
- creators - creators
- database id - database id
- execution - execution
...@@ -697,8 +1075,6 @@ components: ...@@ -697,8 +1075,6 @@ components:
publisher: publisher:
type: string type: string
example: TU Wien example: TU Wien
creator:
$ref: '#/components/schemas/UserDto'
language: language:
type: string type: string
enum: enum:
...@@ -1147,15 +1523,13 @@ components: ...@@ -1147,15 +1523,13 @@ components:
created: created:
type: string type: string
format: date-time format: date-time
deleted:
type: string
format: date-time
last_modified: last_modified:
type: string type: string
format: date-time format: date-time
TableBriefDto: TableBriefDto:
required: required:
- creator - creator
- description
- id - id
- internal_name - internal_name
- name - name
...@@ -1167,6 +1541,9 @@ components: ...@@ -1167,6 +1541,9 @@ components:
name: name:
type: string type: string
example: Air Quality example: Air Quality
description:
type: string
example: Air Quality in Austria
creator: creator:
$ref: '#/components/schemas/UserBriefDto' $ref: '#/components/schemas/UserBriefDto'
internal_name: internal_name:
...@@ -1174,9 +1551,8 @@ components: ...@@ -1174,9 +1551,8 @@ components:
example: air_quality example: air_quality
UserBriefDto: UserBriefDto:
required: required:
- email_verified
- id - id
- theme_dark - roles
- username - username
type: object type: object
properties: properties:
...@@ -1187,6 +1563,10 @@ components: ...@@ -1187,6 +1563,10 @@ components:
type: string type: string
description: Only contains lowercase characters description: Only contains lowercase characters
example: user example: user
titlesBefore:
type: string
titlesAfter:
type: string
firstname: firstname:
type: string type: string
example: Josiah example: Josiah
...@@ -1199,22 +1579,24 @@ components: ...@@ -1199,22 +1579,24 @@ components:
orcid: orcid:
type: string type: string
example: 0000-0002-1825-0097 example: 0000-0002-1825-0097
titles_before: roles:
type: string type: array
example: Prof. description: Roles of the user
titles_after: example: "[ROLE_RESEARCHER]"
type: string items:
theme_dark: type: string
description: Roles of the user
example: "[ROLE_RESEARCHER]"
themeDark:
type: boolean type: boolean
example: true emailVerified:
email_verified:
type: boolean type: boolean
example: true
UserDto: UserDto:
required: required:
- email - email
- email_verified - email_verified
- id - id
- roles
- theme_dark - theme_dark
- username - username
type: object type: object
...@@ -1242,6 +1624,14 @@ components: ...@@ -1242,6 +1624,14 @@ components:
orcid: orcid:
type: string type: string
example: 0000-0002-1825-0097 example: 0000-0002-1825-0097
roles:
type: array
description: Roles of the user
example: "[ROLE_RESEARCHER]"
items:
type: string
description: Roles of the user
example: "[ROLE_RESEARCHER]"
containers: containers:
type: array type: array
items: items:
...@@ -1268,6 +1658,17 @@ components: ...@@ -1268,6 +1658,17 @@ components:
email_verified: email_verified:
type: boolean type: boolean
example: true example: true
DatabaseModifyAccessDto:
required:
- type
type: object
properties:
type:
type: string
enum:
- read
- write_own
- write_all
DatabaseCreateDto: DatabaseCreateDto:
required: required:
- is_public - is_public
...@@ -1321,7 +1722,7 @@ components: ...@@ -1321,7 +1722,7 @@ components:
type: string type: string
example: Air Quality in Austria example: Air Quality in Austria
identifier: identifier:
$ref: '#/components/schemas/IdentifierBriefDto' $ref: '#/components/schemas/IdentifierDto'
engine: engine:
type: string type: string
example: mariadb:10.5 example: mariadb:10.5
...@@ -1335,43 +1736,20 @@ components: ...@@ -1335,43 +1736,20 @@ components:
is_public: is_public:
type: boolean type: boolean
example: true example: true
IdentifierBriefDto: DatabaseGiveAccessDto:
required: required:
- container id
- database id
- title
- type - type
- username
type: object type: object
properties: properties:
id: username:
type: integer
format: int64
title:
type: string type: string
example: "Airquality Stephansplatz, Vienna, Austria"
type: type:
type: string type: string
enum: enum:
- database - read
- subset - write_own
created: - write_all
type: string
format: date-time
container id:
type: integer
format: int64
example: 1
database id:
type: integer
format: int64
example: 1
query id:
type: integer
format: int64
example: 1
last_modified:
type: string
format: date-time
securitySchemes: securitySchemes:
bearerAuth: bearerAuth:
type: http type: http
......
swagger/api-identifier.yaml
+ 14
− 401
View file @ 177edbc3
...@@ -17,62 +17,6 @@ servers: ...@@ -17,62 +17,6 @@ servers:
description: Generated server url description: Generated server url
paths: paths:
/api/identifier/{id}: /api/identifier/{id}:
get:
tags:
- identifier-endpoint
summary: Export some identifier metadata
operationId: export
parameters:
- name: id
in: path
required: true
schema:
type: integer
format: int64
responses:
"404":
description: Not Found
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"400":
description: Bad Request
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"406":
description: Not Acceptable
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"204":
description: No Content
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"409":
description: Conflict
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"412":
description: Precondition Failed
content:
'*/*':
schema:
$ref: '#/components/schemas/ApiErrorDto'
"200":
description: OK
content:
'*/*':
schema:
type: string
format: binary
put: put:
tags: tags:
- identifier-endpoint - identifier-endpoint
...@@ -80,7 +24,7 @@ paths: ...@@ -80,7 +24,7 @@ paths:
operationId: update operationId: update
parameters: parameters:
- name: id - name: id
in: query in: path
required: true required: true
schema: schema:
type: integer type: integer
...@@ -139,11 +83,11 @@ paths: ...@@ -139,11 +83,11 @@ paths:
delete: delete:
tags: tags:
- identifier-endpoint - identifier-endpoint
summary: Delete some identifer summary: Delete some identifier
operationId: delete operationId: delete
parameters: parameters:
- name: id - name: id
in: query in: path
required: true required: true
schema: schema:
type: integer type: integer
...@@ -467,65 +411,22 @@ components: ...@@ -467,65 +411,22 @@ components:
code: code:
type: string type: string
example: error.container.notfound example: error.container.notfound
ContainerDto:
required:
- created
- hash
- id
- internal_name
- name
type: object
properties:
id:
type: integer
format: int64
hash:
type: string
example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50
name:
type: string
example: Air Quality
state:
type: string
example: running
enum:
- created
- restarting
- running
- paused
- exited
- dead
databases:
type: array
items:
$ref: '#/components/schemas/DatabaseDto'
image:
$ref: '#/components/schemas/ImageBriefDto'
port:
type: integer
format: int32
created:
type: string
format: date-time
example: 2021-03-12T15:26:21.678396092Z
internal_name:
type: string
example: air-quality
ip_address:
type: string
CreatorDto: CreatorDto:
required: required:
- created - firstname
- id - id
- name - lastname
type: object type: object
properties: properties:
id: id:
type: integer type: integer
format: int64 format: int64
name: firstname:
type: string type: string
example: "Carberry, Josiah" example: Josiah
lastname:
type: string
example: Carberry
affiliation: affiliation:
type: string type: string
example: Wesleyan University example: Wesleyan University
...@@ -535,64 +436,12 @@ components: ...@@ -535,64 +436,12 @@ components:
created: created:
type: string type: string
format: date-time format: date-time
last_modified: lastModified:
type: string type: string
format: date-time format: date-time
DatabaseDto:
required:
- creator
- exchange
- id
- internal_name
- name
type: object
properties:
id:
type: integer
format: int64
name:
type: string
example: Air Quality
exchange:
type: string
example: air_quality
creator:
$ref: '#/components/schemas/UserBriefDto'
identifier:
$ref: '#/components/schemas/IdentifierDto'
description:
type: string
example: Weather Australia 2009-2021
tables:
type: array
items:
$ref: '#/components/schemas/TableBriefDto'
image:
$ref: '#/components/schemas/ImageDto'
container:
$ref: '#/components/schemas/ContainerDto'
created:
type: string
format: date-time
deleted:
type: string
format: date-time
internal_name:
type: string
example: weather_australia
is_public:
type: boolean
example: true
GrantedAuthorityDto:
type: object
properties:
authority:
type: string
example: ROLE_RESEARCHER
IdentifierDto: IdentifierDto:
required: required:
- container id - container id
- creator
- creators - creators
- database id - database id
- execution - execution
...@@ -641,8 +490,6 @@ components: ...@@ -641,8 +490,6 @@ components:
publisher: publisher:
type: string type: string
example: TU Wien example: TU Wien
creator:
$ref: '#/components/schemas/UserDto'
language: language:
type: string type: string
enum: enum:
...@@ -883,126 +730,6 @@ components: ...@@ -883,126 +730,6 @@ components:
last_modified: last_modified:
type: string type: string
format: date-time format: date-time
ImageBriefDto:
required:
- id
- repository
- tag
type: object
properties:
id:
type: integer
format: int64
repository:
type: string
example: mariadb
tag:
type: string
example: "10.5"
ImageDateDto:
required:
- database_format
- example
- has_time
- id
- unix_format
type: object
properties:
id:
type: integer
format: int64
example:
type: string
example: 30.01.2022
database_format:
type: string
example: '%d.%c.%Y'
unix_format:
type: string
example: dd.MM.YYYY
has_time:
type: boolean
example: false
created_at:
type: string
format: date-time
ImageDto:
required:
- default_port
- dialect
- driver_class
- environment
- id
- jdbc_method
- repository
- tag
type: object
properties:
id:
type: integer
format: int64
repository:
type: string
example: mariadb
tag:
type: string
example: "10.5"
dialect:
type: string
example: org.hibernate.dialect.MariaDBDialect
hash:
type: string
example: sha256:c5ec7353d87dfc35067e7bffeb25d6a0d52dad41e8b7357213e3b12d6e7ff78e
compiled:
type: string
format: date-time
example: 2021-03-12T15:26:21.678396092Z
size:
type: integer
example: 314295447
environment:
type: array
items:
$ref: '#/components/schemas/ImageEnvItemDto'
driver_class:
type: string
example: org.mariadb.jdbc.Driver
date_formats:
type: array
items:
$ref: '#/components/schemas/ImageDateDto'
jdbc_method:
type: string
example: mariadb
default_port:
type: integer
format: int32
example: 3306
ImageEnvItemDto:
required:
- iid
- key
- type
- value
type: object
properties:
iid:
type: integer
format: int64
key:
type: string
example: MARIADB_ROOT_PASSWORD
value:
type: string
example: mariadb
type:
type: string
example: PRIVILEGED_PASSWORD
enum:
- username
- password
- privileged_username
- privileged_password
LicenseDto: LicenseDto:
required: required:
- identifier - identifier
...@@ -1091,135 +818,21 @@ components: ...@@ -1091,135 +818,21 @@ components:
created: created:
type: string type: string
format: date-time format: date-time
deleted:
type: string
format: date-time
last_modified: last_modified:
type: string type: string
format: date-time format: date-time
TableBriefDto: CreatorCreateDto:
required:
- creator
- id
- internal_name
- name
type: object
properties:
id:
type: integer
format: int64
name:
type: string
example: Air Quality
creator:
$ref: '#/components/schemas/UserBriefDto'
internal_name:
type: string
example: air_quality
UserBriefDto:
required:
- email_verified
- id
- theme_dark
- username
type: object
properties:
id:
type: integer
format: int64
username:
type: string
description: Only contains lowercase characters
example: user
firstname:
type: string
example: Josiah
lastname:
type: string
example: Carberry
affiliation:
type: string
example: Brown University
orcid:
type: string
example: 0000-0002-1825-0097
titles_before:
type: string
example: Prof.
titles_after:
type: string
theme_dark:
type: boolean
example: true
email_verified:
type: boolean
example: true
UserDto:
required: required:
- email - firstname
- email_verified - lastname
- id
- theme_dark
- username
type: object type: object
properties: properties:
id:
type: integer
format: int64
authorities:
type: array
items:
$ref: '#/components/schemas/GrantedAuthorityDto'
username:
type: string
description: Only contains lowercase characters
example: jcarberry
firstname: firstname:
type: string type: string
example: Josiah example: Josiah
lastname: lastname:
type: string type: string
example: Carberry example: Carberry
affiliation:
type: string
example: Brown University
orcid:
type: string
example: 0000-0002-1825-0097
containers:
type: array
items:
$ref: '#/components/schemas/ContainerDto'
databases:
type: array
items:
$ref: '#/components/schemas/ContainerDto'
identifiers:
type: array
items:
$ref: '#/components/schemas/ContainerDto'
email:
type: string
example: jcarberry@brown.edu
titles_before:
type: string
example: Prof.
titles_after:
type: string
theme_dark:
type: boolean
example: true
email_verified:
type: boolean
example: true
CreatorCreateDto:
required:
- name
type: object
properties:
name:
type: string
example: "Carberry, Josiah"
affiliation: affiliation:
type: string type: string
example: Wesleyan University example: Wesleyan University
......
swagger/api-metadata.yaml
+ 2
− 2
View file @ 177edbc3
...@@ -149,11 +149,11 @@ components: ...@@ -149,11 +149,11 @@ components:
type: string type: string
resumptionToken: resumptionToken:
type: string type: string
parametersString:
type: string
fromDate: fromDate:
type: string type: string
format: date-time format: date-time
untilDate: untilDate:
type: string type: string
format: date-time format: date-time
parametersString:
type: string
swagger/api-query.yaml
+ 336
− 183
View file @ 177edbc3
This diff is collapsed.
swagger/api-semantics.yaml 0 → 100644
+ 1
− 0
View file @ 177edbc3
{"definitions":{},"info":{"contact":{"email":"andreas.rauber@tuwien.ac.at","name":"Prof. Andreas Rauber"},"description":"Service for assigning concepts to database tables and columns.","license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0"},"title":"Database Repository Unit / Ontology Service API","version":"1.1.0-alpha"},"openapi":"3.0.0","paths":{"/api/semantics/concept":{"get":{"consumes":["application/json"],"description":"This is a simple API which returns a list of suggested concepts.","parameters":[{"description":"The query to retrieve a fitting concept","in":"query","name":"q","schema":{"type":"string"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Suggest a concept","tags":["concepts-endpoint"]},"post":{"consumes":["application/json"],"description":"This is a simple API for saving concept","produces":["application/json"],"requestBody":{"content":{"application/json":{"schema":{"properties":{"name":{"example":"metre","type":"string"},"uri":{"example":"http://www.ontology-of-units-of-measure.org/resource/om-2/metre","type":"string"}},"required":["uri","name"],"type":"object"}}}},"responses":{"200":{"description":"OK"},"201":{"description":"Created"},"405":{"description":"Invalid input"},"409":{"description":"Concept already present"}},"summary":"Save concept to MDB","tags":["concepts-endpoint"]}},"/api/semantics/concept/{concept}/validate":{"get":{"consumes":["application/json"],"description":"This is a simple API for validating concepts.","parameters":[{"description":"Validates concepts against om-2.","in":"path","name":"unit","required":true,"schema":{"example":"distance","type":"string"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Validate concepts","tags":["concepts-endpoint"]}},"/api/semantics/ontology":{"get":{"consumes":["application/json"],"description":"This is a simple API for listing all ontologies (.nt, .ttl files) used in DB-Repo.","produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"List ontologies","tags":["ontologies-endpoint"]}},"/api/semantics/ontology/{name}":{"get":{"consumes":["application/json"],"description":"This is a simple API for getting a certain ontologies (.nt, .ttl files) stored in DB-Repo.","parameters":[{"in":"path","name":"o_name","required":true,"schema":{"example":"VOCAB_QUDT-UNITS-ALL-v2.1","type":"string"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"404":{"description":"Not found"},"405":{"description":"Invalid input"}},"summary":"Get ontology","tags":["ontologies-endpoint"]}},"/api/semantics/unit":{"get":{"consumes":["application/json"],"description":"This is a simple API which returns a list of suggested units.","parameters":[{"description":"The query to retrieve a fitting unit","in":"query","name":"q","schema":{"type":"string"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Suggest a unit","tags":["units-endpoint"]},"post":{"consumes":["application/json"],"description":"This is a simple API for saving units","produces":["application/json"],"requestBody":{"content":{"application/json":{"schema":{"properties":{"name":{"example":"second","type":"string"},"uri":{"example":"http://www.ontology-of-units-of-measure.org/resource/om-2/second-Time","type":"string"}},"required":["uri","name"],"type":"object"}}}},"responses":{"200":{"description":"OK"},"201":{"description":"Created"},"405":{"description":"Invalid input"},"409":{"description":"Concept already present"}},"summary":"Save unit to MDB","tags":["units-endpoint"]}},"/api/semantics/unit/{unit}/validate":{"get":{"consumes":["application/json"],"description":"This is a simple API for validating units.","parameters":[{"description":"Validates unit against om-2.","in":"path","name":"unit","required":true,"schema":{"example":"metre","type":"string"}}],"produces":["application/json"],"responses":{"200":{"description":"OK"},"405":{"description":"Invalid input"}},"summary":"Validate units","tags":["units-endpoint"]}}},"servers":[{"description":"Generated server url","url":"http://localhost:5010"},{"description":"DBRepo Production Server","url":"https://dbrepo1.ec.tuwien.ac.at/api/units"}]}
swagger/api-table.yaml
+ 961
− 160
View file @ 177edbc3
This diff is collapsed.
swagger/api/api_authentication/__init__.py
+ 1
− 0
View file @ 177edbc3
...@@ -26,6 +26,7 @@ from api_authentication.configuration import Configuration ...@@ -26,6 +26,7 @@ from api_authentication.configuration import Configuration
from api_authentication.models.api_error_dto import ApiErrorDto from api_authentication.models.api_error_dto import ApiErrorDto
from api_authentication.models.container_dto import ContainerDto from api_authentication.models.container_dto import ContainerDto
from api_authentication.models.creator_dto import CreatorDto from api_authentication.models.creator_dto import CreatorDto
from api_authentication.models.database_access_dto import DatabaseAccessDto
from api_authentication.models.database_dto import DatabaseDto from api_authentication.models.database_dto import DatabaseDto
from api_authentication.models.granted_authority_dto import GrantedAuthorityDto from api_authentication.models.granted_authority_dto import GrantedAuthorityDto
from api_authentication.models.identifier_dto import IdentifierDto from api_authentication.models.identifier_dto import IdentifierDto
......
swagger/api/api_authentication/api/token_endpoint_api.py
+ 16
− 16
View file @ 177edbc3
...@@ -117,43 +117,43 @@ class TokenEndpointApi(object): ...@@ -117,43 +117,43 @@ class TokenEndpointApi(object):
_request_timeout=params.get('_request_timeout'), _request_timeout=params.get('_request_timeout'),
collection_formats=collection_formats) collection_formats=collection_formats)
def delete(self, hash, **kwargs): # noqa: E501 def delete(self, id, **kwargs): # noqa: E501
"""Delete developer token # noqa: E501 """Delete developer token # noqa: E501
This method makes a synchronous HTTP request by default. To make an This method makes a synchronous HTTP request by default. To make an
asynchronous HTTP request, please pass async_req=True asynchronous HTTP request, please pass async_req=True
>>> thread = api.delete(hash, async_req=True) >>> thread = api.delete(id, async_req=True)
>>> result = thread.get() >>> result = thread.get()
:param async_req bool :param async_req bool
:param str hash: (required) :param int id: (required)
:return: None :return: None
If the method is called asynchronously, If the method is called asynchronously,
returns the request thread. returns the request thread.
""" """
kwargs['_return_http_data_only'] = True kwargs['_return_http_data_only'] = True
if kwargs.get('async_req'): if kwargs.get('async_req'):
return self.delete_with_http_info(hash, **kwargs) # noqa: E501 return self.delete_with_http_info(id, **kwargs) # noqa: E501
else: else:
(data) = self.delete_with_http_info(hash, **kwargs) # noqa: E501 (data) = self.delete_with_http_info(id, **kwargs) # noqa: E501
return data return data
def delete_with_http_info(self, hash, **kwargs): # noqa: E501 def delete_with_http_info(self, id, **kwargs): # noqa: E501
"""Delete developer token # noqa: E501 """Delete developer token # noqa: E501
This method makes a synchronous HTTP request by default. To make an This method makes a synchronous HTTP request by default. To make an
asynchronous HTTP request, please pass async_req=True asynchronous HTTP request, please pass async_req=True
>>> thread = api.delete_with_http_info(hash, async_req=True) >>> thread = api.delete_with_http_info(id, async_req=True)
>>> result = thread.get() >>> result = thread.get()
:param async_req bool :param async_req bool
:param str hash: (required) :param int id: (required)
:return: None :return: None
If the method is called asynchronously, If the method is called asynchronously,
returns the request thread. returns the request thread.
""" """
all_params = ['hash'] # noqa: E501 all_params = ['id'] # noqa: E501
all_params.append('async_req') all_params.append('async_req')
all_params.append('_return_http_data_only') all_params.append('_return_http_data_only')
all_params.append('_preload_content') all_params.append('_preload_content')
...@@ -168,16 +168,16 @@ class TokenEndpointApi(object): ...@@ -168,16 +168,16 @@ class TokenEndpointApi(object):
) )
params[key] = val params[key] = val
del params['kwargs'] del params['kwargs']
# verify the required parameter 'hash' is set # verify the required parameter 'id' is set
if ('hash' not in params or if ('id' not in params or
params['hash'] is None): params['id'] is None):
raise ValueError("Missing the required parameter `hash` when calling `delete`") # noqa: E501 raise ValueError("Missing the required parameter `id` when calling `delete`") # noqa: E501
collection_formats = {} collection_formats = {}
path_params = {} path_params = {}
if 'hash' in params: if 'id' in params:
path_params['hash'] = params['hash'] # noqa: E501 path_params['id'] = params['id'] # noqa: E501
query_params = [] query_params = []
...@@ -195,7 +195,7 @@ class TokenEndpointApi(object): ...@@ -195,7 +195,7 @@ class TokenEndpointApi(object):
auth_settings = ['bearerAuth'] # noqa: E501 auth_settings = ['bearerAuth'] # noqa: E501
return self.api_client.call_api( return self.api_client.call_api(
'/api/user/token/{hash}', 'DELETE', '/api/user/token/{id}', 'DELETE',
path_params, path_params,
query_params, query_params,
header_params, header_params,
......
swagger/api/api_authentication/models/__init__.py
+ 1
− 0
View file @ 177edbc3
...@@ -17,6 +17,7 @@ from __future__ import absolute_import ...@@ -17,6 +17,7 @@ from __future__ import absolute_import
from api_authentication.models.api_error_dto import ApiErrorDto from api_authentication.models.api_error_dto import ApiErrorDto
from api_authentication.models.container_dto import ContainerDto from api_authentication.models.container_dto import ContainerDto
from api_authentication.models.creator_dto import CreatorDto from api_authentication.models.creator_dto import CreatorDto
from api_authentication.models.database_access_dto import DatabaseAccessDto
from api_authentication.models.database_dto import DatabaseDto from api_authentication.models.database_dto import DatabaseDto
from api_authentication.models.granted_authority_dto import GrantedAuthorityDto from api_authentication.models.granted_authority_dto import GrantedAuthorityDto
from api_authentication.models.identifier_dto import IdentifierDto from api_authentication.models.identifier_dto import IdentifierDto
......
swagger/api/api_authentication/models/container_dto.py
+ 17
− 17
View file @ 177edbc3
...@@ -32,7 +32,7 @@ class ContainerDto(object): ...@@ -32,7 +32,7 @@ class ContainerDto(object):
'hash': 'str', 'hash': 'str',
'name': 'str', 'name': 'str',
'state': 'str', 'state': 'str',
'databases': 'list[DatabaseDto]', 'database': 'DatabaseDto',
'image': 'ImageBriefDto', 'image': 'ImageBriefDto',
'port': 'int', 'port': 'int',
'created': 'datetime', 'created': 'datetime',
...@@ -45,7 +45,7 @@ class ContainerDto(object): ...@@ -45,7 +45,7 @@ class ContainerDto(object):
'hash': 'hash', 'hash': 'hash',
'name': 'name', 'name': 'name',
'state': 'state', 'state': 'state',
'databases': 'databases', 'database': 'database',
'image': 'image', 'image': 'image',
'port': 'port', 'port': 'port',
'created': 'created', 'created': 'created',
...@@ -53,13 +53,13 @@ class ContainerDto(object): ...@@ -53,13 +53,13 @@ class ContainerDto(object):
'ip_address': 'ip_address' 'ip_address': 'ip_address'
} }
def __init__(self, id=None, hash=None, name=None, state=None, databases=None, image=None, port=None, created=None, internal_name=None, ip_address=None): # noqa: E501 def __init__(self, id=None, hash=None, name=None, state=None, database=None, image=None, port=None, created=None, internal_name=None, ip_address=None): # noqa: E501
"""ContainerDto - a model defined in Swagger""" # noqa: E501 """ContainerDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._hash = None self._hash = None
self._name = None self._name = None
self._state = None self._state = None
self._databases = None self._database = None
self._image = None self._image = None
self._port = None self._port = None
self._created = None self._created = None
...@@ -71,8 +71,8 @@ class ContainerDto(object): ...@@ -71,8 +71,8 @@ class ContainerDto(object):
self.name = name self.name = name
if state is not None: if state is not None:
self.state = state self.state = state
if databases is not None: if database is not None:
self.databases = databases self.database = database
if image is not None: if image is not None:
self.image = image self.image = image
if port is not None: if port is not None:
...@@ -179,25 +179,25 @@ class ContainerDto(object): ...@@ -179,25 +179,25 @@ class ContainerDto(object):
self._state = state self._state = state
@property @property
def databases(self): def database(self):
"""Gets the databases of this ContainerDto. # noqa: E501 """Gets the database of this ContainerDto. # noqa: E501
:return: The databases of this ContainerDto. # noqa: E501 :return: The database of this ContainerDto. # noqa: E501
:rtype: list[DatabaseDto] :rtype: DatabaseDto
""" """
return self._databases return self._database
@databases.setter @database.setter
def databases(self, databases): def database(self, database):
"""Sets the databases of this ContainerDto. """Sets the database of this ContainerDto.
:param databases: The databases of this ContainerDto. # noqa: E501 :param database: The database of this ContainerDto. # noqa: E501
:type: list[DatabaseDto] :type: DatabaseDto
""" """
self._databases = databases self._database = database
@property @property
def image(self): def image(self):
......
swagger/api/api_authentication/models/creator_dto.py
+ 46
− 20
View file @ 177edbc3
...@@ -29,7 +29,8 @@ class CreatorDto(object): ...@@ -29,7 +29,8 @@ class CreatorDto(object):
""" """
swagger_types = { swagger_types = {
'id': 'int', 'id': 'int',
'name': 'str', 'firstname': 'str',
'lastname': 'str',
'affiliation': 'str', 'affiliation': 'str',
'orcid': 'str', 'orcid': 'str',
'created': 'datetime', 'created': 'datetime',
...@@ -38,29 +39,33 @@ class CreatorDto(object): ...@@ -38,29 +39,33 @@ class CreatorDto(object):
attribute_map = { attribute_map = {
'id': 'id', 'id': 'id',
'name': 'name', 'firstname': 'firstname',
'lastname': 'lastname',
'affiliation': 'affiliation', 'affiliation': 'affiliation',
'orcid': 'orcid', 'orcid': 'orcid',
'created': 'created', 'created': 'created',
'last_modified': 'last_modified' 'last_modified': 'lastModified'
} }
def __init__(self, id=None, name=None, affiliation=None, orcid=None, created=None, last_modified=None): # noqa: E501 def __init__(self, id=None, firstname=None, lastname=None, affiliation=None, orcid=None, created=None, last_modified=None): # noqa: E501
"""CreatorDto - a model defined in Swagger""" # noqa: E501 """CreatorDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._name = None self._firstname = None
self._lastname = None
self._affiliation = None self._affiliation = None
self._orcid = None self._orcid = None
self._created = None self._created = None
self._last_modified = None self._last_modified = None
self.discriminator = None self.discriminator = None
self.id = id self.id = id
self.name = name self.firstname = firstname
self.lastname = lastname
if affiliation is not None: if affiliation is not None:
self.affiliation = affiliation self.affiliation = affiliation
if orcid is not None: if orcid is not None:
self.orcid = orcid self.orcid = orcid
self.created = created if created is not None:
self.created = created
if last_modified is not None: if last_modified is not None:
self.last_modified = last_modified self.last_modified = last_modified
...@@ -88,27 +93,50 @@ class CreatorDto(object): ...@@ -88,27 +93,50 @@ class CreatorDto(object):
self._id = id self._id = id
@property @property
def name(self): def firstname(self):
"""Gets the name of this CreatorDto. # noqa: E501 """Gets the firstname of this CreatorDto. # noqa: E501
:return: The name of this CreatorDto. # noqa: E501 :return: The firstname of this CreatorDto. # noqa: E501
:rtype: str :rtype: str
""" """
return self._name return self._firstname
@name.setter @firstname.setter
def name(self, name): def firstname(self, firstname):
"""Sets the name of this CreatorDto. """Sets the firstname of this CreatorDto.
:param name: The name of this CreatorDto. # noqa: E501 :param firstname: The firstname of this CreatorDto. # noqa: E501
:type: str :type: str
""" """
if name is None: if firstname is None:
raise ValueError("Invalid value for `name`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `firstname`, must not be `None`") # noqa: E501
self._name = name self._firstname = firstname
@property
def lastname(self):
"""Gets the lastname of this CreatorDto. # noqa: E501
:return: The lastname of this CreatorDto. # noqa: E501
:rtype: str
"""
return self._lastname
@lastname.setter
def lastname(self, lastname):
"""Sets the lastname of this CreatorDto.
:param lastname: The lastname of this CreatorDto. # noqa: E501
:type: str
"""
if lastname is None:
raise ValueError("Invalid value for `lastname`, must not be `None`") # noqa: E501
self._lastname = lastname
@property @property
def affiliation(self): def affiliation(self):
...@@ -170,8 +198,6 @@ class CreatorDto(object): ...@@ -170,8 +198,6 @@ class CreatorDto(object):
:param created: The created of this CreatorDto. # noqa: E501 :param created: The created of this CreatorDto. # noqa: E501
:type: datetime :type: datetime
""" """
if created is None:
raise ValueError("Invalid value for `created`, must not be `None`") # noqa: E501
self._created = created self._created = created
......
swagger/api/api_authentication/models/database_access_dto.py 0 → 100644
+ 170
− 0
View file @ 177edbc3
# coding: utf-8
"""
Database Repository Authentication Service API
Service that manages the authentication # noqa: E501
OpenAPI spec version: 1.1.0-alpha
Contact: andreas.rauber@tuwien.ac.at
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
import pprint
import re # noqa: F401
import six
class DatabaseAccessDto(object):
"""NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
"""
"""
Attributes:
swagger_types (dict): The key is attribute name
and the value is attribute type.
attribute_map (dict): The key is attribute name
and the value is json key in definition.
"""
swagger_types = {
'user': 'UserDto',
'type': 'str',
'created': 'datetime'
}
attribute_map = {
'user': 'user',
'type': 'type',
'created': 'created'
}
def __init__(self, user=None, type=None, created=None): # noqa: E501
"""DatabaseAccessDto - a model defined in Swagger""" # noqa: E501
self._user = None
self._type = None
self._created = None
self.discriminator = None
self.user = user
self.type = type
if created is not None:
self.created = created
@property
def user(self):
"""Gets the user of this DatabaseAccessDto. # noqa: E501
:return: The user of this DatabaseAccessDto. # noqa: E501
:rtype: UserDto
"""
return self._user
@user.setter
def user(self, user):
"""Sets the user of this DatabaseAccessDto.
:param user: The user of this DatabaseAccessDto. # noqa: E501
:type: UserDto
"""
if user is None:
raise ValueError("Invalid value for `user`, must not be `None`") # noqa: E501
self._user = user
@property
def type(self):
"""Gets the type of this DatabaseAccessDto. # noqa: E501
:return: The type of this DatabaseAccessDto. # noqa: E501
:rtype: str
"""
return self._type
@type.setter
def type(self, type):
"""Sets the type of this DatabaseAccessDto.
:param type: The type of this DatabaseAccessDto. # noqa: E501
:type: str
"""
if type is None:
raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501
allowed_values = ["read", "write_own", "write_all"] # noqa: E501
if type not in allowed_values:
raise ValueError(
"Invalid value for `type` ({0}), must be one of {1}" # noqa: E501
.format(type, allowed_values)
)
self._type = type
@property
def created(self):
"""Gets the created of this DatabaseAccessDto. # noqa: E501
:return: The created of this DatabaseAccessDto. # noqa: E501
:rtype: datetime
"""
return self._created
@created.setter
def created(self, created):
"""Sets the created of this DatabaseAccessDto.
:param created: The created of this DatabaseAccessDto. # noqa: E501
:type: datetime
"""
self._created = created
def to_dict(self):
"""Returns the model properties as a dict"""
result = {}
for attr, _ in six.iteritems(self.swagger_types):
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(
lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
value
))
elif hasattr(value, "to_dict"):
result[attr] = value.to_dict()
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0], item[1].to_dict())
if hasattr(item[1], "to_dict") else item,
value.items()
))
else:
result[attr] = value
if issubclass(DatabaseAccessDto, dict):
for key, value in self.items():
result[key] = value
return result
def to_str(self):
"""Returns the string representation of the model"""
return pprint.pformat(self.to_dict())
def __repr__(self):
"""For `print` and `pprint`"""
return self.to_str()
def __eq__(self, other):
"""Returns true if both objects are equal"""
if not isinstance(other, DatabaseAccessDto):
return False
return self.__dict__ == other.__dict__
def __ne__(self, other):
"""Returns true if both objects are not equal"""
return not self == other
swagger/api/api_authentication/models/database_dto.py
+ 44
− 44
View file @ 177edbc3
...@@ -30,15 +30,15 @@ class DatabaseDto(object): ...@@ -30,15 +30,15 @@ class DatabaseDto(object):
swagger_types = { swagger_types = {
'id': 'int', 'id': 'int',
'name': 'str', 'name': 'str',
'exchange': 'str',
'creator': 'UserBriefDto', 'creator': 'UserBriefDto',
'identifier': 'IdentifierDto', 'identifier': 'IdentifierDto',
'description': 'str', 'description': 'str',
'tables': 'list[TableBriefDto]', 'tables': 'list[TableBriefDto]',
'image': 'ImageDto', 'image': 'ImageDto',
'container': 'ContainerDto', 'container': 'ContainerDto',
'accesses': 'list[DatabaseAccessDto]',
'created': 'datetime', 'created': 'datetime',
'deleted': 'datetime', 'exchange_name': 'str',
'internal_name': 'str', 'internal_name': 'str',
'is_public': 'bool' 'is_public': 'bool'
} }
...@@ -46,38 +46,37 @@ class DatabaseDto(object): ...@@ -46,38 +46,37 @@ class DatabaseDto(object):
attribute_map = { attribute_map = {
'id': 'id', 'id': 'id',
'name': 'name', 'name': 'name',
'exchange': 'exchange',
'creator': 'creator', 'creator': 'creator',
'identifier': 'identifier', 'identifier': 'identifier',
'description': 'description', 'description': 'description',
'tables': 'tables', 'tables': 'tables',
'image': 'image', 'image': 'image',
'container': 'container', 'container': 'container',
'accesses': 'accesses',
'created': 'created', 'created': 'created',
'deleted': 'deleted', 'exchange_name': 'exchange_name',
'internal_name': 'internal_name', 'internal_name': 'internal_name',
'is_public': 'is_public' 'is_public': 'is_public'
} }
def __init__(self, id=None, name=None, exchange=None, creator=None, identifier=None, description=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, is_public=None): # noqa: E501 def __init__(self, id=None, name=None, creator=None, identifier=None, description=None, tables=None, image=None, container=None, accesses=None, created=None, exchange_name=None, internal_name=None, is_public=None): # noqa: E501
"""DatabaseDto - a model defined in Swagger""" # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._name = None self._name = None
self._exchange = None
self._creator = None self._creator = None
self._identifier = None self._identifier = None
self._description = None self._description = None
self._tables = None self._tables = None
self._image = None self._image = None
self._container = None self._container = None
self._accesses = None
self._created = None self._created = None
self._deleted = None self._exchange_name = None
self._internal_name = None self._internal_name = None
self._is_public = None self._is_public = None
self.discriminator = None self.discriminator = None
self.id = id self.id = id
self.name = name self.name = name
self.exchange = exchange
self.creator = creator self.creator = creator
if identifier is not None: if identifier is not None:
self.identifier = identifier self.identifier = identifier
...@@ -89,10 +88,11 @@ class DatabaseDto(object): ...@@ -89,10 +88,11 @@ class DatabaseDto(object):
self.image = image self.image = image
if container is not None: if container is not None:
self.container = container self.container = container
if accesses is not None:
self.accesses = accesses
if created is not None: if created is not None:
self.created = created self.created = created
if deleted is not None: self.exchange_name = exchange_name
self.deleted = deleted
self.internal_name = internal_name self.internal_name = internal_name
if is_public is not None: if is_public is not None:
self.is_public = is_public self.is_public = is_public
...@@ -143,29 +143,6 @@ class DatabaseDto(object): ...@@ -143,29 +143,6 @@ class DatabaseDto(object):
self._name = name self._name = name
@property
def exchange(self):
"""Gets the exchange of this DatabaseDto. # noqa: E501
:return: The exchange of this DatabaseDto. # noqa: E501
:rtype: str
"""
return self._exchange
@exchange.setter
def exchange(self, exchange):
"""Sets the exchange of this DatabaseDto.
:param exchange: The exchange of this DatabaseDto. # noqa: E501
:type: str
"""
if exchange is None:
raise ValueError("Invalid value for `exchange`, must not be `None`") # noqa: E501
self._exchange = exchange
@property @property
def creator(self): def creator(self):
"""Gets the creator of this DatabaseDto. # noqa: E501 """Gets the creator of this DatabaseDto. # noqa: E501
...@@ -294,6 +271,27 @@ class DatabaseDto(object): ...@@ -294,6 +271,27 @@ class DatabaseDto(object):
self._container = container self._container = container
@property
def accesses(self):
"""Gets the accesses of this DatabaseDto. # noqa: E501
:return: The accesses of this DatabaseDto. # noqa: E501
:rtype: list[DatabaseAccessDto]
"""
return self._accesses
@accesses.setter
def accesses(self, accesses):
"""Sets the accesses of this DatabaseDto.
:param accesses: The accesses of this DatabaseDto. # noqa: E501
:type: list[DatabaseAccessDto]
"""
self._accesses = accesses
@property @property
def created(self): def created(self):
"""Gets the created of this DatabaseDto. # noqa: E501 """Gets the created of this DatabaseDto. # noqa: E501
...@@ -316,25 +314,27 @@ class DatabaseDto(object): ...@@ -316,25 +314,27 @@ class DatabaseDto(object):
self._created = created self._created = created
@property @property
def deleted(self): def exchange_name(self):
"""Gets the deleted of this DatabaseDto. # noqa: E501 """Gets the exchange_name of this DatabaseDto. # noqa: E501
:return: The deleted of this DatabaseDto. # noqa: E501 :return: The exchange_name of this DatabaseDto. # noqa: E501
:rtype: datetime :rtype: str
""" """
return self._deleted return self._exchange_name
@deleted.setter @exchange_name.setter
def deleted(self, deleted): def exchange_name(self, exchange_name):
"""Sets the deleted of this DatabaseDto. """Sets the exchange_name of this DatabaseDto.
:param deleted: The deleted of this DatabaseDto. # noqa: E501 :param exchange_name: The exchange_name of this DatabaseDto. # noqa: E501
:type: datetime :type: str
""" """
if exchange_name is None:
raise ValueError("Invalid value for `exchange_name`, must not be `None`") # noqa: E501
self._deleted = deleted self._exchange_name = exchange_name
@property @property
def internal_name(self): def internal_name(self):
......
swagger/api/api_authentication/models/identifier_dto.py
+ 1
− 28
View file @ 177edbc3
...@@ -37,7 +37,6 @@ class IdentifierDto(object): ...@@ -37,7 +37,6 @@ class IdentifierDto(object):
'visibility': 'str', 'visibility': 'str',
'doi': 'str', 'doi': 'str',
'publisher': 'str', 'publisher': 'str',
'creator': 'UserDto',
'language': 'str', 'language': 'str',
'license': 'LicenseDto', 'license': 'LicenseDto',
'creators': 'list[CreatorDto]', 'creators': 'list[CreatorDto]',
...@@ -66,7 +65,6 @@ class IdentifierDto(object): ...@@ -66,7 +65,6 @@ class IdentifierDto(object):
'visibility': 'visibility', 'visibility': 'visibility',
'doi': 'doi', 'doi': 'doi',
'publisher': 'publisher', 'publisher': 'publisher',
'creator': 'creator',
'language': 'language', 'language': 'language',
'license': 'license', 'license': 'license',
'creators': 'creators', 'creators': 'creators',
...@@ -85,7 +83,7 @@ class IdentifierDto(object): ...@@ -85,7 +83,7 @@ class IdentifierDto(object):
'last_modified': 'last_modified' 'last_modified': 'last_modified'
} }
def __init__(self, id=None, type=None, title=None, description=None, query=None, execution=None, visibility=None, doi=None, publisher=None, creator=None, language=None, license=None, creators=None, created=None, container_id=None, database_id=None, query_id=None, query_normalized=None, related=None, query_hash=None, result_hash=None, result_number=None, publication_day=None, publication_month=None, publication_year=None, last_modified=None): # noqa: E501 def __init__(self, id=None, type=None, title=None, description=None, query=None, execution=None, visibility=None, doi=None, publisher=None, language=None, license=None, creators=None, created=None, container_id=None, database_id=None, query_id=None, query_normalized=None, related=None, query_hash=None, result_hash=None, result_number=None, publication_day=None, publication_month=None, publication_year=None, last_modified=None): # noqa: E501
"""IdentifierDto - a model defined in Swagger""" # noqa: E501 """IdentifierDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._type = None self._type = None
...@@ -96,7 +94,6 @@ class IdentifierDto(object): ...@@ -96,7 +94,6 @@ class IdentifierDto(object):
self._visibility = None self._visibility = None
self._doi = None self._doi = None
self._publisher = None self._publisher = None
self._creator = None
self._language = None self._language = None
self._license = None self._license = None
self._creators = None self._creators = None
...@@ -127,7 +124,6 @@ class IdentifierDto(object): ...@@ -127,7 +124,6 @@ class IdentifierDto(object):
self.doi = doi self.doi = doi
if publisher is not None: if publisher is not None:
self.publisher = publisher self.publisher = publisher
self.creator = creator
if language is not None: if language is not None:
self.language = language self.language = language
if license is not None: if license is not None:
...@@ -364,29 +360,6 @@ class IdentifierDto(object): ...@@ -364,29 +360,6 @@ class IdentifierDto(object):
self._publisher = publisher self._publisher = publisher
@property
def creator(self):
"""Gets the creator of this IdentifierDto. # noqa: E501
:return: The creator of this IdentifierDto. # noqa: E501
:rtype: UserDto
"""
return self._creator
@creator.setter
def creator(self, creator):
"""Sets the creator of this IdentifierDto.
:param creator: The creator of this IdentifierDto. # noqa: E501
:type: UserDto
"""
if creator is None:
raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501
self._creator = creator
@property @property
def language(self): def language(self):
"""Gets the language of this IdentifierDto. # noqa: E501 """Gets the language of this IdentifierDto. # noqa: E501
......
swagger/api/api_authentication/models/related_identifier_dto.py
+ 1
− 27
View file @ 177edbc3
...@@ -33,7 +33,6 @@ class RelatedIdentifierDto(object): ...@@ -33,7 +33,6 @@ class RelatedIdentifierDto(object):
'type': 'str', 'type': 'str',
'relation': 'str', 'relation': 'str',
'created': 'datetime', 'created': 'datetime',
'deleted': 'datetime',
'last_modified': 'datetime' 'last_modified': 'datetime'
} }
...@@ -43,18 +42,16 @@ class RelatedIdentifierDto(object): ...@@ -43,18 +42,16 @@ class RelatedIdentifierDto(object):
'type': 'type', 'type': 'type',
'relation': 'relation', 'relation': 'relation',
'created': 'created', 'created': 'created',
'deleted': 'deleted',
'last_modified': 'last_modified' 'last_modified': 'last_modified'
} }
def __init__(self, id=None, value=None, type=None, relation=None, created=None, deleted=None, last_modified=None): # noqa: E501 def __init__(self, id=None, value=None, type=None, relation=None, created=None, last_modified=None): # noqa: E501
"""RelatedIdentifierDto - a model defined in Swagger""" # noqa: E501 """RelatedIdentifierDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._value = None self._value = None
self._type = None self._type = None
self._relation = None self._relation = None
self._created = None self._created = None
self._deleted = None
self._last_modified = None self._last_modified = None
self.discriminator = None self.discriminator = None
self.id = id self.id = id
...@@ -64,8 +61,6 @@ class RelatedIdentifierDto(object): ...@@ -64,8 +61,6 @@ class RelatedIdentifierDto(object):
if relation is not None: if relation is not None:
self.relation = relation self.relation = relation
self.created = created self.created = created
if deleted is not None:
self.deleted = deleted
if last_modified is not None: if last_modified is not None:
self.last_modified = last_modified self.last_modified = last_modified
...@@ -192,27 +187,6 @@ class RelatedIdentifierDto(object): ...@@ -192,27 +187,6 @@ class RelatedIdentifierDto(object):
self._created = created self._created = created
@property
def deleted(self):
"""Gets the deleted of this RelatedIdentifierDto. # noqa: E501
:return: The deleted of this RelatedIdentifierDto. # noqa: E501
:rtype: datetime
"""
return self._deleted
@deleted.setter
def deleted(self, deleted):
"""Sets the deleted of this RelatedIdentifierDto.
:param deleted: The deleted of this RelatedIdentifierDto. # noqa: E501
:type: datetime
"""
self._deleted = deleted
@property @property
def last_modified(self): def last_modified(self):
"""Gets the last_modified of this RelatedIdentifierDto. # noqa: E501 """Gets the last_modified of this RelatedIdentifierDto. # noqa: E501
......
swagger/api/api_authentication/models/table_brief_dto.py
+ 28
− 1
View file @ 177edbc3
...@@ -30,6 +30,7 @@ class TableBriefDto(object): ...@@ -30,6 +30,7 @@ class TableBriefDto(object):
swagger_types = { swagger_types = {
'id': 'int', 'id': 'int',
'name': 'str', 'name': 'str',
'description': 'str',
'creator': 'UserBriefDto', 'creator': 'UserBriefDto',
'internal_name': 'str' 'internal_name': 'str'
} }
...@@ -37,19 +38,22 @@ class TableBriefDto(object): ...@@ -37,19 +38,22 @@ class TableBriefDto(object):
attribute_map = { attribute_map = {
'id': 'id', 'id': 'id',
'name': 'name', 'name': 'name',
'description': 'description',
'creator': 'creator', 'creator': 'creator',
'internal_name': 'internal_name' 'internal_name': 'internal_name'
} }
def __init__(self, id=None, name=None, creator=None, internal_name=None): # noqa: E501 def __init__(self, id=None, name=None, description=None, creator=None, internal_name=None): # noqa: E501
"""TableBriefDto - a model defined in Swagger""" # noqa: E501 """TableBriefDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._name = None self._name = None
self._description = None
self._creator = None self._creator = None
self._internal_name = None self._internal_name = None
self.discriminator = None self.discriminator = None
self.id = id self.id = id
self.name = name self.name = name
self.description = description
self.creator = creator self.creator = creator
self.internal_name = internal_name self.internal_name = internal_name
...@@ -99,6 +103,29 @@ class TableBriefDto(object): ...@@ -99,6 +103,29 @@ class TableBriefDto(object):
self._name = name self._name = name
@property
def description(self):
"""Gets the description of this TableBriefDto. # noqa: E501
:return: The description of this TableBriefDto. # noqa: E501
:rtype: str
"""
return self._description
@description.setter
def description(self, description):
"""Sets the description of this TableBriefDto.
:param description: The description of this TableBriefDto. # noqa: E501
:type: str
"""
if description is None:
raise ValueError("Invalid value for `description`, must not be `None`") # noqa: E501
self._description = description
@property @property
def creator(self): def creator(self):
"""Gets the creator of this TableBriefDto. # noqa: E501 """Gets the creator of this TableBriefDto. # noqa: E501
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment