From ce55c0484f20e22f50f09afe86dcaf955e86e3c2 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 27 Aug 2021 18:09:47 +0800 Subject: [PATCH] added user_logger decorators to all on_put, on_post and on_delete actions in API --- myems-api/core/combinedequipment.py | 16 ++++++++++++++++ myems-api/core/contact.py | 4 ++++ myems-api/core/costcenter.py | 6 ++++++ myems-api/core/costfile.py | 3 +++ myems-api/core/datasource.py | 4 ++++ myems-api/core/distributioncircuit.py | 6 ++++++ myems-api/core/distributionsystem.py | 4 ++++ myems-api/core/emailmessage.py | 2 ++ myems-api/core/emailserver.py | 4 ++++ myems-api/core/energycategory.py | 4 ++++ myems-api/core/energyflowdiagram.py | 10 ++++++++++ myems-api/core/energyitem.py | 4 ++++ myems-api/core/equipment.py | 1 + myems-api/core/gateway.py | 4 ++++ myems-api/core/gsmmodem.py | 4 ++++ myems-api/core/knowledgefile.py | 3 +++ myems-api/core/menu.py | 2 ++ myems-api/core/meter.py | 6 ++++++ myems-api/core/notification.py | 3 +++ myems-api/core/offlinemeter.py | 4 ++++ myems-api/core/offlinemeterfile.py | 3 +++ myems-api/core/point.py | 4 ++++ myems-api/core/privilege.py | 4 ++++ myems-api/core/rule.py | 6 +++++- myems-api/core/sensor.py | 6 ++++++ myems-api/core/shopfloor.py | 16 ++++++++++++++++ myems-api/core/space.py | 24 ++++++++++++++++++++++++ myems-api/core/store.py | 14 ++++++++++++++ myems-api/core/storetype.py | 4 ++++ myems-api/core/tariff.py | 4 ++++ myems-api/core/tenant.py | 14 ++++++++++++++ myems-api/core/tenanttype.py | 4 ++++ myems-api/core/textmessage.py | 2 ++ myems-api/core/timezone.py | 2 ++ myems-api/core/user.py | 8 ++++++++ myems-api/core/virtualmeter.py | 4 ++++ myems-api/core/webmessage.py | 3 +++ myems-api/core/wechatmessage.py | 2 ++ 38 files changed, 217 insertions(+), 1 deletion(-) diff --git a/myems-api/core/combinedequipment.py b/myems-api/core/combinedequipment.py index b15d843a..453f1d0b 100644 --- a/myems-api/core/combinedequipment.py +++ b/myems-api/core/combinedequipment.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class CombinedEquipmentCollection: @@ -58,6 +59,7 @@ class CombinedEquipmentCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -200,6 +202,7 @@ class CombinedEquipmentItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -273,6 +276,7 @@ class CombinedEquipmentItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" if not id_.isdigit() or int(id_) <= 0: @@ -369,6 +373,7 @@ class CombinedEquipmentItem: # Clone a Combined Equipment @staticmethod + @user_logger def on_post(req, resp, id_): """Handles PUT requests""" if not id_.isdigit() or int(id_) <= 0: @@ -558,6 +563,7 @@ class CombinedEquipmentEquipmentCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -632,6 +638,7 @@ class CombinedEquipmentEquipmentItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, eid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -814,6 +821,7 @@ class CombinedEquipmentParameterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" if not id_.isdigit() or int(id_) <= 0: @@ -1122,6 +1130,7 @@ class CombinedEquipmentParameterItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_, pid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1168,6 +1177,7 @@ class CombinedEquipmentParameterItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_, pid): """Handles POST requests""" if not id_.isdigit() or int(id_) <= 0: @@ -1426,6 +1436,7 @@ class CombinedEquipmentMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1506,6 +1517,7 @@ class CombinedEquipmentMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1614,6 +1626,7 @@ class CombinedEquipmentOfflineMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1695,6 +1708,7 @@ class CombinedEquipmentOfflineMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1803,6 +1817,7 @@ class CombinedEquipmentVirtualMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1884,6 +1899,7 @@ class CombinedEquipmentVirtualMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/contact.py b/myems-api/core/contact.py index 407688b4..1fd8cd01 100644 --- a/myems-api/core/contact.py +++ b/myems-api/core/contact.py @@ -4,6 +4,7 @@ import mysql.connector import config import uuid import re +from core.userlogger import user_logger class ContactCollection: @@ -44,6 +45,7 @@ class ContactCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -156,6 +158,7 @@ class ContactItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -230,6 +233,7 @@ class ContactItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/costcenter.py b/myems-api/core/costcenter.py index 49cf22d3..e13a49a8 100644 --- a/myems-api/core/costcenter.py +++ b/myems-api/core/costcenter.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class CostCenterCollection: @@ -37,6 +38,7 @@ class CostCenterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -131,6 +133,7 @@ class CostCenterItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -276,6 +279,7 @@ class CostCenterItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -403,6 +407,7 @@ class CostCenterTariffCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -471,6 +476,7 @@ class CostCenterTariffItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, tid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/costfile.py b/myems-api/core/costfile.py index fb352833..02d710e0 100644 --- a/myems-api/core/costfile.py +++ b/myems-api/core/costfile.py @@ -5,6 +5,7 @@ import config import uuid from datetime import datetime, timezone import os +from core.userlogger import user_logger class CostFileCollection: @@ -45,6 +46,7 @@ class CostFileCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -182,6 +184,7 @@ class CostFileItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/datasource.py b/myems-api/core/datasource.py index ab72e5aa..40112007 100644 --- a/myems-api/core/datasource.py +++ b/myems-api/core/datasource.py @@ -4,6 +4,7 @@ import mysql.connector import config import uuid from datetime import datetime, timezone +from core.userlogger import user_logger class DataSourceCollection: @@ -59,6 +60,7 @@ class DataSourceCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -189,6 +191,7 @@ class DataSourceItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -230,6 +233,7 @@ class DataSourceItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/distributioncircuit.py b/myems-api/core/distributioncircuit.py index 9d4c655d..d093766b 100644 --- a/myems-api/core/distributioncircuit.py +++ b/myems-api/core/distributioncircuit.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class DistributionCircuitCollection: @@ -59,6 +60,7 @@ class DistributionCircuitCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -228,6 +230,7 @@ class DistributionCircuitItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -258,6 +261,7 @@ class DistributionCircuitItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -433,6 +437,7 @@ class DistributionCircuitPointCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -500,6 +505,7 @@ class DistributionCircuitPointItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, pid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/distributionsystem.py b/myems-api/core/distributionsystem.py index 28427847..deecd4c3 100644 --- a/myems-api/core/distributionsystem.py +++ b/myems-api/core/distributionsystem.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class DistributionSystemCollection: @@ -43,6 +44,7 @@ class DistributionSystemCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -142,6 +144,7 @@ class DistributionSystemItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -180,6 +183,7 @@ class DistributionSystemItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index f2f0e996..580ff681 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -3,6 +3,7 @@ import json import mysql.connector import config from datetime import datetime, timedelta, timezone +from core.userlogger import user_logger class EmailMessageCollection: @@ -146,6 +147,7 @@ class EmailMessageItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/emailserver.py b/myems-api/core/emailserver.py index a5e8defe..effc7f0d 100644 --- a/myems-api/core/emailserver.py +++ b/myems-api/core/emailserver.py @@ -4,6 +4,7 @@ import mysql.connector import config import base64 import re +from core.userlogger import user_logger class EmailServerCollection: @@ -44,6 +45,7 @@ class EmailServerCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -175,6 +177,7 @@ class EmailServerItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -201,6 +204,7 @@ class EmailServerItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/energycategory.py b/myems-api/core/energycategory.py index 83df4929..7738a903 100644 --- a/myems-api/core/energycategory.py +++ b/myems-api/core/energycategory.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class EnergyCategoryCollection: @@ -38,6 +39,7 @@ class EnergyCategoryCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -145,6 +147,7 @@ class EnergyCategoryItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -225,6 +228,7 @@ class EnergyCategoryItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/energyflowdiagram.py b/myems-api/core/energyflowdiagram.py index 53ad8434..a2e89f61 100644 --- a/myems-api/core/energyflowdiagram.py +++ b/myems-api/core/energyflowdiagram.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class EnergyFlowDiagramCollection: @@ -120,6 +121,7 @@ class EnergyFlowDiagramCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -281,6 +283,7 @@ class EnergyFlowDiagramItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -309,6 +312,7 @@ class EnergyFlowDiagramItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" if not id_.isdigit() or int(id_) <= 0: @@ -470,6 +474,7 @@ class EnergyFlowDiagramLinkCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" if not id_.isdigit() or int(id_) <= 0: @@ -713,6 +718,7 @@ class EnergyFlowDiagramLinkItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_, lid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -759,6 +765,7 @@ class EnergyFlowDiagramLinkItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_, lid): """Handles POST requests""" if not id_.isdigit() or int(id_) <= 0: @@ -964,6 +971,7 @@ class EnergyFlowDiagramNodeCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" if not id_.isdigit() or int(id_) <= 0: @@ -1059,6 +1067,7 @@ class EnergyFlowDiagramNodeItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_, nid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1105,6 +1114,7 @@ class EnergyFlowDiagramNodeItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_, nid): """Handles POST requests""" if not id_.isdigit() or int(id_) <= 0: diff --git a/myems-api/core/energyitem.py b/myems-api/core/energyitem.py index 5e3e9499..a9a12a47 100644 --- a/myems-api/core/energyitem.py +++ b/myems-api/core/energyitem.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class EnergyItemCollection: @@ -51,6 +52,7 @@ class EnergyItemCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -161,6 +163,7 @@ class EnergyItemItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -219,6 +222,7 @@ class EnergyItemItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/equipment.py b/myems-api/core/equipment.py index 42f39db3..6d787151 100644 --- a/myems-api/core/equipment.py +++ b/myems-api/core/equipment.py @@ -203,6 +203,7 @@ class EquipmentItem: @staticmethod @user_logger + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/gateway.py b/myems-api/core/gateway.py index 370ebb64..b75fbf4e 100644 --- a/myems-api/core/gateway.py +++ b/myems-api/core/gateway.py @@ -4,6 +4,7 @@ import mysql.connector import config import uuid from datetime import datetime, timezone +from core.userlogger import user_logger class GatewayCollection: @@ -43,6 +44,7 @@ class GatewayCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -126,6 +128,7 @@ class GatewayItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -164,6 +167,7 @@ class GatewayItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/gsmmodem.py b/myems-api/core/gsmmodem.py index e91ef512..d3d45cb8 100644 --- a/myems-api/core/gsmmodem.py +++ b/myems-api/core/gsmmodem.py @@ -2,6 +2,7 @@ import falcon import json import mysql.connector import config +from core.userlogger import user_logger class GSMModemCollection: @@ -37,6 +38,7 @@ class GSMModemCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -121,6 +123,7 @@ class GSMModemItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -147,6 +150,7 @@ class GSMModemItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/knowledgefile.py b/myems-api/core/knowledgefile.py index b0945cc3..43946971 100644 --- a/myems-api/core/knowledgefile.py +++ b/myems-api/core/knowledgefile.py @@ -7,6 +7,7 @@ from datetime import datetime, timezone, timedelta import os import base64 import sys +from core.userlogger import user_logger class KnowledgeFileCollection: @@ -75,6 +76,7 @@ class KnowledgeFileCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" @@ -230,6 +232,7 @@ class KnowledgeFileItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, diff --git a/myems-api/core/menu.py b/myems-api/core/menu.py index 0d4a3ab4..7c029a12 100644 --- a/myems-api/core/menu.py +++ b/myems-api/core/menu.py @@ -2,6 +2,7 @@ import falcon import simplejson as json import mysql.connector import config +from core.userlogger import user_logger class MenuCollection: @@ -79,6 +80,7 @@ class MenuItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py index 19ff22d1..8c792f69 100644 --- a/myems-api/core/meter.py +++ b/myems-api/core/meter.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class MeterCollection: @@ -101,6 +102,7 @@ class MeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -369,6 +371,7 @@ class MeterItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -545,6 +548,7 @@ class MeterItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -891,6 +895,7 @@ class MeterPointCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -958,6 +963,7 @@ class MeterPointItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, pid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/notification.py b/myems-api/core/notification.py index 7193ae63..e0c36051 100644 --- a/myems-api/core/notification.py +++ b/myems-api/core/notification.py @@ -3,6 +3,7 @@ import json import mysql.connector import config from datetime import datetime, timedelta, timezone +from core.userlogger import user_logger class NotificationCollection: @@ -243,6 +244,7 @@ class NotificationItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -340,6 +342,7 @@ class NotificationItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py index bd5806d1..779dedaa 100644 --- a/myems-api/core/offlinemeter.py +++ b/myems-api/core/offlinemeter.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class OfflineMeterCollection: @@ -87,6 +88,7 @@ class OfflineMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -314,6 +316,7 @@ class OfflineMeterItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -468,6 +471,7 @@ class OfflineMeterItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/offlinemeterfile.py b/myems-api/core/offlinemeterfile.py index d40e90c1..e992c9d8 100644 --- a/myems-api/core/offlinemeterfile.py +++ b/myems-api/core/offlinemeterfile.py @@ -5,6 +5,7 @@ import config import uuid from datetime import datetime, timezone import os +from core.userlogger import user_logger class OfflineMeterFileCollection: @@ -45,6 +46,7 @@ class OfflineMeterFileCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -184,6 +186,7 @@ class OfflineMeterFileItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/point.py b/myems-api/core/point.py index 434b067d..d01a1348 100644 --- a/myems-api/core/point.py +++ b/myems-api/core/point.py @@ -2,6 +2,7 @@ import falcon import simplejson as json import mysql.connector import config +from core.userlogger import user_logger class PointCollection: @@ -60,6 +61,7 @@ class PointCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -251,6 +253,7 @@ class PointItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -389,6 +392,7 @@ class PointItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/privilege.py b/myems-api/core/privilege.py index 959cb1b0..096a4815 100644 --- a/myems-api/core/privilege.py +++ b/myems-api/core/privilege.py @@ -2,6 +2,7 @@ import falcon import simplejson as json import mysql.connector import config +from core.userlogger import user_logger class PrivilegeCollection: @@ -38,6 +39,7 @@ class PrivilegeCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -97,6 +99,7 @@ class PrivilegeItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -136,6 +139,7 @@ class PrivilegeItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/rule.py b/myems-api/core/rule.py index f6357503..e2db14d1 100644 --- a/myems-api/core/rule.py +++ b/myems-api/core/rule.py @@ -2,8 +2,9 @@ import falcon import json import mysql.connector import uuid -from datetime import datetime, timezone, timedelta +from datetime import timezone import config +from core.userlogger import user_logger class RuleCollection: @@ -56,6 +57,7 @@ class RuleCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -221,6 +223,7 @@ class RuleItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -248,6 +251,7 @@ class RuleItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/sensor.py b/myems-api/core/sensor.py index 068d63f7..8bc4b428 100644 --- a/myems-api/core/sensor.py +++ b/myems-api/core/sensor.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class SensorCollection: @@ -40,6 +41,7 @@ class SensorCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -129,6 +131,7 @@ class SensorItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -203,6 +206,7 @@ class SensorItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -313,6 +317,7 @@ class SensorPointCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -380,6 +385,7 @@ class SensorPointItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, pid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py index ac4ca2b6..388cbb64 100644 --- a/myems-api/core/shopfloor.py +++ b/myems-api/core/shopfloor.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class ShopfloorCollection: @@ -84,6 +85,7 @@ class ShopfloorCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -274,6 +276,7 @@ class ShopfloorItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -393,6 +396,7 @@ class ShopfloorItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -557,6 +561,7 @@ class ShopfloorEquipmentCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -631,6 +636,7 @@ class ShopfloorEquipmentItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, eid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -738,6 +744,7 @@ class ShopfloorMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -812,6 +819,7 @@ class ShopfloorMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -918,6 +926,7 @@ class ShopfloorOfflineMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -992,6 +1001,7 @@ class ShopfloorOfflineMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1098,6 +1108,7 @@ class ShopfloorPointCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1172,6 +1183,7 @@ class ShopfloorPointItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, pid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1265,6 +1277,7 @@ class ShopfloorSensorCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1339,6 +1352,7 @@ class ShopfloorSensorItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, sid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1445,6 +1459,7 @@ class ShopfloorVirtualMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1519,6 +1534,7 @@ class ShopfloorVirtualMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/space.py b/myems-api/core/space.py index e2253e33..36f8d988 100644 --- a/myems-api/core/space.py +++ b/myems-api/core/space.py @@ -6,6 +6,7 @@ import uuid from datetime import datetime from anytree import AnyNode from anytree.exporter import JsonExporter +from core.userlogger import user_logger class SpaceCollection: @@ -104,6 +105,7 @@ class SpaceCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -356,6 +358,7 @@ class SpaceItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -512,6 +515,7 @@ class SpaceItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -854,6 +858,7 @@ class SpaceCombinedEquipmentCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -928,6 +933,7 @@ class SpaceCombinedEquipmentItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, eid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1021,6 +1027,7 @@ class SpaceEquipmentCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1095,6 +1102,7 @@ class SpaceEquipmentItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, eid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1201,6 +1209,7 @@ class SpaceMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1275,6 +1284,7 @@ class SpaceMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1383,6 +1393,7 @@ class SpaceOfflineMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1457,6 +1468,7 @@ class SpaceOfflineMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1563,6 +1575,7 @@ class SpacePointCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1637,6 +1650,7 @@ class SpacePointItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, pid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1730,6 +1744,7 @@ class SpaceSensorCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1804,6 +1819,7 @@ class SpaceSensorItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, sid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1896,6 +1912,7 @@ class SpaceShopfloorCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1970,6 +1987,7 @@ class SpaceShopfloorItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, sid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -2062,6 +2080,7 @@ class SpaceStoreCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -2136,6 +2155,7 @@ class SpaceStoreItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, tid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -2228,6 +2248,7 @@ class SpaceTenantCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -2302,6 +2323,7 @@ class SpaceTenantItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, tid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -2408,6 +2430,7 @@ class SpaceVirtualMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -2482,6 +2505,7 @@ class SpaceVirtualMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/store.py b/myems-api/core/store.py index 91d58a27..c48d9c16 100644 --- a/myems-api/core/store.py +++ b/myems-api/core/store.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class StoreCollection: @@ -90,6 +91,7 @@ class StoreCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -326,6 +328,7 @@ class StoreItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -429,6 +432,7 @@ class StoreItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -647,6 +651,7 @@ class StoreMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -721,6 +726,7 @@ class StoreMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -827,6 +833,7 @@ class StoreOfflineMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -901,6 +908,7 @@ class StoreOfflineMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1007,6 +1015,7 @@ class StorePointCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1081,6 +1090,7 @@ class StorePointItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, pid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1174,6 +1184,7 @@ class StoreSensorCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1248,6 +1259,7 @@ class StoreSensorItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, sid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1354,6 +1366,7 @@ class StoreVirtualMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1428,6 +1441,7 @@ class StoreVirtualMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/storetype.py b/myems-api/core/storetype.py index dd7c05d2..675cb01e 100644 --- a/myems-api/core/storetype.py +++ b/myems-api/core/storetype.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class StoreTypeCollection: @@ -38,6 +39,7 @@ class StoreTypeCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -146,6 +148,7 @@ class StoreTypeItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -182,6 +185,7 @@ class StoreTypeItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/tariff.py b/myems-api/core/tariff.py index 54224965..33889c21 100644 --- a/myems-api/core/tariff.py +++ b/myems-api/core/tariff.py @@ -4,6 +4,7 @@ import mysql.connector import config import uuid from datetime import datetime, timedelta, timezone +from core.userlogger import user_logger class TariffCollection: @@ -92,6 +93,7 @@ class TariffCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -294,6 +296,7 @@ class TariffItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -350,6 +353,7 @@ class TariffItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/tenant.py b/myems-api/core/tenant.py index 6878e3c9..385aa1b0 100644 --- a/myems-api/core/tenant.py +++ b/myems-api/core/tenant.py @@ -4,6 +4,7 @@ import mysql.connector import config import uuid from datetime import datetime, timedelta, timezone +from core.userlogger import user_logger class TenantCollection: @@ -101,6 +102,7 @@ class TenantCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -383,6 +385,7 @@ class TenantItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -486,6 +489,7 @@ class TenantItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -744,6 +748,7 @@ class TenantMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -818,6 +823,7 @@ class TenantMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -924,6 +930,7 @@ class TenantOfflineMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -998,6 +1005,7 @@ class TenantOfflineMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1104,6 +1112,7 @@ class TenantPointCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1178,6 +1187,7 @@ class TenantPointItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, pid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1271,6 +1281,7 @@ class TenantSensorCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1345,6 +1356,7 @@ class TenantSensorItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, sid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -1451,6 +1463,7 @@ class TenantVirtualMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp, id_): """Handles POST requests""" try: @@ -1525,6 +1538,7 @@ class TenantVirtualMeterItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_, mid): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/tenanttype.py b/myems-api/core/tenanttype.py index f490c98d..c7b63f87 100644 --- a/myems-api/core/tenanttype.py +++ b/myems-api/core/tenanttype.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class TenantTypeCollection: @@ -38,6 +39,7 @@ class TenantTypeCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -146,6 +148,7 @@ class TenantTypeItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -182,6 +185,7 @@ class TenantTypeItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/textmessage.py b/myems-api/core/textmessage.py index 17c596cf..12016b39 100644 --- a/myems-api/core/textmessage.py +++ b/myems-api/core/textmessage.py @@ -3,6 +3,7 @@ import json import mysql.connector import config from datetime import datetime, timedelta, timezone +from core.userlogger import user_logger class TextMessageCollection: @@ -142,6 +143,7 @@ class TextMessageItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/timezone.py b/myems-api/core/timezone.py index cbcf5885..a9f3551e 100644 --- a/myems-api/core/timezone.py +++ b/myems-api/core/timezone.py @@ -2,6 +2,7 @@ import falcon import simplejson as json import mysql.connector import config +from core.userlogger import user_logger class TimezoneCollection: @@ -73,6 +74,7 @@ class TimezoneItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/user.py b/myems-api/core/user.py index b56700f3..4be6931e 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -7,6 +7,7 @@ import hashlib import re import os from datetime import datetime, timedelta +from core.userlogger import user_logger class UserCollection: @@ -51,6 +52,7 @@ class UserCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -197,6 +199,7 @@ class UserItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -224,6 +227,7 @@ class UserItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -348,6 +352,7 @@ class UserLogin: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_put(req, resp): """Handles PUT requests""" try: @@ -463,6 +468,7 @@ class UserLogout: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_put(req, resp): """Handles PUT requests""" @@ -512,6 +518,7 @@ class ChangePassword: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_put(req, resp): """Handles PUT requests""" if 'USER-UUID' not in req.headers or \ @@ -627,6 +634,7 @@ class ResetPassword: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_put(req, resp): """Handles PUT requests""" if 'USER-UUID' not in req.headers or \ diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index e7f55020..a4cc5e66 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -3,6 +3,7 @@ import simplejson as json import mysql.connector import config import uuid +from core.userlogger import user_logger class VirtualMeterCollection: @@ -145,6 +146,7 @@ class VirtualMeterCollection: resp.body = json.dumps(result) @staticmethod + @user_logger def on_post(req, resp): """Handles POST requests""" try: @@ -503,6 +505,7 @@ class VirtualMeterItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -668,6 +671,7 @@ class VirtualMeterItem: resp.status = falcon.HTTP_204 @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: diff --git a/myems-api/core/webmessage.py b/myems-api/core/webmessage.py index c1d72f13..4dd605ad 100644 --- a/myems-api/core/webmessage.py +++ b/myems-api/core/webmessage.py @@ -3,6 +3,7 @@ import json import mysql.connector import config from datetime import datetime, timedelta, timezone +from core.userlogger import user_logger class WebMessageCollection: @@ -229,6 +230,7 @@ class WebMessageItem: resp.body = json.dumps(meta_result) @staticmethod + @user_logger def on_put(req, resp, id_): """Handles PUT requests""" try: @@ -283,6 +285,7 @@ class WebMessageItem: resp.status = falcon.HTTP_200 @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/wechatmessage.py b/myems-api/core/wechatmessage.py index 884b8058..4a6a4826 100644 --- a/myems-api/core/wechatmessage.py +++ b/myems-api/core/wechatmessage.py @@ -3,6 +3,7 @@ import json import mysql.connector import config from datetime import datetime, timedelta, timezone +from core.userlogger import user_logger class WechatMessageCollection(object): @@ -124,6 +125,7 @@ class WechatMessageItem: resp.body = json.dumps(result) @staticmethod + @user_logger def on_delete(req, resp, id_): if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',