From 92a904f720d9280dc161048de6efefc056ba63d6 Mon Sep 17 00:00:00 2001
From: Conrad <conrad.schloer@gmail.com>
Date: Thu, 30 Nov 2017 15:23:50 -0500
Subject: [PATCH] Rename endpoints

---
 app/controllers/apartment_node.py               | 14 ++++++++++++++
 app/controllers/boiler_node.py                  | 14 ++++++++++++++
 app/controllers/building_sensor.py              | 17 -----------------
 .../building_sensor_apartment_node.py           | 14 --------------
 app/controllers/building_sensor_boiler_node.py  | 14 --------------
 .../building_sensor_repeater_node.py            | 14 --------------
 app/controllers/gateway.py                      | 15 +++++++++++++++
 app/controllers/repeater_node.py                | 14 ++++++++++++++
 ...nsor_apartment_node.py => apartment_node.py} |  2 +-
 ...ing_sensor_boiler_node.py => boiler_node.py} |  4 ++--
 app/forms/{building_sensor.py => gateway.py}    |  2 +-
 ...sensor_repeater_node.py => repeater_node.py} |  2 +-
 ...nsor_apartment_node.py => apartment_node.py} |  4 ++--
 ...ing_sensor_boiler_node.py => boiler_node.py} |  4 ++--
 app/models/{building_sensor.py => gateway.py}   |  4 ++--
 ...sensor_repeater_node.py => repeater_node.py} |  4 ++--
 app/views/__init__.py                           | 16 ++++++++--------
 ...nsor_apartment_node.py => apartment_node.py} |  6 +++---
 ...ing_sensor_boiler_node.py => boiler_node.py} |  6 +++---
 app/views/{building_sensor.py => gateway.py}    |  6 +++---
 ...sensor_repeater_node.py => repeater_node.py} |  6 +++---
 21 files changed, 90 insertions(+), 92 deletions(-)
 create mode 100644 app/controllers/apartment_node.py
 create mode 100644 app/controllers/boiler_node.py
 delete mode 100644 app/controllers/building_sensor.py
 delete mode 100644 app/controllers/building_sensor_apartment_node.py
 delete mode 100644 app/controllers/building_sensor_boiler_node.py
 delete mode 100644 app/controllers/building_sensor_repeater_node.py
 create mode 100644 app/controllers/gateway.py
 create mode 100644 app/controllers/repeater_node.py
 rename app/forms/{building_sensor_apartment_node.py => apartment_node.py} (95%)
 rename app/forms/{building_sensor_boiler_node.py => boiler_node.py} (91%)
 rename app/forms/{building_sensor.py => gateway.py} (96%)
 rename app/forms/{building_sensor_repeater_node.py => repeater_node.py} (92%)
 rename app/models/{building_sensor_apartment_node.py => apartment_node.py} (86%)
 rename app/models/{building_sensor_boiler_node.py => boiler_node.py} (83%)
 rename app/models/{building_sensor.py => gateway.py} (87%)
 rename app/models/{building_sensor_repeater_node.py => repeater_node.py} (79%)
 rename app/views/{building_sensor_apartment_node.py => apartment_node.py} (53%)
 rename app/views/{building_sensor_boiler_node.py => boiler_node.py} (54%)
 rename app/views/{building_sensor.py => gateway.py} (59%)
 rename app/views/{building_sensor_repeater_node.py => repeater_node.py} (53%)

diff --git a/app/controllers/apartment_node.py b/app/controllers/apartment_node.py
new file mode 100644
index 0000000..84404b4
--- /dev/null
+++ b/app/controllers/apartment_node.py
@@ -0,0 +1,14 @@
+from .base import RestController
+from ..forms.apartment_node import ApartmentNodeForm
+from ..models.apartment_node import ApartmentNode
+
+class ApartmentNodeController(RestController):
+    """An apartment node controller."""
+    Model = ApartmentNode
+    filters = {
+        'parent_id': lambda d: ApartmentNode.parent_id == d['parent_id'],
+    }
+
+    def get_form(self, filter_data):
+        """Return the apartment node form."""
+        return ApartmentNodeForm
diff --git a/app/controllers/boiler_node.py b/app/controllers/boiler_node.py
new file mode 100644
index 0000000..f1c87df
--- /dev/null
+++ b/app/controllers/boiler_node.py
@@ -0,0 +1,14 @@
+from .base import RestController
+from ..forms.boiler_node import BoilerNodeForm
+from ..models.boiler_node import BoilerNode
+
+class BoilerNodeController(RestController):
+    """A boiler node controller."""
+    Model = BoilerNode
+    filters = {
+        'parent_id': lambda d: BoilerNode.parent_id == d['parent_id'],
+    }
+
+    def get_form(self, filter_data):
+        """Return the boiler node form."""
+        return BoilerNodeForm
diff --git a/app/controllers/building_sensor.py b/app/controllers/building_sensor.py
deleted file mode 100644
index 81ff6ed..0000000
--- a/app/controllers/building_sensor.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from .base import RestController
-from ..forms.building_sensor import BuildingSensorForm
-from ..models.building_sensor import BuildingSensor
-
-class BuildingSensorController(RestController):
-    """A sensor controller."""
-    Model = BuildingSensor
-    filters = {
-        'building_id': lambda d: BuildingSensor.building_id == d['building_id'],
-        'building_id[]': lambda d: BuildingSensor.building_id.in_(d.getlist('building_id[]')),
-    }
-
-    def get_form(self, filter_data):
-        """Return the sensor form."""
-        return BuildingSensorForm
-
-
diff --git a/app/controllers/building_sensor_apartment_node.py b/app/controllers/building_sensor_apartment_node.py
deleted file mode 100644
index 1e70282..0000000
--- a/app/controllers/building_sensor_apartment_node.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from .base import RestController
-from ..forms.building_sensor_apartment_node import BuildingSensorApartmentNodeForm
-from ..models.building_sensor_apartment_node import BuildingSensorApartmentNode
-
-class BuildingSensorApartmentNodeController(RestController):
-    """An apartment node controller."""
-    Model = BuildingSensorApartmentNode
-    filters = {
-        'parent_id': lambda d: BuildingSensorApartmentNode.parent_id == d['parent_id'],
-    }
-
-    def get_form(self, filter_data):
-        """Return the apartment node form."""
-        return BuildingSensorApartmentNodeForm
diff --git a/app/controllers/building_sensor_boiler_node.py b/app/controllers/building_sensor_boiler_node.py
deleted file mode 100644
index ffebb37..0000000
--- a/app/controllers/building_sensor_boiler_node.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from .base import RestController
-from ..forms.building_sensor_boiler_node import BuildingSensorBoilerNodeForm
-from ..models.building_sensor_boiler_node import BuildingSensorBoilerNode
-
-class BuildingSensorBoilerNodeController(RestController):
-    """A boiler node controller."""
-    Model = BuildingSensorBoilerNode
-    filters = {
-        'parent_id': lambda d: BuildingSensorBoilerNode.parent_id == d['parent_id'],
-    }
-
-    def get_form(self, filter_data):
-        """Return the boiler node form."""
-        return BuildingSensorBoilerNodeForm
diff --git a/app/controllers/building_sensor_repeater_node.py b/app/controllers/building_sensor_repeater_node.py
deleted file mode 100644
index 25d0866..0000000
--- a/app/controllers/building_sensor_repeater_node.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from .base import RestController
-from ..forms.building_sensor_repeater_node import BuildingSensorRepeaterNodeForm
-from ..models.building_sensor_repeater_node import BuildingSensorRepeaterNode
-
-class BuildingSensorRepeaterNodeController(RestController):
-    """A repeater node controller."""
-    Model = BuildingSensorRepeaterNode
-    filters = {
-        'parent_id': lambda d: BuildingSensorRepeaterNode.parent_id == d['parent_id'],
-    }
-
-    def get_form(self, filter_data):
-        """Return the repeater node form."""
-        return BuildingSensorRepeaterNodeForm
diff --git a/app/controllers/gateway.py b/app/controllers/gateway.py
new file mode 100644
index 0000000..eefece4
--- /dev/null
+++ b/app/controllers/gateway.py
@@ -0,0 +1,15 @@
+from .base import RestController
+from ..forms.gateway import GatewayForm
+from ..models.gateway import Gateway
+
+class GatewayController(RestController):
+    """A sensor controller."""
+    Model = Gateway
+    filters = {
+        'building_id': lambda d: Gateway.building_id == d['building_id'],
+        'building_id[]': lambda d: Gateway.building_id.in_(d.getlist('building_id[]')),
+    }
+
+    def get_form(self, filter_data):
+        """Return the sensor form."""
+        return GatewayForm
diff --git a/app/controllers/repeater_node.py b/app/controllers/repeater_node.py
new file mode 100644
index 0000000..8cd4825
--- /dev/null
+++ b/app/controllers/repeater_node.py
@@ -0,0 +1,14 @@
+from .base import RestController
+from ..forms.repeater_node import RepeaterNodeForm
+from ..models.repeater_node import RepeaterNode
+
+class RepeaterNodeController(RestController):
+    """A repeater node controller."""
+    Model = RepeaterNode
+    filters = {
+        'parent_id': lambda d: RepeaterNode.parent_id == d['parent_id'],
+    }
+
+    def get_form(self, filter_data):
+        """Return the repeater node form."""
+        return RepeaterNodeForm
diff --git a/app/forms/building_sensor_apartment_node.py b/app/forms/apartment_node.py
similarity index 95%
rename from app/forms/building_sensor_apartment_node.py
rename to app/forms/apartment_node.py
index 3229dd0..ca61f84 100644
--- a/app/forms/building_sensor_apartment_node.py
+++ b/app/forms/apartment_node.py
@@ -1,7 +1,7 @@
 import wtforms as wtf
 from .base import Form, UserForm
 
-class BuildingSensorApartmentNodeForm(Form, UserForm):
+class ApartmentNodeForm(Form, UserForm):
     """ A form for validating apartment node requests."""
 
     id = wtf.IntegerField(
diff --git a/app/forms/building_sensor_boiler_node.py b/app/forms/boiler_node.py
similarity index 91%
rename from app/forms/building_sensor_boiler_node.py
rename to app/forms/boiler_node.py
index c919b43..8350a89 100644
--- a/app/forms/building_sensor_boiler_node.py
+++ b/app/forms/boiler_node.py
@@ -1,7 +1,7 @@
 import wtforms as wtf
 from .base import Form, UserForm
 
-class BuildingSensorBoilerNodeForm(Form, UserForm):
+class BoilerNodeForm(Form, UserForm):
     """ A form for validating boiler node requests."""
 
     id = wtf.IntegerField(
@@ -28,6 +28,6 @@ class BuildingSensorBoilerNodeForm(Form, UserForm):
     temperature_probe_4 = wtf.IntegerField(
         validators=[wtf.validators.Optional()]
     )
-    notes =  wtf.StringField(
+    notes = wtf.StringField(
         validators=[wtf.validators.Optional()]
     )
diff --git a/app/forms/building_sensor.py b/app/forms/gateway.py
similarity index 96%
rename from app/forms/building_sensor.py
rename to app/forms/gateway.py
index 9bf2b6d..b1279c2 100644
--- a/app/forms/building_sensor.py
+++ b/app/forms/gateway.py
@@ -1,7 +1,7 @@
 import wtforms as wtf
 from .base import Form, UserForm
 
-class BuildingSensorForm(Form, UserForm):
+class GatewayForm(Form, UserForm):
     """ A form for validating building sensor requests."""
 
     id = wtf.IntegerField(
diff --git a/app/forms/building_sensor_repeater_node.py b/app/forms/repeater_node.py
similarity index 92%
rename from app/forms/building_sensor_repeater_node.py
rename to app/forms/repeater_node.py
index 4421d93..d3c7835 100644
--- a/app/forms/building_sensor_repeater_node.py
+++ b/app/forms/repeater_node.py
@@ -1,7 +1,7 @@
 import wtforms as wtf
 from .base import Form, UserForm
 
-class BuildingSensorRepeaterNodeForm(Form, UserForm):
+class RepeaterNodeForm(Form, UserForm):
     """ A form for validating repeater node requests."""
 
     id = wtf.IntegerField(
diff --git a/app/models/building_sensor_apartment_node.py b/app/models/apartment_node.py
similarity index 86%
rename from app/models/building_sensor_apartment_node.py
rename to app/models/apartment_node.py
index 9d1ae5f..7c134b4 100644
--- a/app/models/building_sensor_apartment_node.py
+++ b/app/models/apartment_node.py
@@ -3,11 +3,11 @@ from ..lib.database import db
 
 from sqlalchemy.ext.declarative import declared_attr
 
-class BuildingSensorApartmentNode(Model, Tracked, User, db.Model):
+class ApartmentNode(Model, Tracked, User, db.Model):
 
     @declared_attr
     def __tablename__(cls):
-        return "building_sensor_apartment_node"
+        return "apartment_node"
 
     __table_args__ = {"schema": "sensor"}
 
diff --git a/app/models/building_sensor_boiler_node.py b/app/models/boiler_node.py
similarity index 83%
rename from app/models/building_sensor_boiler_node.py
rename to app/models/boiler_node.py
index bfb6564..dd76224 100644
--- a/app/models/building_sensor_boiler_node.py
+++ b/app/models/boiler_node.py
@@ -3,11 +3,11 @@ from ..lib.database import db
 
 from sqlalchemy.ext.declarative import declared_attr
 
-class BuildingSensorBoilerNode(Model, User, Tracked, db.Model):
+class BoilerNode(Model, User, Tracked, db.Model):
 
     @declared_attr
     def __tablename__(cls):
-        return "building_sensor_boiler_node"
+        return "boiler_node"
 
     __table_args__ = {"schema": "sensor"}
 
diff --git a/app/models/building_sensor.py b/app/models/gateway.py
similarity index 87%
rename from app/models/building_sensor.py
rename to app/models/gateway.py
index 0436ce5..1d3de69 100644
--- a/app/models/building_sensor.py
+++ b/app/models/gateway.py
@@ -3,11 +3,11 @@ from ..lib.database import db
 
 from sqlalchemy.ext.declarative import declared_attr
 
-class BuildingSensor(Model, User, Tracked, db.Model):
+class Gateway(Model, User, Tracked, db.Model):
 
     @declared_attr
     def __tablename__(cls):
-        return "building_sensor"
+        return "gateway"
 
     __table_args__ = {"schema": "sensor"}
 
diff --git a/app/models/building_sensor_repeater_node.py b/app/models/repeater_node.py
similarity index 79%
rename from app/models/building_sensor_repeater_node.py
rename to app/models/repeater_node.py
index 05a8b98..301180a 100644
--- a/app/models/building_sensor_repeater_node.py
+++ b/app/models/repeater_node.py
@@ -3,11 +3,11 @@ from ..lib.database import db
 
 from sqlalchemy.ext.declarative import declared_attr
 
-class BuildingSensorRepeaterNode(Model, User, Tracked, db.Model):
+class RepeaterNode(Model, User, Tracked, db.Model):
 
     @declared_attr
     def __tablename__(cls):
-        return "building_sensor_repeater_node"
+        return "repeater_node"
 
     __table_args__ = {"schema": "sensor"}
 
diff --git a/app/views/__init__.py b/app/views/__init__.py
index 6e99f08..8cb25c8 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -1,9 +1,9 @@
 """Flask-classy views for the flask application."""
 from . import (
-    building_sensor,
-    building_sensor_boiler_node,
-    building_sensor_apartment_node,
-    building_sensor_repeater_node,
+    gateway,
+    boiler_node,
+    apartment_node,
+    repeater_node,
     sensor_image,
 )
 
@@ -14,8 +14,8 @@ def register(app):
         This can be used as a comprehensive list of all views that are present
         in the application.
     """
-    building_sensor.BuildingSensorView.register(app)
-    building_sensor_boiler_node.BuildingSensorBoilerNodeView.register(app)
-    building_sensor_apartment_node.BuildingSensorApartmentNodeView.register(app)
-    building_sensor_repeater_node.BuildingSensorRepeaterNodeView.register(app)
+    gateway.GatewayView.register(app)
+    boiler_node.BoilerNodeView.register(app)
+    apartment_node.ApartmentNodeView.register(app)
+    repeater_node.RepeaterNodeView.register(app)
     sensor_image.SensorImageView.register(app)
diff --git a/app/views/building_sensor_apartment_node.py b/app/views/apartment_node.py
similarity index 53%
rename from app/views/building_sensor_apartment_node.py
rename to app/views/apartment_node.py
index 3f4a6c5..fa2466b 100644
--- a/app/views/building_sensor_apartment_node.py
+++ b/app/views/apartment_node.py
@@ -1,12 +1,12 @@
 """Views for working with accounts."""
 from .base import RestView
-from ..controllers.building_sensor_apartment_node import BuildingSensorApartmentNodeController
+from ..controllers.apartment_node import ApartmentNodeController
 
 from flask import request
 
-class BuildingSensorApartmentNodeView(RestView):
+class ApartmentNodeView(RestView):
     """The apartment node view."""
 
     def get_controller(self):
         """Return an instance of the apartment node controller."""
-        return BuildingSensorApartmentNodeController()
+        return ApartmentNodeController()
diff --git a/app/views/building_sensor_boiler_node.py b/app/views/boiler_node.py
similarity index 54%
rename from app/views/building_sensor_boiler_node.py
rename to app/views/boiler_node.py
index df8c7a0..1ac2aa1 100644
--- a/app/views/building_sensor_boiler_node.py
+++ b/app/views/boiler_node.py
@@ -1,12 +1,12 @@
 """Views for working with accounts."""
 from .base import RestView
-from ..controllers.building_sensor_boiler_node import BuildingSensorBoilerNodeController
+from ..controllers.boiler_node import BoilerNodeController
 
 from flask import request
 
-class BuildingSensorBoilerNodeView(RestView):
+class BoilerNodeView(RestView):
     """The boiler node view."""
 
     def get_controller(self):
         """Return an instance of the boiler node controller."""
-        return BuildingSensorBoilerNodeController()
+        return BoilerNodeController()
diff --git a/app/views/building_sensor.py b/app/views/gateway.py
similarity index 59%
rename from app/views/building_sensor.py
rename to app/views/gateway.py
index d8c63d5..7f506a5 100644
--- a/app/views/building_sensor.py
+++ b/app/views/gateway.py
@@ -1,12 +1,12 @@
 """Views for working with accounts."""
 from .base import RestView
-from ..controllers.building_sensor import BuildingSensorController
+from ..controllers.gateway import GatewayController
 
 from flask import request
 
-class BuildingSensorView(RestView):
+class GatewayView(RestView):
     """The sensor view."""
 
     def get_controller(self):
         """Return an instance of the sensor controller."""
-        return BuildingSensorController()
+        return GatewayController()
diff --git a/app/views/building_sensor_repeater_node.py b/app/views/repeater_node.py
similarity index 53%
rename from app/views/building_sensor_repeater_node.py
rename to app/views/repeater_node.py
index e0588f6..a491af4 100644
--- a/app/views/building_sensor_repeater_node.py
+++ b/app/views/repeater_node.py
@@ -1,12 +1,12 @@
 """Views for working with accounts."""
 from .base import RestView
-from ..controllers.building_sensor_repeater_node import BuildingSensorRepeaterNodeController
+from ..controllers.repeater_node import RepeaterNodeController
 
 from flask import request
 
-class BuildingSensorRepeaterNodeView(RestView):
+class RepeaterNodeView(RestView):
     """The repeater node view."""
 
     def get_controller(self):
         """Return an instance of the repeater node controller."""
-        return BuildingSensorRepeaterNodeController()
+        return RepeaterNodeController()
-- 
GitLab