From d8db62c4b7e70f9be00cb86a536b55035bcdf2f1 Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Tue, 25 Jan 2022 13:01:08 +0100 Subject: [PATCH] [REF] pms_api_rest: consistency in datamodels and services filenames --- __init__.py | 0 pms_api_rest/datamodels/__init__.py | 34 +++++++------------ ...journal_info.py => pms_account_journal.py} | 0 .../{pms_calendar_info.py => pms_calendar.py} | 19 +++++++++++ .../datamodels/pms_calendar_changes.py | 8 ----- .../datamodels/pms_calendar_search_param.py | 9 ----- .../datamodels/pms_calendar_swap_info.py | 11 ------ ...partner_info.py => pms_checkin_partner.py} | 0 .../{pms_folio_info.py => pms_folio.py} | 7 ++++ .../datamodels/pms_folio_search_param.py | 10 ------ .../{pms_partner_info.py => pms_partner.py} | 0 .../{pms_payment_info.py => pms_payment.py} | 0 ...pms_pricelist_info.py => pms_pricelist.py} | 0 ...ist_item_info.py => pms_pricelist_item.py} | 7 ++++ .../pms_pricelist_item_search_param.py | 10 ------ .../{pms_property_info.py => pms_property.py} | 7 ++++ .../datamodels/pms_property_search_param.py | 10 ------ ...reservation_info.py => pms_reservation.py} | 0 .../{pms_room_info.py => pms_room.py} | 7 ++++ .../datamodels/pms_room_search_param.py | 10 ------ ..._type_search_param.py => pms_room_type.py} | 6 ++++ pms_api_rest/datamodels/pms_room_type_info.py | 9 ----- .../{user_output.py => pms_user.py} | 6 ++++ pms_api_rest/datamodels/user_input.py | 9 ----- pms_api_rest/services/__init__.py | 18 +++++----- ...dar_service.py => pms_calendar_service.py} | 0 ...folio_services.py => pms_folio_service.py} | 0 ...{login_service.py => pms_login_service.py} | 2 +- ...ner_services.py => pms_partner_service.py} | 0 ...st_service.py => pms_pricelist_service.py} | 0 ...ty_services.py => pms_property_service.py} | 2 +- ...services.py => pms_reservation_service.py} | 2 +- .../{room_services.py => pms_room_service.py} | 0 ..._services.py => pms_room_type_services.py} | 0 34 files changed, 84 insertions(+), 119 deletions(-) create mode 100644 __init__.py rename pms_api_rest/datamodels/{pms_account_journal_info.py => pms_account_journal.py} (100%) rename pms_api_rest/datamodels/{pms_calendar_info.py => pms_calendar.py} (65%) delete mode 100644 pms_api_rest/datamodels/pms_calendar_changes.py delete mode 100644 pms_api_rest/datamodels/pms_calendar_search_param.py delete mode 100644 pms_api_rest/datamodels/pms_calendar_swap_info.py rename pms_api_rest/datamodels/{pms_checkin_partner_info.py => pms_checkin_partner.py} (100%) rename pms_api_rest/datamodels/{pms_folio_info.py => pms_folio.py} (82%) delete mode 100644 pms_api_rest/datamodels/pms_folio_search_param.py rename pms_api_rest/datamodels/{pms_partner_info.py => pms_partner.py} (100%) rename pms_api_rest/datamodels/{pms_payment_info.py => pms_payment.py} (100%) rename pms_api_rest/datamodels/{pms_pricelist_info.py => pms_pricelist.py} (100%) rename pms_api_rest/datamodels/{pms_pricelist_item_info.py => pms_pricelist_item.py} (79%) delete mode 100644 pms_api_rest/datamodels/pms_pricelist_item_search_param.py rename pms_api_rest/datamodels/{pms_property_info.py => pms_property.py} (61%) delete mode 100644 pms_api_rest/datamodels/pms_property_search_param.py rename pms_api_rest/datamodels/{pms_reservation_info.py => pms_reservation.py} (100%) rename pms_api_rest/datamodels/{pms_room_info.py => pms_room.py} (59%) delete mode 100644 pms_api_rest/datamodels/pms_room_search_param.py rename pms_api_rest/datamodels/{pms_room_type_search_param.py => pms_room_type.py} (60%) delete mode 100644 pms_api_rest/datamodels/pms_room_type_info.py rename pms_api_rest/datamodels/{user_output.py => pms_user.py} (62%) delete mode 100644 pms_api_rest/datamodels/user_input.py rename pms_api_rest/services/{calendar_service.py => pms_calendar_service.py} (100%) rename pms_api_rest/services/{folio_services.py => pms_folio_service.py} (100%) rename pms_api_rest/services/{login_service.py => pms_login_service.py} (97%) rename pms_api_rest/services/{partner_services.py => pms_partner_service.py} (100%) rename pms_api_rest/services/{pricelist_service.py => pms_pricelist_service.py} (100%) rename pms_api_rest/services/{property_services.py => pms_property_service.py} (98%) rename pms_api_rest/services/{reservation_services.py => pms_reservation_service.py} (99%) rename pms_api_rest/services/{room_services.py => pms_room_service.py} (100%) rename pms_api_rest/services/{room_type_services.py => pms_room_type_services.py} (100%) diff --git a/__init__.py b/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/pms_api_rest/datamodels/__init__.py b/pms_api_rest/datamodels/__init__.py index 734e3fee0..01b14bdff 100644 --- a/pms_api_rest/datamodels/__init__.py +++ b/pms_api_rest/datamodels/__init__.py @@ -1,28 +1,20 @@ -from . import pms_calendar_search_param -from . import pms_calendar_info +from . import pms_calendar -from . import pms_folio_search_param -from . import pms_folio_info +from . import pms_folio -from . import pms_room_info -from . import pms_room_type_info -from . import pms_room_search_param +from . import pms_room +from . import pms_room_type -from . import pms_reservation_info +from . import pms_reservation -from . import pms_checkin_partner_info -from . import pms_partner_info +from . import pms_checkin_partner +from . import pms_partner -from . import pms_calendar_swap_info -from . import pms_calendar_changes +from . import pms_property +from . import pms_account_journal +from . import pms_payment -from . import pms_property_info -from . import pms_property_search_param -from . import pms_account_journal_info -from . import pms_payment_info -from . import user_input -from . import user_output +from . import pms_user -from . import pms_pricelist_info -from . import pms_pricelist_item_search_param -from . import pms_pricelist_item_info +from . import pms_pricelist +from . import pms_pricelist_item diff --git a/pms_api_rest/datamodels/pms_account_journal_info.py b/pms_api_rest/datamodels/pms_account_journal.py similarity index 100% rename from pms_api_rest/datamodels/pms_account_journal_info.py rename to pms_api_rest/datamodels/pms_account_journal.py diff --git a/pms_api_rest/datamodels/pms_calendar_info.py b/pms_api_rest/datamodels/pms_calendar.py similarity index 65% rename from pms_api_rest/datamodels/pms_calendar_info.py rename to pms_api_rest/datamodels/pms_calendar.py index f5ccf56cf..cffc2569a 100644 --- a/pms_api_rest/datamodels/pms_calendar_info.py +++ b/pms_api_rest/datamodels/pms_calendar.py @@ -3,6 +3,25 @@ from marshmallow import fields from odoo.addons.datamodel.core import Datamodel +class PmsCalendarChanges(Datamodel): + _name = "pms.calendar.changes" + reservationLinesChanges = fields.List(fields.Dict(required=False, allow_none=True)) + + +class PmsCalendarSwapInfo(Datamodel): + _name = "pms.calendar.swap.info" + swapFrom = fields.String(required=True, allow_none=False) + swapTo = fields.String(required=True, allow_none=False) + roomIdA = fields.Integer(required=True, allow_none=False) + roomIdB = fields.Integer(required=True, allow_none=False) + + +class PmsCalendarSearchParam(Datamodel): + _name = "pms.calendar.search.param" + date_from = fields.String(required=False, allow_none=True) + date_to = fields.String(required=False, allow_none=True) + + class PmsCalendarInfo(Datamodel): _name = "pms.calendar.info" id = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_calendar_changes.py b/pms_api_rest/datamodels/pms_calendar_changes.py deleted file mode 100644 index 77e3e7074..000000000 --- a/pms_api_rest/datamodels/pms_calendar_changes.py +++ /dev/null @@ -1,8 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsCalendarChanges(Datamodel): - _name = "pms.calendar.changes" - reservationLinesChanges = fields.List(fields.Dict(required=False, allow_none=True)) diff --git a/pms_api_rest/datamodels/pms_calendar_search_param.py b/pms_api_rest/datamodels/pms_calendar_search_param.py deleted file mode 100644 index 1414c55ec..000000000 --- a/pms_api_rest/datamodels/pms_calendar_search_param.py +++ /dev/null @@ -1,9 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsCalendarSearchParam(Datamodel): - _name = "pms.calendar.search.param" - date_from = fields.String(required=False, allow_none=True) - date_to = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_calendar_swap_info.py b/pms_api_rest/datamodels/pms_calendar_swap_info.py deleted file mode 100644 index ee9f2a0bb..000000000 --- a/pms_api_rest/datamodels/pms_calendar_swap_info.py +++ /dev/null @@ -1,11 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsCalendarSwapInfo(Datamodel): - _name = "pms.calendar.swap.info" - swapFrom = fields.String(required=True, allow_none=False) - swapTo = fields.String(required=True, allow_none=False) - roomIdA = fields.Integer(required=True, allow_none=False) - roomIdB = fields.Integer(required=True, allow_none=False) diff --git a/pms_api_rest/datamodels/pms_checkin_partner_info.py b/pms_api_rest/datamodels/pms_checkin_partner.py similarity index 100% rename from pms_api_rest/datamodels/pms_checkin_partner_info.py rename to pms_api_rest/datamodels/pms_checkin_partner.py diff --git a/pms_api_rest/datamodels/pms_folio_info.py b/pms_api_rest/datamodels/pms_folio.py similarity index 82% rename from pms_api_rest/datamodels/pms_folio_info.py rename to pms_api_rest/datamodels/pms_folio.py index 54fe504b1..da9febb5b 100644 --- a/pms_api_rest/datamodels/pms_folio_info.py +++ b/pms_api_rest/datamodels/pms_folio.py @@ -3,6 +3,13 @@ from marshmallow import fields from odoo.addons.datamodel.core import Datamodel +class PmsFolioSearchParam(Datamodel): + _name = "pms.folio.search.param" + + date_from = fields.String(required=False, allow_none=True) + date_to = fields.String(required=False, allow_none=True) + + class PmsFolioInfo(Datamodel): _name = "pms.folio.info" id = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_folio_search_param.py b/pms_api_rest/datamodels/pms_folio_search_param.py deleted file mode 100644 index 5a37c6003..000000000 --- a/pms_api_rest/datamodels/pms_folio_search_param.py +++ /dev/null @@ -1,10 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsFolioSearchParam(Datamodel): - _name = "pms.folio.search.param" - - date_from = fields.String(required=False, allow_none=True) - date_to = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_partner_info.py b/pms_api_rest/datamodels/pms_partner.py similarity index 100% rename from pms_api_rest/datamodels/pms_partner_info.py rename to pms_api_rest/datamodels/pms_partner.py diff --git a/pms_api_rest/datamodels/pms_payment_info.py b/pms_api_rest/datamodels/pms_payment.py similarity index 100% rename from pms_api_rest/datamodels/pms_payment_info.py rename to pms_api_rest/datamodels/pms_payment.py diff --git a/pms_api_rest/datamodels/pms_pricelist_info.py b/pms_api_rest/datamodels/pms_pricelist.py similarity index 100% rename from pms_api_rest/datamodels/pms_pricelist_info.py rename to pms_api_rest/datamodels/pms_pricelist.py diff --git a/pms_api_rest/datamodels/pms_pricelist_item_info.py b/pms_api_rest/datamodels/pms_pricelist_item.py similarity index 79% rename from pms_api_rest/datamodels/pms_pricelist_item_info.py rename to pms_api_rest/datamodels/pms_pricelist_item.py index e52986bf8..8ec3c285f 100644 --- a/pms_api_rest/datamodels/pms_pricelist_item_info.py +++ b/pms_api_rest/datamodels/pms_pricelist_item.py @@ -3,6 +3,13 @@ from marshmallow import fields from odoo.addons.datamodel.core import Datamodel +class PmsPricelistItemSearchParam(Datamodel): + _name = "pms.pricelist.item.search.param" + date_from = fields.String(required=True, allow_none=False) + date_to = fields.String(required=True, allow_none=False) + pms_property_id = fields.Integer(required=True, allow_none=False) + + class PmsPricelistItemInfo(Datamodel): _name = "pms.pricelist.item.info" pricelist_item_id = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_pricelist_item_search_param.py b/pms_api_rest/datamodels/pms_pricelist_item_search_param.py deleted file mode 100644 index 33b4bafcc..000000000 --- a/pms_api_rest/datamodels/pms_pricelist_item_search_param.py +++ /dev/null @@ -1,10 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsPricelistItemSearchParam(Datamodel): - _name = "pms.pricelist.item.search.param" - date_from = fields.String(required=True, allow_none=False) - date_to = fields.String(required=True, allow_none=False) - pms_property_id = fields.Integer(required=True, allow_none=False) diff --git a/pms_api_rest/datamodels/pms_property_info.py b/pms_api_rest/datamodels/pms_property.py similarity index 61% rename from pms_api_rest/datamodels/pms_property_info.py rename to pms_api_rest/datamodels/pms_property.py index 79db92240..6a10fa855 100644 --- a/pms_api_rest/datamodels/pms_property_info.py +++ b/pms_api_rest/datamodels/pms_property.py @@ -3,6 +3,13 @@ from marshmallow import fields from odoo.addons.datamodel.core import Datamodel +class PmsPropertySearchParam(Datamodel): + _name = "pms.property.search.param" + + id = fields.Integer(required=False, allow_none=False) + name = fields.String(required=False, allow_none=False) + + class PmsPropertyInfo(Datamodel): _name = "pms.property.info" id = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_property_search_param.py b/pms_api_rest/datamodels/pms_property_search_param.py deleted file mode 100644 index c8a1f81b4..000000000 --- a/pms_api_rest/datamodels/pms_property_search_param.py +++ /dev/null @@ -1,10 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsPropertySearchParam(Datamodel): - _name = "pms.property.search.param" - - id = fields.Integer(required=False, allow_none=False) - name = fields.String(required=False, allow_none=False) diff --git a/pms_api_rest/datamodels/pms_reservation_info.py b/pms_api_rest/datamodels/pms_reservation.py similarity index 100% rename from pms_api_rest/datamodels/pms_reservation_info.py rename to pms_api_rest/datamodels/pms_reservation.py diff --git a/pms_api_rest/datamodels/pms_room_info.py b/pms_api_rest/datamodels/pms_room.py similarity index 59% rename from pms_api_rest/datamodels/pms_room_info.py rename to pms_api_rest/datamodels/pms_room.py index d6a2603fb..61825ea49 100644 --- a/pms_api_rest/datamodels/pms_room_info.py +++ b/pms_api_rest/datamodels/pms_room.py @@ -3,6 +3,13 @@ from marshmallow import fields from odoo.addons.datamodel.core import Datamodel +class PmsRoomSearchParam(Datamodel): + _name = "pms.room.search.param" + id = fields.Integer(required=False, allow_none=True) + name = fields.String(required=False, allow_none=True) + pms_property_id = fields.Integer(required=False, allow_none=True) + + class PmsRoomInfo(Datamodel): _name = "pms.room.info" id = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_room_search_param.py b/pms_api_rest/datamodels/pms_room_search_param.py deleted file mode 100644 index 1ba09dc0e..000000000 --- a/pms_api_rest/datamodels/pms_room_search_param.py +++ /dev/null @@ -1,10 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsRoomSearchParam(Datamodel): - _name = "pms.room.search.param" - id = fields.Integer(required=False, allow_none=True) - name = fields.String(required=False, allow_none=True) - pms_property_id = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_room_type_search_param.py b/pms_api_rest/datamodels/pms_room_type.py similarity index 60% rename from pms_api_rest/datamodels/pms_room_type_search_param.py rename to pms_api_rest/datamodels/pms_room_type.py index 3ee1780f1..c1bd369dc 100644 --- a/pms_api_rest/datamodels/pms_room_type_search_param.py +++ b/pms_api_rest/datamodels/pms_room_type.py @@ -7,3 +7,9 @@ class PmsRoomTypeSearchParam(Datamodel): _name = "pms.room.type.search.param" id = fields.Integer(required=False, allow_none=True) name = fields.String(required=False, allow_none=True) + + +class PmsRoomTypeInfo(Datamodel): + _name = "pms.room.type.info" + id = fields.Integer(required=False, allow_none=True) + name = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_room_type_info.py b/pms_api_rest/datamodels/pms_room_type_info.py deleted file mode 100644 index ce3ad3ea9..000000000 --- a/pms_api_rest/datamodels/pms_room_type_info.py +++ /dev/null @@ -1,9 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsRoomTypeInfo(Datamodel): - _name = "pms.room.type.info" - id = fields.Integer(required=False, allow_none=True) - name = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/user_output.py b/pms_api_rest/datamodels/pms_user.py similarity index 62% rename from pms_api_rest/datamodels/user_output.py rename to pms_api_rest/datamodels/pms_user.py index ee17fe5ca..83b03cef3 100644 --- a/pms_api_rest/datamodels/user_output.py +++ b/pms_api_rest/datamodels/pms_user.py @@ -3,6 +3,12 @@ from marshmallow import fields from odoo.addons.datamodel.core import Datamodel +class PmsApiRestUserInput(Datamodel): + _name = "pms.api.rest.user.input" + username = fields.String(required=False, allow_none=True) + password = fields.String(required=False, allow_none=True) + + class PmsApiRestUserOutput(Datamodel): _name = "pms.api.rest.user.output" # user = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/user_input.py b/pms_api_rest/datamodels/user_input.py deleted file mode 100644 index f370c2a60..000000000 --- a/pms_api_rest/datamodels/user_input.py +++ /dev/null @@ -1,9 +0,0 @@ -from marshmallow import fields - -from odoo.addons.datamodel.core import Datamodel - - -class PmsApiRestUserInput(Datamodel): - _name = "pms.api.rest.user.input" - username = fields.String(required=False, allow_none=True) - password = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/services/__init__.py b/pms_api_rest/services/__init__.py index 706570938..f6249f90a 100644 --- a/pms_api_rest/services/__init__.py +++ b/pms_api_rest/services/__init__.py @@ -1,10 +1,10 @@ -from . import folio_services -from . import room_services -from . import room_type_services -from . import calendar_service -from . import partner_services +from . import pms_folio_service +from . import pms_room_service +from . import pms_room_type_services +from . import pms_calendar_service +from . import pms_partner_service -from . import reservation_services -from . import property_services -from . import login_service -from . import pricelist_service +from . import pms_reservation_service +from . import pms_property_service +from . import pms_login_service +from . import pms_pricelist_service diff --git a/pms_api_rest/services/calendar_service.py b/pms_api_rest/services/pms_calendar_service.py similarity index 100% rename from pms_api_rest/services/calendar_service.py rename to pms_api_rest/services/pms_calendar_service.py diff --git a/pms_api_rest/services/folio_services.py b/pms_api_rest/services/pms_folio_service.py similarity index 100% rename from pms_api_rest/services/folio_services.py rename to pms_api_rest/services/pms_folio_service.py diff --git a/pms_api_rest/services/login_service.py b/pms_api_rest/services/pms_login_service.py similarity index 97% rename from pms_api_rest/services/login_service.py rename to pms_api_rest/services/pms_login_service.py index ac45cc993..a719cc187 100644 --- a/pms_api_rest/services/login_service.py +++ b/pms_api_rest/services/pms_login_service.py @@ -10,7 +10,7 @@ from odoo.addons.base_rest_datamodel.restapi import Datamodel from odoo.addons.component.core import Component -class PmsPartnerService(Component): +class PmsLoginService(Component): _inherit = "base.rest.service" _name = "pms.auth.service" _usage = "login" diff --git a/pms_api_rest/services/partner_services.py b/pms_api_rest/services/pms_partner_service.py similarity index 100% rename from pms_api_rest/services/partner_services.py rename to pms_api_rest/services/pms_partner_service.py diff --git a/pms_api_rest/services/pricelist_service.py b/pms_api_rest/services/pms_pricelist_service.py similarity index 100% rename from pms_api_rest/services/pricelist_service.py rename to pms_api_rest/services/pms_pricelist_service.py diff --git a/pms_api_rest/services/property_services.py b/pms_api_rest/services/pms_property_service.py similarity index 98% rename from pms_api_rest/services/property_services.py rename to pms_api_rest/services/pms_property_service.py index e5573a61f..c5ce496b9 100644 --- a/pms_api_rest/services/property_services.py +++ b/pms_api_rest/services/pms_property_service.py @@ -3,7 +3,7 @@ from odoo.addons.base_rest_datamodel.restapi import Datamodel from odoo.addons.component.core import Component -class PmsPropertyComponent(Component): +class PmsPropertyService(Component): _inherit = "base.rest.service" _name = "pms.property.service" _usage = "properties" diff --git a/pms_api_rest/services/reservation_services.py b/pms_api_rest/services/pms_reservation_service.py similarity index 99% rename from pms_api_rest/services/reservation_services.py rename to pms_api_rest/services/pms_reservation_service.py index af2582c63..972e8129a 100644 --- a/pms_api_rest/services/reservation_services.py +++ b/pms_api_rest/services/pms_reservation_service.py @@ -5,7 +5,7 @@ from odoo.addons.base_rest_datamodel.restapi import Datamodel from odoo.addons.component.core import Component -class PmsRoomService(Component): +class PmsReservationService(Component): _inherit = "base.rest.service" _name = "pms.reservation.service" _usage = "reservations" diff --git a/pms_api_rest/services/room_services.py b/pms_api_rest/services/pms_room_service.py similarity index 100% rename from pms_api_rest/services/room_services.py rename to pms_api_rest/services/pms_room_service.py diff --git a/pms_api_rest/services/room_type_services.py b/pms_api_rest/services/pms_room_type_services.py similarity index 100% rename from pms_api_rest/services/room_type_services.py rename to pms_api_rest/services/pms_room_type_services.py