aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-02-12 14:44:37 +1300
committerGitHub <noreply@github.com>2017-02-12 14:44:37 +1300
commit9fc8bdbe23dcbc478dbdfe6d12b6b1f93fb045d1 (patch)
tree58eeaa50c6de6d29f5e0bfee4b4e0a034f993a32
parent35f002d4e2883f8d6373ed8aa29f1c8456975dd6 (diff)
parent49bfc0f90243046e658775016d8461b5982817f0 (diff)
downloadtrackermap-server-9fc8bdbe23dcbc478dbdfe6d12b6b1f93fb045d1.tar.gz
trackermap-server-9fc8bdbe23dcbc478dbdfe6d12b6b1f93fb045d1.tar.bz2
trackermap-server-9fc8bdbe23dcbc478dbdfe6d12b6b1f93fb045d1.zip
Merge pull request #2902 from sunhoww/update_swagger
Update swagger with v3.10 changes
-rw-r--r--swagger.json280
-rwxr-xr-xtools/swagger2html.py10
2 files changed, 286 insertions, 4 deletions
diff --git a/swagger.json b/swagger.json
index 0f298f161..0857138e2 100644
--- a/swagger.json
+++ b/swagger.json
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
- "version": "3.9",
+ "version": "3.10",
"title": "traccar"
},
"host": "demo.traccar.org",
@@ -384,10 +384,82 @@
}
}
},
+ "/permissions/calendars": {
+ "post": {
+ "summary": "Link a Calendar to a User",
+ "parameters": [
+ {
+ "$ref": "#/parameters/CalendarPermission"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/CalendarPermission"
+ }
+ }
+ }
+ },
+ "delete": {
+ "summary": "Remove a Calendar from a User",
+ "parameters": [
+ {
+ "$ref": "#/parameters/CalendarPermission"
+ }
+ ],
+ "responses": {
+ "204": {
+ "description": "No Content"
+ }
+ }
+ }
+ },
+ "/permissions/users": {
+ "post": {
+ "summary": "Link a User to a manager User",
+ "parameters": [
+ {
+ "$ref": "#/parameters/UserPermission"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/UserPermission"
+ }
+ }
+ }
+ },
+ "delete": {
+ "summary": "Remove a User from a manager User",
+ "parameters": [
+ {
+ "$ref": "#/parameters/UserPermission"
+ }
+ ],
+ "responses": {
+ "204": {
+ "description": "No Content"
+ }
+ }
+ }
+ },
"/positions": {
"get": {
"summary" : "Fetches a list of Positions",
"description" : "Without any params, it returns a list of last known positions for all the user's Devices. _from_ and _to_ fields are not required with _id_",
+ "consumes": [
+ "application/json",
+ "text/csv",
+ "application/gpx+xml"
+ ],
+ "produces": [
+ "application/json",
+ "text/csv",
+ "application/gpx+xml"
+ ],
"parameters": [
{
"name": "deviceId",
@@ -474,6 +546,14 @@
"consumes": [
"application/x-www-form-urlencoded"
],
+ "parameters": [
+ {
+ "name": "token",
+ "in": "query",
+ "required": false,
+ "type": "string"
+ }
+ ],
"responses": {
"200": {
"description": "OK",
@@ -534,6 +614,15 @@
"/users": {
"get": {
"summary": "Fetch a list of Users",
+ "parameters": [
+ {
+ "name": "userId",
+ "in": "query",
+ "description": "Can only be used by admin or manager users",
+ "required": false,
+ "type": "string"
+ }
+ ],
"responses": {
"200": {
"description": "OK",
@@ -786,6 +875,14 @@
"get": {
"summary": "Fetch a list of Positions within the time period for the Devices or Groups",
"description": "At least one _deviceId_ or one _groupId_ must be passed",
+ "consumes": [
+ "application/json",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+ ],
+ "produces": [
+ "application/json",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+ ],
"parameters": [
{
"$ref": "#/parameters/deviceIdArray"
@@ -817,6 +914,14 @@
"get": {
"summary": "Fetch a list of Events within the time period for the Devices or Groups",
"description": "At least one _deviceId_ or one _groupId_ must be passed",
+ "consumes": [
+ "application/json",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+ ],
+ "produces": [
+ "application/json",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+ ],
"parameters": [
{
"$ref": "#/parameters/deviceIdArray"
@@ -857,6 +962,14 @@
"get": {
"summary": "Fetch a list of ReportSummary within the time period for the Devices or Groups",
"description": "At least one _deviceId_ or one _groupId_ must be passed",
+ "consumes": [
+ "application/json",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+ ],
+ "produces": [
+ "application/json",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+ ],
"parameters": [
{
"$ref": "#/parameters/deviceIdArray"
@@ -888,6 +1001,14 @@
"get": {
"summary": "Fetch a list of ReportTrips within the time period for the Devices or Groups",
"description": "At least one _deviceId_ or one _groupId_ must be passed",
+ "consumes": [
+ "application/json",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+ ],
+ "produces": [
+ "application/json",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+ ],
"parameters": [
{
"$ref": "#/parameters/deviceIdArray"
@@ -1010,6 +1131,81 @@
}
}
}
+ },
+ "/calendars": {
+ "get": {
+ "summary": "Fetch a list of Calendars",
+ "description": "Without params, it returns a list of Calendars the user has access to",
+ "parameters": [
+ {
+ "$ref": "#/parameters/all"
+ },
+ {
+ "$ref": "#/parameters/userId"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/Calendar"
+ }
+ }
+ }
+ }
+ },
+ "post": {
+ "summary": "Create a Calendar",
+ "parameters": [
+ {
+ "$ref": "#/parameters/Calendar"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/Calendar"
+ }
+ }
+ }
+ }
+ },
+ "/calendars/{id}": {
+ "put": {
+ "summary": "Update a Calendar",
+ "parameters": [
+ {
+ "$ref": "#/parameters/entityId"
+ },
+ {
+ "$ref": "#/parameters/Calendar"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/Calendar"
+ }
+ }
+ }
+ },
+ "delete": {
+ "summary": "Delete a Calendar",
+ "parameters": [
+ {
+ "$ref": "#/parameters/entityId"
+ }
+ ],
+ "responses": {
+ "204": {
+ "description": "No Content"
+ }
+ }
+ }
}
},
"definitions": {
@@ -1064,6 +1260,12 @@
"address": {
"type": "string"
},
+ "accuracy": {
+ "type": "number"
+ },
+ "network": {
+ "type": "string"
+ },
"attributes": {}
}
},
@@ -1122,6 +1324,12 @@
"deviceLimit": {
"type": "integer"
},
+ "userLimit": {
+ "type": "integer"
+ },
+ "deviceReadonly": {
+ "type": "boolean"
+ },
"token": {
"type": "string"
},
@@ -1279,6 +1487,26 @@
}
}
},
+ "CalendarPermission": {
+ "properties": {
+ "userId": {
+ "type": "integer"
+ },
+ "calendarId": {
+ "type": "integer"
+ }
+ }
+ },
+ "UserPermission": {
+ "properties": {
+ "userId": {
+ "type": "integer"
+ },
+ "managedUserId": {
+ "type": "integer"
+ }
+ }
+ },
"GroupGeofence": {
"properties": {
"groupId": {
@@ -1320,6 +1548,9 @@
"area": {
"type": "string"
},
+ "calendarId": {
+ "type": "integer"
+ },
"attributes": {}
}
},
@@ -1334,6 +1565,12 @@
"userId": {
"type": "integer"
},
+ "web": {
+ "type": "boolean"
+ },
+ "mail": {
+ "type": "boolean"
+ },
"attributes": {}
}
},
@@ -1490,6 +1727,21 @@
"description": "in meters"
}
}
+ },
+ "Calendar": {
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ },
+ "data": {
+ "type": "string",
+ "description": "base64 encoded in iCalendar format"
+ },
+ "atributes": {}
+ }
}
},
"parameters": {
@@ -1502,7 +1754,7 @@
"all": {
"name": "all",
"in": "query",
- "description": "Can only be used by admin users to fetch all entities",
+ "description": "Can only be used by admins or managers to fetch all entities",
"type": "boolean"
},
"userId": {
@@ -1573,6 +1825,22 @@
"$ref": "#/definitions/GeofencePermission"
}
},
+ "CalendarPermission": {
+ "name": "body",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/CalendarPermission"
+ }
+ },
+ "UserPermission": {
+ "name": "body",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/UserPermission"
+ }
+ },
"User": {
"name": "body",
"in": "body",
@@ -1597,6 +1865,14 @@
"$ref": "#/definitions/AttributeAlias"
}
},
+ "Calendar": {
+ "name": "body",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/Calendar"
+ }
+ },
"deviceIdArray": {
"name": "deviceId",
"in": "query",
diff --git a/tools/swagger2html.py b/tools/swagger2html.py
index a3488835c..1121f04c9 100755
--- a/tools/swagger2html.py
+++ b/tools/swagger2html.py
@@ -224,11 +224,17 @@ def make_responses_table(responses):
except KeyError as e:
handleException('KeyError', e)
+def sorted_by_method(section):
+ sorting_function = lambda x: [ 'GET', 'POST', 'PUT', 'DELETE' ].index(
+ x['title'].split(' ')[0]
+ )
+ return sorted(sorted(section), key=sorting_function)
+
def make_paths(sections, json_data):
md = '<h2><a name="paths"></a>Paths</h2>\n'
for key in sorted(sections):
md += '<h3><a name="paths_{0}"></a>{0}</h3>\n'.format(key)
- for section in sections[key]:
+ for section in sorted_by_method(sections[key]):
md += '<h4><a name="{}"></a><code>{}</code></h4>\n'.format(
section['href'], section['title']
)
@@ -256,7 +262,7 @@ def make_contents(path_section, json_data):
for key in sorted(path_section):
md += ' <li><a href="#paths_{0}">{0}</a>\n'.format(key)
md += ' <ul>\n'
- for section in path_section[key]:
+ for section in sorted_by_method(path_section[key]):
md += ' <li><a href="#{}">{}</a></li>\n'.format(
section['href'], section['title']
)