Merge pull request #78 from urbanriskmap/dev

Merge dev to form v3.0.5
urbanriskmap · Jan 23, 2018 · 87d992d · 87d992d
2 parents 9dc4ab7 + 8805cb7
commit 87d992d
Show file tree

Hide file tree

Showing 15 changed files with 351 additions and 82 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,4 @@
 {
-  "presets": [ "es2015", "stage-0" ],
+  "presets": [ "env" ],
   "plugins": [ "istanbul" ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,3 +36,11 @@ API Server for CogniCity
 ### v3.0.4
 * Added Semarang instance for Indonesian deployment
 * Fixed out of date link in README to list of releases
+
+### v3.0.5
+* Fixed bug in API (swagger-api.json) for flood archive and timeseries endpoints
+* Added PATCH /reports/:id endpoint for "points"
+* Updated documentation of Swagger files
+* Updated Babel package
+* Remove username field from GET /cards/:id
+* Fix bug with time series endpoints
diff --git a/README.md b/README.md
@@ -130,6 +130,7 @@ Before deployment:
 The release procedure is as follows:
 * Update the CHANGELOG.md file with the newly released version, date, and a high-level overview of changes. Commit the change.
 * Build code documentation and commit changes.
+* Download the latest version of the Swagger API file for include in the release
 * Create a tag in git from the current head of master. The tag version should be the same as the version specified in the package.json file - this is the release version.
 * Update the version in the package.json file and commit the change.
 * Further development is now on the updated version number until the release process begins again.

diff --git a/apigw/pb/swagger.json b/apigw/pb/swagger.json
@@ -1,10 +1,10 @@
 {
   "swagger": "2.0",
   "info": {
-    "version": "2017-12-15T20:27:30Z",
+    "version": "2018-01-08T21:39:08Z",
     "title": "cognicity"
   },
-  "host": "data.petabencana.id",
+  "host": "data-dev.petabencana.id",
   "schemes": [
     "https"
   ],
@@ -732,9 +732,6 @@
         }
       },
       "x-amazon-apigateway-any-method": {
-        "produces": [
-          "application/json"
-        ],
         "parameters": [
           {
             "name": "format",
@@ -774,8 +771,7 @@
     "/floods": {
       "get": {
         "produces": [
-          "application/json",
-          "text/xml"
+          "application/json"
         ],
         "parameters": [
           {
@@ -1200,14 +1196,19 @@
         }
       }
     },
-    "/floods/{id+}": {
-      "options": {
-        "consumes": [
-          "application/json"
-        ],
+    "/floods/{localAreaId}": {
+      "put": {
         "produces": [
           "application/json"
         ],
+        "parameters": [
+          {
+            "name": "localAreaId",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
+        ],
         "responses": {
           "200": {
             "description": "200 response",
@@ -1217,12 +1218,6 @@
             "headers": {
               "Access-Control-Allow-Origin": {
                 "type": "string"
-              },
-              "Access-Control-Allow-Methods": {
-                "type": "string"
-              },
-              "Access-Control-Allow-Headers": {
-                "type": "string"
               }
             }
           }
@@ -1232,57 +1227,105 @@
             "default": {
               "statusCode": "200",
               "responseParameters": {
-                "method.response.header.Access-Control-Allow-Methods": "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'",
-                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'",
                 "method.response.header.Access-Control-Allow-Origin": "'*'"
               }
             }
           },
-          "passthroughBehavior": "when_no_match",
-          "requestTemplates": {
-            "application/json": "{\"statusCode\": 200}"
+          "requestParameters": {
+            "integration.request.path.localAreaId": "method.request.path.localAreaId"
           },
-          "type": "mock"
+          "uri": "https://${stageVariables.env}.petabencana.id/floods/{localAreaId}",
+          "passthroughBehavior": "when_no_match",
+          "httpMethod": "PUT",
+          "type": "http_proxy"
         }
       },
-      "x-amazon-apigateway-any-method": {
+      "delete": {
         "produces": [
           "application/json"
         ],
         "parameters": [
           {
-            "name": "format",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "id",
+            "name": "localAreaId",
             "in": "path",
             "required": true,
             "type": "string"
           }
         ],
-        "responses": {},
+        "responses": {
+          "200": {
+            "description": "200 response",
+            "schema": {
+              "$ref": "#/definitions/Empty"
+            },
+            "headers": {
+              "Access-Control-Allow-Origin": {
+                "type": "string"
+              }
+            }
+          }
+        },
         "x-amazon-apigateway-integration": {
           "responses": {
             "default": {
-              "statusCode": "200"
+              "statusCode": "200",
+              "responseParameters": {
+                "method.response.header.Access-Control-Allow-Origin": "'*'"
+              }
             }
           },
           "requestParameters": {
-            "integration.request.path.id": "method.request.path.id"
+            "integration.request.path.localAreaId": "method.request.path.localAreaId"
           },
-          "uri": "https://${stageVariables.env}.petabencana.id/floods/{id}",
+          "uri": "https://${stageVariables.env}.petabencana.id/floods/{localAreaId}",
           "passthroughBehavior": "when_no_match",
-          "httpMethod": "ANY",
-          "cacheNamespace": "8q9uet",
-          "cacheKeyParameters": [
-            "method.request.path.id",
-            "method.request.querystring.format"
-          ],
+          "httpMethod": "DELETE",
           "type": "http_proxy"
         }
+      },
+      "options": {
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "200": {
+            "description": "200 response",
+            "schema": {
+              "$ref": "#/definitions/Empty"
+            },
+            "headers": {
+              "Access-Control-Allow-Origin": {
+                "type": "string"
+              },
+              "Access-Control-Allow-Methods": {
+                "type": "string"
+              },
+              "Access-Control-Allow-Headers": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "x-amazon-apigateway-integration": {
+          "responses": {
+            "default": {
+              "statusCode": "200",
+              "responseParameters": {
+                "method.response.header.Access-Control-Allow-Methods": "'DELETE,OPTIONS,PUT'",
+                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'",
+                "method.response.header.Access-Control-Allow-Origin": "'*'"
+              }
+            }
+          },
+          "passthroughBehavior": "when_no_match",
+          "requestTemplates": {
+            "application/json": "{\"statusCode\": 200}"
+          },
+          "type": "mock"
+        }
       }
     },
     "/infrastructure": {
@@ -1377,9 +1420,6 @@
         }
       },
       "x-amazon-apigateway-any-method": {
-        "produces": [
-          "application/json"
-        ],
         "parameters": [
           {
             "name": "type",
@@ -1749,7 +1789,66 @@
         }
       }
     },
-    "/reports/{id+}": {
+    "/reports/{id}": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "name": "geoformat",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "format",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "200 response",
+            "schema": {
+              "$ref": "#/definitions/Empty"
+            },
+            "headers": {
+              "Access-Control-Allow-Origin": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "x-amazon-apigateway-integration": {
+          "responses": {
+            "default": {
+              "statusCode": "200",
+              "responseParameters": {
+                "method.response.header.Access-Control-Allow-Origin": "'*'"
+              }
+            }
+          },
+          "requestParameters": {
+            "integration.request.path.id": "method.request.path.id"
+          },
+          "uri": "https://${stageVariables.env}.petabencana.id/reports/{id}",
+          "passthroughBehavior": "when_no_match",
+          "httpMethod": "ANY",
+          "cacheNamespace": "5tep32",
+          "cacheKeyParameters": [
+            "method.request.path.id"
+          ],
+          "type": "http_proxy"
+        }
+      },
       "options": {
         "consumes": [
           "application/json"
@@ -1781,7 +1880,7 @@
             "default": {
               "statusCode": "200",
               "responseParameters": {
-                "method.response.header.Access-Control-Allow-Methods": "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'",
+                "method.response.header.Access-Control-Allow-Methods": "'GET,OPTIONS,PATCH'",
                 "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'",
                 "method.response.header.Access-Control-Allow-Origin": "'*'"
               }
@@ -1794,29 +1893,41 @@
           "type": "mock"
         }
       },
-      "x-amazon-apigateway-any-method": {
+      "patch": {
         "produces": [
           "application/json"
         ],
         "parameters": [
-          {
-            "name": "format",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
           {
             "name": "id",
             "in": "path",
             "required": true,
             "type": "string"
           }
         ],
-        "responses": {},
+        "responses": {
+          "200": {
+            "description": "200 response",
+            "schema": {
+              "$ref": "#/definitions/Empty"
+            },
+            "headers": {
+              "Access-Control-Allow-Origin": {
+                "type": "string"
+              }
+            }
+          },
+          "404": {
+            "description": "404 response"
+          }
+        },
         "x-amazon-apigateway-integration": {
           "responses": {
             "default": {
-              "statusCode": "200"
+              "statusCode": "200",
+              "responseParameters": {
+                "method.response.header.Access-Control-Allow-Origin": "'*'"
+              }
             }
           },
           "requestParameters": {
@@ -1827,8 +1938,7 @@
           "httpMethod": "ANY",
           "cacheNamespace": "5tep32",
           "cacheKeyParameters": [
-            "method.request.path.id",
-            "method.request.querystring.format"
+            "method.request.path.id"
           ],
           "type": "http_proxy"
         }
@@ -2211,6 +2321,22 @@
       "title": "Empty Schema"
     }
   },
+  "x-amazon-apigateway-gateway-responses": {
+    "DEFAULT_4XX": {
+      "responseParameters": {
+        "gatewayresponse.header.Access-Control-Allow-Methods": "'DELETE,OPTIONS,PUT'",
+        "gatewayresponse.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'",
+        "gatewayresponse.header.Access-Control-Allow-Origin": "'*'"
+      }
+    },
+    "DEFAULT_5XX": {
+      "responseParameters": {
+        "gatewayresponse.header.Access-Control-Allow-Methods": "'DELETE,OPTIONS,PUT'",
+        "gatewayresponse.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'",
+        "gatewayresponse.header.Access-Control-Allow-Origin": "'*'"
+      }
+    }
+  },
   "x-amazon-apigateway-binary-media-types": [
     "application/gzip",
     "application/x-gzip",