From d8bd44cc8eda06e00a6addfa5782f56d415210aa Mon Sep 17 00:00:00 2001 From: miguelpadin Date: Mon, 23 May 2022 12:10:53 +0100 Subject: [PATCH] [FIX] pms-api-rest: fix precommit --- pms_api_rest/http.py | 69 ++++++++++++---------- pms_api_rest/services/pms_login_service.py | 2 +- pms_api_rest/services/pms_room_service.py | 25 +++----- 3 files changed, 45 insertions(+), 51 deletions(-) diff --git a/pms_api_rest/http.py b/pms_api_rest/http.py index fae00d147..3e65ed52a 100644 --- a/pms_api_rest/http.py +++ b/pms_api_rest/http.py @@ -1,12 +1,29 @@ -from werkzeug.exceptions import InternalServerError, Unauthorized, NotFound, Forbidden, BadRequest, HTTPException +from werkzeug.exceptions import ( + BadRequest, + Forbidden, + HTTPException, + InternalServerError, + NotFound, + Unauthorized, +) import odoo -from odoo.addons.base_rest.http import HttpRestRequest, wrapJsonException -from odoo.addons.base_rest.http import _rest_services_routes -from odoo.exceptions import MissingError, AccessError, AccessDenied, UserError, ValidationError -from odoo.http import Root, SessionExpiredException, HttpRequest +from odoo.exceptions import ( + AccessDenied, + AccessError, + MissingError, + UserError, + ValidationError, +) +from odoo.http import HttpRequest, Root, SessionExpiredException from odoo.loglevels import ustr +from odoo.addons.base_rest.http import ( + HttpRestRequest, + _rest_services_routes, + wrapJsonException, +) + class HttpRestRequestPms(HttpRestRequest): def __init__(self, httprequest): @@ -14,61 +31,49 @@ class HttpRestRequestPms(HttpRestRequest): def _handle_exception(self, exception): """Called within an except block to allow converting exceptions - to abitrary responses. Anything returned (except None) will - be used as response.""" + to abitrary responses. Anything returned (except None) will + be used as response.""" if isinstance(exception, SessionExpiredException): # we don't want to return the login form as plain html page # we want to raise a proper exception - print('session expired exception') + print("session expired exception") return wrapJsonException(Unauthorized(ustr(exception))) try: return super(HttpRequest, self)._handle_exception(exception) except MissingError as e: extra_info = getattr(e, "rest_json_info", None) return wrapJsonException( - NotFound(ustr(e)), - include_description=True, - extra_info=extra_info + NotFound(ustr(e)), include_description=True, extra_info=extra_info ) except (AccessError, AccessDenied) as e: - print('access error / access denied exception') + print("access error / access denied exception") extra_info = getattr(e, "rest_json_info", None) return wrapJsonException( - Forbidden(ustr(e)), - include_description=True, - extra_info=extra_info + Forbidden(ustr(e)), include_description=True, extra_info=extra_info ) except (UserError, ValidationError) as e: extra_info = getattr(e, "rest_json_info", None) return wrapJsonException( - BadRequest(e.args[0]), - include_description=True, - extra_info=extra_info + BadRequest(e.args[0]), include_description=True, extra_info=extra_info ) except HTTPException as e: extra_info = getattr(e, "rest_json_info", None) - return wrapJsonException( - e, - include_description=True, - extra_info=extra_info - ) + return wrapJsonException(e, include_description=True, extra_info=extra_info) except Unauthorized as e: - print('Unauthorized exception') + print("Unauthorized exception") extra_info = getattr(e, "rest_json_info", None) - return wrapJsonException( - e, - include_description=True, - extra_info=extra_info), + return ( + wrapJsonException(e, include_description=True, extra_info=extra_info), + ) except Exception as e: # flake8: noqa: E722 extra_info = getattr(e, "rest_json_info", None) - return wrapJsonException( - InternalServerError(e), - extra_info=extra_info - ) + return wrapJsonException(InternalServerError(e), extra_info=extra_info) + ori_get_request = Root.get_request + def get_request(self, httprequest): db = httprequest.session.db if db and odoo.service.db.exp_db_exist(db): diff --git a/pms_api_rest/services/pms_login_service.py b/pms_api_rest/services/pms_login_service.py index 673349cc0..bd6f3148b 100644 --- a/pms_api_rest/services/pms_login_service.py +++ b/pms_api_rest/services/pms_login_service.py @@ -4,7 +4,7 @@ import werkzeug.exceptions from jose import jwt from odoo import _ -from odoo.exceptions import AccessDenied, UserError +from odoo.exceptions import AccessDenied from odoo.addons.base_rest import restapi from odoo.addons.base_rest_datamodel.restapi import Datamodel diff --git a/pms_api_rest/services/pms_room_service.py b/pms_api_rest/services/pms_room_service.py index 1bd5facd3..00d427798 100644 --- a/pms_api_rest/services/pms_room_service.py +++ b/pms_api_rest/services/pms_room_service.py @@ -1,8 +1,9 @@ from odoo import _ +from odoo.exceptions import MissingError + from odoo.addons.base_rest import restapi from odoo.addons.base_rest_datamodel.restapi import Datamodel from odoo.addons.component.core import Component -from odoo.exceptions import MissingError class PmsRoomService(Component): @@ -67,11 +68,7 @@ class PmsRoomService(Component): auth="jwt_api_pms", ) def get_room(self, room_id): - room = self.env['pms.room'].search( - [ - ('id', '=', room_id) - ] - ) + room = self.env["pms.room"].search([("id", "=", room_id)]) if room: PmsRoomInfo = self.env.datamodels["pms.room.info"] return PmsRoomInfo( @@ -97,11 +94,7 @@ class PmsRoomService(Component): auth="jwt_api_pms", ) def update_room(self, room_id, pms_room_info_data): - room = self.env['pms.room'].search( - [ - ('id', '=', room_id) - ] - ) + room = self.env["pms.room"].search([("id", "=", room_id)]) if room: room.name = pms_room_info_data.name else: @@ -120,11 +113,7 @@ class PmsRoomService(Component): ) def delete_room(self, room_id): # esto tb podría ser con un browse - room = self.env['pms.room'].search( - [ - ('id', '=', room_id) - ] - ) + room = self.env["pms.room"].search([("id", "=", room_id)]) if room: room.active = False else: @@ -143,12 +132,12 @@ class PmsRoomService(Component): auth="jwt_api_pms", ) def create_room(self, pms_room_info_param): - room = self.env['pms.room'].create( + room = self.env["pms.room"].create( { "name": pms_room_info_param.name, "room_type_id": pms_room_info_param.roomTypeId, "capacity": pms_room_info_param.capacity, - "short_name": pms_room_info_param.shortName + "short_name": pms_room_info_param.shortName, } ) return room.id