[REF] pms_api_rest: renaming of datamodel files

pms_api_rest/datamodels/__init__.py

@@ -1,12 +1,12 @@
 from . import pms_calendar_search_param
-from . import pms_calendar_short_info
+from . import pms_calendar_info
 
 from . import pms_folio_search_param
-from . import pms_folio_short_info
+from . import pms_folio_info
 
-from . import pms_room_short_info
+from . import pms_room_info
 from . import pms_room_search_param
 
-from . import pms_reservation_short_info
+from . import pms_reservation_info
 
-from . import pms_checkin_partner_short_info
+from . import pms_checkin_partner_info

pms_api_rest/datamodels/pms_calendar_info.py

@@ -3,8 +3,8 @@ from marshmallow import fields
 from odoo.addons.datamodel.core import Datamodel
 
 
-class PmsCalendarShortInfo(Datamodel):
+class PmsCalendarInfo(Datamodel):
-    _name = "pms.calendar.short.info"
+    _name = "pms.calendar.info"
     id = fields.Integer(required=False, allow_none=True)
     date = fields.String(required=False, allow_none=True)
     roomId = fields.Integer(required=False, allow_none=True)

pms_api_rest/datamodels/pms_checkin_partner_info.py

@@ -3,8 +3,8 @@ from marshmallow import fields
 from odoo.addons.datamodel.core import Datamodel
 
 
-class PmsCheckinPartnerShortInfo(Datamodel):
+class PmsCheckinPartnerInfo(Datamodel):
-    _name = "pms.checkin.partner.short.info"
+    _name = "pms.checkin.partner.info"
     id = fields.Integer(required=False, allow_none=True)
     # partner = fields.String(required=False, allow_none=True)
     reservationId = fields.Integer(required=False, allow_none=True)

pms_api_rest/datamodels/pms_folio_info.py

@@ -3,8 +3,8 @@ from marshmallow import fields
 from odoo.addons.datamodel.core import Datamodel
 
 
-class PmsFolioShortInfo(Datamodel):
+class PmsFolioInfo(Datamodel):
-    _name = "pms.folio.short.info"
+    _name = "pms.folio.info"
     id = fields.Integer(required=False, allow_none=True)
     name = fields.String(required=False, allow_none=True)
     partnerName = fields.String(required=False, allow_none=True)

pms_api_rest/datamodels/pms_partner_info.py

@@ -3,7 +3,7 @@ from marshmallow import fields
 from odoo.addons.datamodel.core import Datamodel
 
 
-class PmsRoomShortInfo(Datamodel):
+class PmsPartnerInfo(Datamodel):
-    _name = "pms.room.short.info"
+    _name = "pms.partner.info"
     id = fields.Integer(required=False, allow_none=True)
     name = fields.String(required=False, allow_none=True)

pms_api_rest/datamodels/pms_reservation_info.py

@@ -3,8 +3,8 @@ from marshmallow import fields
 from odoo.addons.datamodel.core import Datamodel
 
 
-class PmsReservationShortInfo(Datamodel):
+class PmsReservationInfo(Datamodel):
-    _name = "pms.reservation.short.info"
+    _name = "pms.reservation.info"
     id = fields.Integer(required=False, allow_none=True)
 <<<<<<< HEAD
     price = fields.Float(required=False, allow_none=True)

pms_api_rest/datamodels/pms_room_info.py

@@ -3,7 +3,7 @@ from marshmallow import fields
 from odoo.addons.datamodel.core import Datamodel
 
 
-class PmsPartnerShortInfo(Datamodel):
+class PmsRoomInfo(Datamodel):
-    _name = "pms.partner.short.info"
+    _name = "pms.room.info"
     id = fields.Integer(required=False, allow_none=True)
     name = fields.String(required=False, allow_none=True)

pms_api_rest/services/calendar_service.py

@@ -21,7 +21,7 @@ class PmsCalendarService(Component):
             )
         ],
         input_param=Datamodel("pms.calendar.search.param"),
-        output_param=Datamodel("pms.calendar.short.info", is_list=True),
+        output_param=Datamodel("pms.calendar.info", is_list=True),
         auth="public",
     )
     def get_calendar(self, calendar_search_param):
@@ -38,7 +38,7 @@ class PmsCalendarService(Component):
         )
 >>>>>>> d6e6a667... [IMP] pms_api_rest: add get_reservation and get_checkin_partners
         result_lines = []
-        PmsCalendarShortInfo = self.env.datamodels["pms.calendar.short.info"]
+        PmsCalendarInfo = self.env.datamodels["pms.calendar.info"]
         for line in (
             self.env["pms.reservation.line"]
             .sudo()
@@ -47,7 +47,7 @@ class PmsCalendarService(Component):
             )
         ):
             result_lines.append(
-                PmsCalendarShortInfo(
+                PmsCalendarInfo(
                     id=line.id,
                     roomId=line.room_id.id,
                     date=datetime.combine(line.date, datetime.min.time()).isoformat(),

pms_api_rest/services/folio_services.py

@@ -21,7 +21,7 @@ class PmsFolioService(Component):
             )
         ],
         input_param=Datamodel("pms.folio.search.param"),
-        output_param=Datamodel("pms.folio.short.info", is_list=True),
+        output_param=Datamodel("pms.folio.info", is_list=True),
         auth="public",
     )
     def get_folios(self, folio_search_param):
@@ -31,7 +31,7 @@ class PmsFolioService(Component):
         if folio_search_param.id:
             domain.append(("id", "=", folio_search_param.id))
         result_folios = []
-        PmsFolioShortInfo = self.env.datamodels["pms.folio.short.info"]
+        PmsFolioInfo = self.env.datamodels["pms.folio.info"]
         for folio in (
             self.env["pms.folio"]
             .sudo()
@@ -83,7 +83,7 @@ class PmsFolioService(Component):
                     }
                 )
             result_folios.append(
-                PmsFolioShortInfo(
+                PmsFolioInfo(
                     id=folio.id,
                     name=folio.name,
                     partnerName=folio.partner_name if folio.partner_name else "",
@@ -112,7 +112,7 @@ class PmsFolioService(Component):
                 "GET",
             )
         ],
-        output_param=Datamodel("pms.reservation.short.info"),
+        output_param=Datamodel("pms.reservation.info"),
         auth="public",
     )
     def get_reservation(self, folio_id, reservation_id):
@@ -120,7 +120,7 @@ class PmsFolioService(Component):
             self.env["pms.reservation"].sudo().search([("id", "=", reservation_id)])
         )
         res = []
-        PmsReservationShortInfo = self.env.datamodels["pms.reservation.short.info"]
+        PmsReservationInfo = self.env.datamodels["pms.reservation.info"]
         if not reservation:
             pass
         else:
@@ -151,7 +151,7 @@ class PmsFolioService(Component):
                         "body": re.sub(text, "", message.body),
                     }
                 )
-            res = PmsReservationShortInfo(
+            res = PmsReservationInfo(
                 id=reservation.id,
                 partner=reservation.partner_id.name,
                 checkin=str(reservation.checkin),
@@ -185,7 +185,7 @@ class PmsFolioService(Component):
                 "GET",
             )
         ],
-        output_param=Datamodel("pms.checkin.partner.short.info", is_list=True),
+        output_param=Datamodel("pms.checkin.partner.info", is_list=True),
         auth="public",
     )
     def get_checkin_partners(self, folio_id, reservation_id):
@@ -193,15 +193,13 @@ class PmsFolioService(Component):
             self.env["pms.reservation"].sudo().search([("id", "=", reservation_id)])
         )
         checkin_partners = []
-        PmsCheckinPartnerShortInfo = self.env.datamodels[
+        PmsCheckinPartnerInfo = self.env.datamodels["pms.checkin.partner.info"]
-            "pms.checkin.partner.short.info"
-        ]
         if not reservation:
             pass
         else:
             for checkin_partner in reservation.checkin_partner_ids:
                 checkin_partners.append(
-                    PmsCheckinPartnerShortInfo(
+                    PmsCheckinPartnerInfo(
                         id=checkin_partner.id,
                         reservationId=checkin_partner.reservation_id.id,
                         name=checkin_partner.name if checkin_partner.name else "",

pms_api_rest/services/partner_services.py

@@ -18,13 +18,13 @@ class PmsPartnerService(Component):
                 "GET",
             )
         ],
-        output_param=Datamodel("pms.partner.short.info", is_list=True),
+        output_param=Datamodel("pms.partner.info", is_list=True),
         auth="public",
     )
     def get_partners(self):
         domain = []
         result_partners = []
-        PmsPartnerShortInfo = self.env.datamodels["pms.partner.short.info"]
+        PmsPartnerInfo = self.env.datamodels["pms.partner.info"]
         for partner in (
             self.env["res.partner"]
             .sudo()
@@ -34,7 +34,7 @@ class PmsPartnerService(Component):
         ):
 
             result_partners.append(
-                PmsPartnerShortInfo(
+                PmsPartnerInfo(
                     id=partner.id,
                     name=partner.name,
                 )

pms_api_rest/services/reservation_services.py

@@ -20,14 +20,14 @@ class PmsRoomService(Component):
                 "GET",
             )
         ],
-        output_param=Datamodel("pms.reservation.short.info", is_list=True),
+        output_param=Datamodel("pms.reservation.info", is_list=True),
         auth="public",
     )
     def get_reservations(self):
         domain = []
 
         result_reservations = []
-        PmsReservationShortInfo = self.env.datamodels["pms.reservation.short.info"]
+        PmsReservationInfo = self.env.datamodels["pms.reservation..info"]
         for reservation in (
             self.env["pms.reservation"]
             .sudo()
@@ -36,8 +36,7 @@ class PmsRoomService(Component):
             )
         ):
             result_reservations.append(
-
+                PmsReservationInfo(
-                PmsReservationShortInfo(
                     id=reservation.id,
                     price=reservation.price_subtotal,
                     checkin=datetime.combine(reservation.checkin, datetime.min.time()).isoformat(),

pms_api_rest/services/room_services.py

@@ -19,7 +19,7 @@ class PmsRoomService(Component):
             )
         ],
         input_param=Datamodel("pms.room.search.param"),
-        output_param=Datamodel("pms.room.short.info", is_list=True),
+        output_param=Datamodel("pms.room.info", is_list=True),
         auth="public",
     )
     def get_rooms(self, room_search_param):
@@ -29,7 +29,7 @@ class PmsRoomService(Component):
         if room_search_param.id:
             domain.append(("id", "=", room_search_param.id))
         result_rooms = []
-        PmsRoomShortInfo = self.env.datamodels["pms.room.short.info"]
+        PmsRoomInfo = self.env.datamodels["pms.room.info"]
         for room in (
             self.env["pms.room"]
             .sudo()
@@ -39,7 +39,7 @@ class PmsRoomService(Component):
         ):
 
             result_rooms.append(
-                PmsRoomShortInfo(
+                PmsRoomInfo(
                     id=room.id,
                     name=room.name,
                 )