From 01b2378d6d148ac1725d6497439c7fa2f8dfa299 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 1 Apr 2018 10:59:09 +0200 Subject: [PATCH] Fix tests by adding json analysis --- api/apib/data_structures/_log.apib | 79 +++ api/apib/data_structures/_player.apib | 2 +- api/apib/data_structures/_war.apib | 3 +- api/apib/data_structures/index.apib | 2 + api/apib/dev-doc.apib | 2 + api/apib/statistics/logs.apib | 18 + api/apib/statistics/players.apib | 12 +- api/apib/statistics/wars.apib | 2 +- api/package-lock.json | 960 +------------------------- api/package.json | 2 +- api/routes/logs.js | 5 +- 11 files changed, 141 insertions(+), 946 deletions(-) create mode 100644 api/apib/data_structures/_log.apib create mode 100644 api/apib/statistics/logs.apib diff --git a/api/apib/data_structures/_log.apib b/api/apib/data_structures/_log.apib new file mode 100644 index 0000000..6efebd3 --- /dev/null +++ b/api/apib/data_structures/_log.apib @@ -0,0 +1,79 @@ +# Log (object) +## Properties ++ _id: `` (string, required) - log entry id ++ war: `` (string, required) - warId ++ time: `` (string, required) - logging timestamp ++ __v: 0 (number, required) - object version number + +# LogPoints (Log) +## Properties ++ ptBlufor: 2 (number, required) - ++ ptOpfor: 4 (number, required) - ++ fraction: `OPFOR` (enum, required) + + Members + + `BLUFOR` + + `OPFOR` + + `NONE` + +#LogBudget (Log) +## Properties ++ oldBudget: 400000 (number, required) ++ newBudget: 380000 (number, required) ++ fraction: `BLUFOR` (enum, required) + + Members + + `BLUFOR` + + `OPFOR` + +#LogFlag (Log) +## Properties ++ player: `HardiReady` (string, required) ++ capture: true (boolean, required) ++ flagFraction: `BLUFOR` (enum, required) + + Members + + `BLUFOR` + + `OPFOR` + +#LogKill (Log) +## Properties ++ shooter: `HardiReady` (string, required) ++ target: `KalleK` (string, required) ++ friendlyFire: true (boolean, required) ++ fraction: `BLUFOR` (enum, required) + + Members + + `BLUFOR` + + `OPFOR` + + `NONE` + +#LogRespawn (Log) +## Properties ++ player: `radical1976` (string, required) + +#LogRevive (Log) +## Properties ++ medic: `radical1976` (string, required) ++ patient: `radical1976` (string, required) ++ stabilized: false (boolean, required) ++ flagFraction: `BLUFOR` (enum, required) + + Members + + `BLUFOR` + + `OPFOR` + +#LogTransport (Log) +## Properties ++ driver: `radical1976` (string, required) ++ passenger: `radical1976` (string, required) ++ distance: 2435 (number, required) ++ flagFraction: `BLUFOR` (enum, required) + + Members + + `BLUFOR` + + `OPFOR` + +#LogVehicle (Log) +## Properties ++ shooter: `HardiReady` (string, required) ++ target: `Murda]X[` (string, required) ++ fraction: `BLUFOR` (enum, required) + + Members + + `BLUFOR` + + `OPFOR` + + `NONE` diff --git a/api/apib/data_structures/_player.apib b/api/apib/data_structures/_player.apib index c6404d1..0c77839 100644 --- a/api/apib/data_structures/_player.apib +++ b/api/apib/data_structures/_player.apib @@ -14,7 +14,7 @@ Basic player statistic information object + revive: 0 (number, required) - sum of revives -# CampaignPlayer (BasicPlayer) +# WarPlayer (BasicPlayer) A player campaign statistics object ## Properties diff --git a/api/apib/data_structures/_war.apib b/api/apib/data_structures/_war.apib index aac5b1f..075d309 100644 --- a/api/apib/data_structures/_war.apib +++ b/api/apib/data_structures/_war.apib @@ -14,7 +14,8 @@ A war as used in statistics + budgetBlufor: 3900000 (number, required) - start budget of fraction Blufor + budgetOpfor: 4100000 (number, required) - start budget of fraction Opfor + endBudgetBlufor: 924000 (number, required) - end budget of fraction Blufor -+ endBudgetOpfor: -12400 (number, required) - end budget of fraction Opfor ++ endBudgetOpfor: 12400 (number, required) - end budget of fraction Opfor ++ players (array[WarPlayer], required) - collection of all participating players with their statistics + timestamp: `2018-02-24T01:01:25.825Z` (string, required) - creation date + updatedAt: `2018-02-24T01:01:25.825Z` (string, required) - the version timestamp + __v: 0 (number, required) - the version number of the object diff --git a/api/apib/data_structures/index.apib b/api/apib/data_structures/index.apib index e53caff..98a98ec 100644 --- a/api/apib/data_structures/index.apib +++ b/api/apib/data_structures/index.apib @@ -12,6 +12,8 @@ :[Gists](_decoration.apib) +:[Gists](_log.apib) + :[Gists](_player.apib) :[Gists](_promotion.apib) diff --git a/api/apib/dev-doc.apib b/api/apib/dev-doc.apib index 571988c..889be31 100644 --- a/api/apib/dev-doc.apib +++ b/api/apib/dev-doc.apib @@ -40,6 +40,8 @@ FORMAT: 1A # Group Logs +:[Gists](statistics/logs.apib) + # Group Players :[Gists](statistics/players.apib) diff --git a/api/apib/statistics/logs.apib b/api/apib/statistics/logs.apib new file mode 100644 index 0000000..86f1e60 --- /dev/null +++ b/api/apib/statistics/logs.apib @@ -0,0 +1,18 @@ +### Get War Logs [GET /logs/{warId}] + +Ge the combined log object, containing all events in collections, for a single war + ++ Parameters + + warId: `5abf65ae3fc5fa349ffd5ca3` (string, required) - unique id of the war + ++ Response 200 (application/json; charset=utf-8) + + + Attributes + + points (array[LogPoints], required) + + budget (array[LogBudget], required) + + respawn (array[LogRespawn], required) + + revive (array[LogRevive], required) + + kill (array[LogKill], required) + + vehicle (array[LogVehicle], required) + + transport (array[LogTransport], required) + + flag (array[LogFlag], required) diff --git a/api/apib/statistics/players.apib b/api/apib/statistics/players.apib index 2042bb6..033c691 100644 --- a/api/apib/statistics/players.apib +++ b/api/apib/statistics/players.apib @@ -1,4 +1,4 @@ -### Get Player Highscore [GET /ranking/{campaignId}] +### Get Player Highscore [GET /players/ranking/{campaignId}] List highscores for player statistics over all wars of a certain campaign. Every highscore player object contains a field *sum*, representing its order number in the collection @@ -6,7 +6,7 @@ Every highscore player object contains a field *sum*, representing its order num + Parameters + campaignId: `5abd55ea9e30a76bfef747d6` (string, required) - unique id of the campaign -+ Response 200 ++ Response 200 (application/json; charset=utf-8) + Attributes + kill (array[HighscorePlayer],required) - player highscore for kill @@ -18,17 +18,17 @@ Every highscore player object contains a field *sum*, representing its order num + flagTouch (array[HighscorePlayer],required) - player highscore for flag captures -### Get Player Campaign Statistics [GET /single/{campaignId}/{playerId}] +### Get Player Campaign Statistics [GET /players/single/{campaignId}/{playerSteamId}] Get statistics for a single player for all wars of a campaign he took part at + Parameters + campaignId: `5abd55ea9e30a76bfef747d6` (string, required) - unique id of the campaign - + playerId: `5abf65ae3fc5fa349ffd5ca4` (string, required) - unique id of the player + + playerSteamId: `76561198050321490` (string, required) - STEAM application unique user id of player -+ Response 200 ++ Response 200 (application/json; charset=utf-8) + Attributes + name: `Pumarang` (string, required) - latest used playername + campaign (Campaign,required) - campaign reflected from request is - + players (array[CampaignPlayer],required) - collection of player instances in the campaign + + players (array[WarPlayer],required) - collection of player instances in the campaign diff --git a/api/apib/statistics/wars.apib b/api/apib/statistics/wars.apib index 93d8727..32c9c8c 100644 --- a/api/apib/statistics/wars.apib +++ b/api/apib/statistics/wars.apib @@ -13,7 +13,7 @@ Retrieve single war data + Parameters + id: `5abf65ae3fc5fa349ffd5ca3` (string, required) - unique id of the war to fetch -+ Response 200 ++ Response 200 (application/json; charset=utf-8) + Attributes (War, fixed-type) diff --git a/api/package-lock.json b/api/package-lock.json index bcd188d..1610b1d 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -110,7 +110,6 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", - "fsevents": "1.1.3", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -1326,7 +1325,6 @@ "anymatch": "2.0.0", "async-each": "1.0.1", "braces": "2.3.0", - "fsevents": "1.1.3", "glob-parent": "3.1.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -2419,9 +2417,9 @@ "dev": true }, "dredd": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/dredd/-/dredd-5.1.4.tgz", - "integrity": "sha512-s//tNxzhc0N1f+rJwk0DxyInrtLDvTR9V+hJUavSTGmLVbavx89MCot+igjNtt2GfRB836CzcxB/KU6PJcMK9w==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/dredd/-/dredd-5.1.5.tgz", + "integrity": "sha512-Z8ihEYJjo6T26ys0fP3UbUhO4KHh9/oju7r+Uj+v2jcRhwBnKRWqxkkzKdDuZOnCPymRRgMIxQ44QuSG1onc9A==", "dev": true, "requires": { "async": "2.6.0", @@ -2430,7 +2428,7 @@ "clone": "2.1.1", "coffeescript": "1.12.7", "cross-spawn": "6.0.5", - "dredd-transactions": "6.0.1", + "dredd-transactions": "6.0.2", "file": "0.2.2", "fs-extra": "5.0.0", "gavel": "1.1.1", @@ -2523,15 +2521,15 @@ } }, "dredd-transactions": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dredd-transactions/-/dredd-transactions-6.0.1.tgz", - "integrity": "sha512-WGIHGoWQPiUNTIy3W57Bmey7rM+OJccf1BfJMZh8uiSP5Df6lH/ga/MNN2Wyex85TChZhm1IqV+IYC94w2+QLw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/dredd-transactions/-/dredd-transactions-6.0.2.tgz", + "integrity": "sha512-4abrX4zUktbs2OqhVpnp5ziizEfsNNxAz1nw9lP0mqyhmRSYUm4eacSVXqRY/74A9mzlQFdYxR7nZMI6bMVZ0Q==", "dev": true, "requires": { "clone": "2.1.1", "fury": "3.0.0-beta.6", "fury-adapter-apib-parser": "0.10.0", - "fury-adapter-swagger": "0.16.1", + "fury-adapter-swagger": "0.18.0", "uri-template": "1.0.1" }, "dependencies": { @@ -3517,910 +3515,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz", - "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.6.39" - }, - "dependencies": { - "abbrev": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "balanced-match": { - "version": "0.4.2", - "bundled": true, - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "0.4.2", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true - }, - "co": { - "version": "4.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "dev": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "debug": { - "version": "2.6.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.1.1", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "dev": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true, - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true, - "dev": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "dev": true, - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "node-pre-gyp": { - "version": "0.6.39", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.2", - "hawk": "3.1.3", - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true, - "dev": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "bundled": true, - "dev": true, - "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" - } - }, - "rimraf": { - "version": "2.6.1", - "bundled": true, - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.0.1", - "bundled": true, - "dev": true - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "dev": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "dev": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "dev": true, - "optional": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "verror": { - "version": "1.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - } - } - }, "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", @@ -4450,9 +3544,9 @@ } }, "fury-adapter-swagger": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/fury-adapter-swagger/-/fury-adapter-swagger-0.16.1.tgz", - "integrity": "sha512-52WtuF2opkKwF9sm87FuhlNrNQWpRT77jSWz+uY+IYvY0hse4FDY8Bq66XwQ9RFv90z8Ffkis1YPoP7SL9GdoQ==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/fury-adapter-swagger/-/fury-adapter-swagger-0.18.0.tgz", + "integrity": "sha1-EjHoe5qX2LY9ab+v7ZmzCl5OhNY=", "dev": true, "requires": { "babel-runtime": "6.26.0", @@ -4474,8 +3568,8 @@ "amanda": "0.5.1", "async": "2.6.0", "caseless": "0.12.0", - "clone": "2.1.1", - "commander": "2.15.0", + "clone": "2.1.2", + "commander": "2.15.1", "curl-trace-parser": "0.0.8", "deep-equal": "1.0.1", "googlediff": "0.1.0", @@ -4488,16 +3582,24 @@ }, "dependencies": { "clone": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", - "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", "dev": true }, "commander": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz", - "integrity": "sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true + }, + "jsonlint": { + "version": "git+https://git@github.com/josdejong/jsonlint.git#85a19d77126771f3177582e3d09c6ffae185d391", + "dev": true, + "requires": { + "JSV": "4.0.2", + "nomnom": "1.8.1" + } } } }, @@ -5981,14 +5083,6 @@ "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" }, - "jsonlint": { - "version": "git+https://git@github.com/josdejong/jsonlint.git#85a19d77126771f3177582e3d09c6ffae185d391", - "dev": true, - "requires": { - "JSV": "4.0.2", - "nomnom": "1.8.1" - } - }, "jsonwebtoken": { "version": "7.4.3", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz", diff --git a/api/package.json b/api/package.json index ac3a0e9..3d9b262 100644 --- a/api/package.json +++ b/api/package.json @@ -44,7 +44,7 @@ "aglio": "^2.3.0", "chai": "^3.5.0", "chai-http": "^3.0.0", - "dredd": "^5.1.4", + "dredd": "^5.1.5", "eslint": "^4.18.2", "eslint-config-google": "^0.9.1", "hercule": "^4.1.1", diff --git a/api/routes/logs.js b/api/routes/logs.js index fd6b280..e277a41 100644 --- a/api/routes/logs.js +++ b/api/routes/logs.js @@ -58,11 +58,10 @@ logsRouter.route('/:warId') async.parallel(resources, (error, results) => { if (error) { - res.status(500).send(error); - return; + res.status(500); } res.locals.items = results; - next(); + next(error); }); }) .all(