Merge branch 'main' into location-query-func

cornellh4i · Oct 18, 2023 · 326334e · 326334e
2 parents b53b640 + 15ce25e
commit 326334e
Show file tree

Hide file tree

Showing 9 changed files with 443 additions and 51 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# Users who will be automatically be notified & added as reviewers when a PR is made (should be TL)
+
+- @jfeuerstein
+
+# Change the user above as necessary
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,31 @@
+<!-- IF A SECTION IS NOT APPLICABLE TO YOU, PLEASE DELETE IT!! -->
+
+<!-- Your title should be able to summarize what changes you've made in one sentence. For example: "Exclude staff from the check for follows". -->
+
+## Overview
+
+<!-- Summarize your changes here. -->
+
+## Changes Made
+
+<!-- Include details of what your changes actually are and how it is intended to work. -->
+
+## Test Coverage
+
+<!-- Describe how you tested this feature. Manual testing and/or unit testing. Please include repro steps and/or how to turn the feature on if applicable. -->
+
+## Related PRs or Issues (delete if not applicable)
+
+<!-- List related PRs against other branches/repositories. Link to relevant issue -->
+
+## Screenshots (delete if not applicable)
+
+<!-- This could include of screenshots of the new feature / proof that the changes work. -->
+
+<details>
+
+  <summary>Screen Shot Name</summary>
+
+  <!-- Insert file link here. Newlines above and below your link are necessary for this to work. -->
+
+</details>
diff --git a/backend/api-spec.json b/backend/api-spec.json
@@ -5,7 +5,7 @@
     "title": "My API",
     "description": "Documentation automatically generated by the <b>swagger-autogen</b> module."
   },
-  "host": "localhost:3000",
+  "host": "localhost:8000",
   "basePath": "/",
   "tags": [
     {
@@ -52,7 +52,7 @@
         }
       }
     },
-    "/users/": {
+    "/clusters/": {
       "get": {
         "description": "",
         "parameters": [],
@@ -64,19 +64,47 @@
       },
       "post": {
         "description": "",
-        "parameters": [],
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "location": {
+                  "example": "any"
+                }
+              }
+            }
+          }
+        ],
         "responses": {
-          "200": {
-            "description": "OK"
+          "201": {
+            "description": "Created"
           }
         }
       }
     },
-    "/customers/": {
-      "get": {
-        "tags": [
-          "Customers"
+    "/clusters/delete/{id}": {
+      "delete": {
+        "description": "",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
         ],
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/clusters/nets/": {
+      "get": {
         "description": "",
         "parameters": [],
         "responses": {
@@ -86,9 +114,6 @@
         }
       },
       "post": {
-        "tags": [
-          "Customers"
-        ],
         "description": "",
         "parameters": [
           {
@@ -97,16 +122,10 @@
             "schema": {
               "type": "object",
               "properties": {
-                "name": {
-                  "example": "any"
-                },
-                "age": {
-                  "example": "any"
-                },
-                "title": {
+                "clusterID": {
                   "example": "any"
                 },
-                "company": {
+                "type": {
                   "example": "any"
                 }
               }
@@ -120,11 +139,8 @@
         }
       }
     },
-    "/customers/{id}": {
+    "/clusters/nets/{id}": {
       "get": {
-        "tags": [
-          "Customers"
-        ],
         "description": "",
         "parameters": [
           {
@@ -141,44 +157,161 @@
         }
       }
     },
-    "/customers/updateName/{id}": {
-      "put": {
-        "tags": [
-          "Customers"
-        ],
+    "/clusters/net/delete/{id}": {
+      "delete": {
         "description": "",
         "parameters": [
           {
             "name": "id",
             "in": "path",
             "required": true,
             "type": "string"
-          },
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/clusters/data/": {
+      "get": {
+        "description": "",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      },
+      "post": {
+        "description": "",
+        "parameters": [
           {
             "name": "body",
             "in": "body",
             "schema": {
               "type": "object",
               "properties": {
-                "name": {
+                "netID": {
+                  "example": "any"
+                },
+                "date": {
+                  "example": "any"
+                },
+                "water_collected": {
                   "example": "any"
                 }
               }
             }
           }
         ],
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/clusters/data/{id}": {
+      "get": {
+        "description": "",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
+        ],
         "responses": {
           "200": {
             "description": "OK"
           }
         }
       }
     },
-    "/customers/resetAges": {
-      "post": {
-        "tags": [
-          "Customers"
+    "/clusters/data/delete/{id}": {
+      "delete": {
+        "description": "",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
         ],
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/clusters/clusterData/dates/{minDate}/{maxDate}/": {
+      "get": {
+        "description": "",
+        "parameters": [
+          {
+            "name": "minDate",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "maxDate",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/clusters/clusterData/min/{minDate}": {
+      "get": {
+        "description": "",
+        "parameters": [
+          {
+            "name": "minDate",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/clusters/clusterData/max/{maxDate}": {
+      "get": {
+        "description": "",
+        "parameters": [
+          {
+            "name": "maxDate",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/clusters/clusterData/": {
+      "get": {
         "description": "",
         "parameters": [],
         "responses": {