[REF] pms_api_rest: consistency in datamodels and services filenames

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

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)

pms_api_rest/datamodels/pms_calendar_changes.py

@@ -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))

pms_api_rest/datamodels/pms_calendar_search_param.py

@@ -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)

pms_api_rest/datamodels/pms_calendar_swap_info.py

@@ -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)

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)

pms_api_rest/datamodels/pms_folio_search_param.py

@@ -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)

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)

pms_api_rest/datamodels/pms_pricelist_item_search_param.py

@@ -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)

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)

pms_api_rest/datamodels/pms_property_search_param.py

@@ -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)

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)

pms_api_rest/datamodels/pms_room_search_param.py

@@ -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)

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)

pms_api_rest/datamodels/pms_room_type_info.py

@@ -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)

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)

pms_api_rest/datamodels/user_input.py

@@ -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)

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

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"

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"

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"