Skip to content

aa.gusti / opensipkd-base

Go to a project
Commit 5cdf14e5 by aa.gustiana@gmail.com
Options

Refactor ApiViews and BaseView: comment out debug logs, enhance form_validator d… 

…ocstring, and rename query_id parameter for clarity
1 parent 4e02abb0
Inline Side-by-side
Showing 5 changed files with 14 additions and 80 deletions
opensipkd/base/__init__.py
...@@ -62,8 +62,8 @@ def get_params(params, alternate=None, settings=None): ...@@ -62,8 +62,8 @@ def get_params(params, alternate=None, settings=None):
settings = get_settings() settings = get_settings()
if settings: if settings:
result = settings.get(params) result = settings.get(params)
_logging.debug( # _logging.debug(
f"get_params: {params}, Alternate: {alternate} Settings: {not settings == None} Result: {result}") # f"get_params: {params}, Alternate: {alternate} Settings: {not settings == None} Result: {result}")
return result and result.strip() or alternate return result and result.strip() or alternate
...@@ -103,7 +103,7 @@ def add_cors_headers_response_callback(event): ...@@ -103,7 +103,7 @@ def add_cors_headers_response_callback(event):
# _logging.debug(f"Headers: {headers}") # _logging.debug(f"Headers: {headers}")
response.headers.update(headers) response.headers.update(headers)
_logging.warning(response.headers) _logging.debug(response.headers)
event.request.add_response_callback(cors_headers) event.request.add_response_callback(cors_headers)
...@@ -426,6 +426,7 @@ def _add_view_config(config, paket, route, template_path="views/templates/"): ...@@ -426,6 +426,7 @@ def _add_view_config(config, paket, route, template_path="views/templates/"):
class_name = route.get("class_name", None) class_name = route.get("class_name", None)
if not class_name: if not class_name:
class_name = "Views" class_name = "Views"
_views = importlib.import_module(file_name) _views = importlib.import_module(file_name)
if not hasattr(_views, class_name): if not hasattr(_views, class_name):
_logging.error( _logging.error(
...@@ -463,7 +464,7 @@ def _add_view_config(config, paket, route, template_path="views/templates/"): ...@@ -463,7 +464,7 @@ def _add_view_config(config, paket, route, template_path="views/templates/"):
config.add_view(views, **params) config.add_view(views, **params)
except Exception as e: except Exception as e:
traceback.print_exc() # traceback.print_exc()
_logging.error("Add View Config :{code} Kode {error}" _logging.error("Add View Config :{code} Kode {error}"
.format(code=route["kode"], error=str(e))) .format(code=route["kode"], error=str(e)))
# _logging.debug(f"Route: {route.get('kode')} {route.get('path')}") # _logging.debug(f"Route: {route.get('kode')} {route.get('path')}")
...@@ -665,7 +666,7 @@ class BaseApp(): ...@@ -665,7 +666,7 @@ class BaseApp():
self.add_menu(config, new_routes, paket) self.add_menu(config, new_routes, paket)
def get_menus(self): def get_menus(self):
_logging.debug(f"Menus: {self.menus}") # _logging.debug(f"Menus: {self.menus}")
return self.menus return self.menus
......
opensipkd/base/security.py
...@@ -62,7 +62,7 @@ class MySecurityPolicy: ...@@ -62,7 +62,7 @@ class MySecurityPolicy:
self.helper = AuthTktCookieHelper(secret) self.helper = AuthTktCookieHelper(secret)
def identity(self, request): def identity(self, request):
log.debug("MySecurityPolicy.identity") # log.debug("MySecurityPolicy.identity")
# log.debug(inspect.stack()[1]) # log.debug(inspect.stack()[1])
identity = self.helper.identify(request) identity = self.helper.identify(request)
if identity is None and request.matched_route!='login': if identity is None and request.matched_route!='login':
......
opensipkd/base/tools/api.py
...@@ -12,7 +12,7 @@ lima_menit = 300 ...@@ -12,7 +12,7 @@ lima_menit = 300
def auth_from(request, field=None): def auth_from(request, field=None):
global lima_menit global lima_menit
env = request.environ env = request.environ
log.info(env) log.debug(env)
if not ('HTTP_USERID' in env and 'HTTP_SIGNATURE' in env and if not ('HTTP_USERID' in env and 'HTTP_SIGNATURE' in env and
'HTTP_KEY' in env): 'HTTP_KEY' in env):
raise JsonRpcInvalidLoginError raise JsonRpcInvalidLoginError
......
opensipkd/base/views/api_base.py
...@@ -94,7 +94,7 @@ class ApiViews(APIView): ...@@ -94,7 +94,7 @@ class ApiViews(APIView):
search_method=search_method)) search_method=search_method))
if hasattr(d, "widget"): if hasattr(d, "widget"):
if d.widget: if d.widget:
_log.debug(d.widget) # _log.debug(d.widget)
if type(d.widget) is SelectWidget: if type(d.widget) is SelectWidget:
select_list[d.name] = d.widget.values select_list[d.name] = d.widget.values
...@@ -189,56 +189,6 @@ class ApiViews(APIView): ...@@ -189,56 +189,6 @@ class ApiViews(APIView):
return Form(schema, buttons=buttons, autocomplete=self.autocomplete) return Form(schema, buttons=buttons, autocomplete=self.autocomplete)
# def get_filters(self, query, **kw):
# return query
# def get_orders(self, query, **kw):
# table = kw.get("table", self.table)
# if not self.orders:
# self.orders = self.pkey
# query = query.order_by(*(getattr(table, k) for k in self.orders))
# return query
# def get_joins(self, query, **kw):
# return query
# def get_groups(self, query, **kw):
# return query
# def query(self, **kw):
# self.psize = int(self.req.params.get("size", 25))
# self.page = int(self.req.params.get("page", 1))
# table = kw.get("table", self.table)
# get_filters = kw.get("filters", self.get_filters)
# get_joins = kw.get("joins", self.get_joins)
# get_groups = kw.get("groups", self.get_groups)
# get_orders = kw.get("orders", self.get_orders)
# query = self.db_session.query(table)
# query = get_joins(query, **kw)
# query = get_groups(query, **kw)
# query = get_filters(query, **kw)
# query = get_orders(query, **kw)
# query = query.limit(self.psize).offset((self.page - 1) * self.psize)
# return query
# def query_id(self, **kw):
# table = kw.get("table", self.table)
# get_joins = kw.get("joins", self.get_joins)
# get_groups = kw.get("groups", self.get_groups)
# get_filters = kw.get("filters", self.get_filters)
# get_orders = kw.get("orders", self.get_orders)
# if hasattr(table, "query_id") and self.id:
# query = table.query_id(self.id)
# query = get_joins(query, **kw)
# query = get_groups(query, **kw)
# query = get_filters(query, **kw)
# query = get_orders(query, **kw)
# return query
# return self.query(**kw)
def json_adapter(self, obj): def json_adapter(self, obj):
if isinstance(obj, datetime): if isinstance(obj, datetime):
return obj.strftime('%Y-%m-%d %H:%M:%S') return obj.strftime('%Y-%m-%d %H:%M:%S')
...@@ -264,22 +214,6 @@ class ApiViews(APIView): ...@@ -264,22 +214,6 @@ class ApiViews(APIView):
data.update(msg) data.update(msg)
return data return data
# def get(self, self.req. *args, **kwargs):
# self.req = request
# query=self.query()
# if not query.first():
# return HTTPNotFound()
# data = []
# for row in query:
# d = dict(row.__dict__)
# d.pop('_sa_instance_state', None)
# for key, value in d.items():
# if isinstance(value, datetime.datetime):
# d[key] = value.isoformat()
# elif isinstance(value, Decimal):
# d[key] = float(value)
# data.append(d)
# return Response(json=self.success(data=data))
def _get(self, request, *args, **kwargs): def _get(self, request, *args, **kwargs):
self.req = request self.req = request
if "draw" not in self.req.params: if "draw" not in self.req.params:
......
opensipkd/base/views/base_views.py
...@@ -276,7 +276,7 @@ class BaseView(object): ...@@ -276,7 +276,7 @@ class BaseView(object):
location=self.req.route_url(self.list_route)) location=self.req.route_url(self.list_route))
def form_validator(self, form, value): def form_validator(self, form, value):
pass """Digunakan untuk memvalidasi form sebelum disubmit"""
""" """
def form_validate(self, form, err_value, **kwargs): def form_validate(self, form, err_value, **kwargs):
...@@ -966,8 +966,6 @@ class BaseView(object): ...@@ -966,8 +966,6 @@ class BaseView(object):
def edit_restrict(self, row): def edit_restrict(self, row):
return False return False
def resp_xhr(self, values): def resp_xhr(self, values):
if values.get("data"): if values.get("data"):
...@@ -1101,9 +1099,10 @@ class BaseView(object): ...@@ -1101,9 +1099,10 @@ class BaseView(object):
kwargs["table"] = table kwargs["table"] = table
return self.returned_form(form, **kwargs) return self.returned_form(form, **kwargs)
def query_id(self, id=None): def query_id(self, id_=None):
id = id or self.req.matchdict['id'] id_ = id_ or self.req.matchdict['id']
return self.table.query_id(id) return self.table.query_id(id_)
# if self.req.user: # if self.req.user:
# if hasattr(self.table, 'company_id') and self.req.user.company_id: # if hasattr(self.table, 'company_id') and self.req.user.company_id:
# q = q.filter_by(company_id=self.req.user.company_id) # q = q.filter_by(company_id=self.req.user.company_id)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!