From 4038fcc416091ae857e730bab6bef80da26ab6d5 Mon Sep 17 00:00:00 2001 From: Dario Lodeiros Date: Wed, 7 Nov 2018 19:46:05 +0100 Subject: [PATCH] [DEL] date_utils clean --- hotel_calendar/tests/__init__.py | 4 -- .../components/exporter.py | 28 ++++---------- .../components/importer.py | 37 ++++++------------- .../models/hotel_room_type/importer.py | 11 +++--- .../hotel_room_type_availability/importer.py | 1 - .../hotel_room_type_restriction/importer.py | 1 - hotel_channel_connector/tests/__init__.py | 13 ------- .../wizard/wubook_import_plan_prices.py | 5 +-- .../wizard/wubook_import_plan_restrictions.py | 5 +-- 9 files changed, 28 insertions(+), 77 deletions(-) diff --git a/hotel_calendar/tests/__init__.py b/hotel_calendar/tests/__init__.py index d770a5fe1..40a96afc6 100644 --- a/hotel_calendar/tests/__init__.py +++ b/hotel_calendar/tests/__init__.py @@ -1,5 +1 @@ # -*- coding: utf-8 -*- - -from . import test_reservations_calendar -from . import test_management_calendar -from . import test_product_pricelist diff --git a/hotel_channel_connector/components/exporter.py b/hotel_channel_connector/components/exporter.py index bc1545ede..b60e00181 100644 --- a/hotel_channel_connector/components/exporter.py +++ b/hotel_channel_connector/components/exporter.py @@ -11,7 +11,6 @@ from odoo.tools import ( DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT) from .backend_adapter import DEFAULT_WUBOOK_DATE_FORMAT -from odoo.addons.hotel import date_utils from odoo import api, fields _logger = logging.getLogger(__name__) @@ -29,17 +28,13 @@ class HotelChannelConnectorExporter(AbstractComponent): def push_priceplans(self): unpushed = self.env['product.pricelist.item'].search([ ('wpushed', '=', False), - ('date_start', '>=', date_utils.now(hours=False).strftime( + ('date_start', '>=', fields.Datetime.now().strftime( DEFAULT_SERVER_DATE_FORMAT)) ], order="date_start ASC") if any(unpushed): - date_start = date_utils.get_datetime( - unpushed[0].date_start, - dtformat=DEFAULT_SERVER_DATE_FORMAT) - date_end = date_utils.get_datetime( - unpushed[-1].date_start, - dtformat=DEFAULT_SERVER_DATE_FORMAT) - days_diff = date_utils.date_diff(date_start, date_end, hours=False) + 1 + date_start = fields.Date.from_string(unpushed[0].date_start) + date_end = fields.Date.from_string(unpushed[-1].date_start) + days_diff = (date_start - date_end).days + 1 prices = {} pricelist_ids = self.env['product.pricelist'].search([ @@ -82,20 +77,13 @@ class HotelChannelConnectorExporter(AbstractComponent): rest_item_obj = self.env['hotel.room.type.restriction.item'] unpushed = rest_item_obj.search([ ('wpushed', '=', False), - ('date_start', '>=', date_utils.now(hours=False).strftime( + ('date_start', '>=', fields.Datetime.now().strftime( DEFAULT_SERVER_DATE_FORMAT)) ], order="date_start ASC") if any(unpushed): - date_start = date_utils.get_datetime( - unpushed[0].date_start, - dtformat=DEFAULT_SERVER_DATE_FORMAT) - date_end = date_utils.get_datetime( - unpushed[-1].date_start, - dtformat=DEFAULT_SERVER_DATE_FORMAT) - days_diff = date_utils.date_diff( - date_start, - date_end, - hours=False) + 1 + date_start = fields.Date.from_string(unpushed[0].date_start) + date_end = fields.Date.from_string(unpushed[-1].date_start) + days_diff = (date_start - date_end) + 1 restrictions = {} restriction_plan_ids = room_type_rest_obj.search([ ('wpid', '!=', False), diff --git a/hotel_channel_connector/components/importer.py b/hotel_channel_connector/components/importer.py index 093a7b7f2..2127da1ff 100644 --- a/hotel_channel_connector/components/importer.py +++ b/hotel_channel_connector/components/importer.py @@ -8,7 +8,6 @@ from datetime import timedelta from odoo.exceptions import ValidationError from odoo.addons.component.core import AbstractComponent, Component from odoo.addons.hotel_channel_connector.components.core import ChannelConnectorError -from odoo.addons.hotel import date_utils from odoo import _ from odoo.tools import ( DEFAULT_SERVER_DATE_FORMAT, @@ -110,9 +109,7 @@ class HotelChannelConnectorImporter(AbstractComponent): ('wrid', '=', k_rid) ], limit=1) if room_type: - date_dt = date_utils.get_datetime( - dfrom, - dtformat=DEFAULT_WUBOOK_DATE_FORMAT) + date_dt = fields.Date.from_string(dfrom) for day_vals in v_rid: date_str = date_dt.strftime(DEFAULT_SERVER_DATE_FORMAT) self._get_room_values_availability( @@ -138,14 +135,10 @@ class HotelChannelConnectorImporter(AbstractComponent): reservation_line_ids = [] tprice = 0.0 for brday in broom['roomdays']: - wndate = date_utils.get_datetime( - brday['day'], - dtformat=DEFAULT_WUBOOK_DATE_FORMAT - ).replace(tzinfo=pytz.utc) - if date_utils.date_in(wndate, - dates_checkin[0], - dates_checkout[0] - timedelta(days=1), - hours=False) == 0: + wndate = fields.Date.from_string( + brday['day'] + ) + if wndate >= dates_checkin[0] and wndate <= (dates_checkout[0] - timedelta(days=1)): reservation_line_ids.append((0, False, { 'date': wndate.strftime( DEFAULT_SERVER_DATE_FORMAT), @@ -247,19 +240,13 @@ class HotelChannelConnectorImporter(AbstractComponent): arr_hour = default_arrival_hour if book['arrival_hour'] == "--" \ else book['arrival_hour'] checkin = "%s %s" % (book['date_arrival'], arr_hour) - checkin_dt = date_utils.get_datetime( - checkin, - dtformat=DEFAULT_WUBOOK_DATETIME_FORMAT, - stz=tz_hotel) + checkin_dt = fields.Date.from_string(checkin) checkin_utc_dt = date_utils.dt_as_timezone(checkin_dt, 'UTC') checkin = checkin_utc_dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT) checkout = "%s %s" % (book['date_departure'], default_departure_hour) - checkout_dt = date_utils.get_datetime( - checkout, - dtformat=DEFAULT_WUBOOK_DATETIME_FORMAT, - stz=tz_hotel) + checkout_dt = fields.Date.from_string(checkout) checkout_utc_dt = date_utils.dt_as_timezone(checkout_dt, 'UTC') checkout = checkout_utc_dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT) @@ -539,9 +526,9 @@ class HotelChannelConnectorImporter(AbstractComponent): ], limit=1) if pricelist: pricelist_item_obj = self.env['product.pricelist.item'] - dfrom_dt = date_utils.get_datetime(date_from) - dto_dt = date_utils.get_datetime(date_to) - days_diff = date_utils.date_diff(dfrom_dt, dto_dt, hours=False) + 1 + dfrom_dt = fields.Date.from_string(date_from) + dto_dt = fields.Date.from_string(date_to) + days_diff = (dfrom_dt - dto_dt) + 1 for i in range(0, days_diff): ndate_dt = dfrom_dt + timedelta(days=i) for k_rid, v_rid in plan_prices.iteritems(): @@ -623,9 +610,7 @@ class HotelChannelConnectorImporter(AbstractComponent): ], limit=1) if room_type: for item in v_rid: - date_dt = date_utils.get_datetime( - item['date'], - dtformat=DEFAULT_WUBOOK_DATE_FORMAT) + date_dt = fields.Date.from_string(item['date']) restriction_item = restriction_item_obj.search([ ('restriction_id', '=', restriction_id.id), ('date_start', '=', date_dt.strftime( diff --git a/hotel_channel_connector/models/hotel_room_type/importer.py b/hotel_channel_connector/models/hotel_room_type/importer.py index 2d33dc716..e00395507 100644 --- a/hotel_channel_connector/models/hotel_room_type/importer.py +++ b/hotel_channel_connector/models/hotel_room_type/importer.py @@ -5,8 +5,7 @@ import logging from datetime import timedelta from odoo.exceptions import ValidationError from odoo.addons.component.core import Component -from odoo.addons.connector.components.mapper import mapping -from odoo.addons.hotel import date_utils +from odoo.addons.sconnector.components.mapper import mapping from odoo import fields, api, _ from odoo.tools import ( DEFAULT_SERVER_DATE_FORMAT, @@ -45,9 +44,9 @@ class HotelRoomTypeImporter(Component): def fetch_rooms_values(self, dfrom, dto, rooms=False, set_max_avail=False): # Sanitize Dates - now_dt = date_utils.now() - dfrom_dt = date_utils.get_datetime(dfrom) - dto_dt = date_utils.get_datetime(dto) + now_dt = fields.Datetime.now() + dfrom_dt = fields.Date.from_string(dfrom) + dto_dt = fields.Date.from_string(dto) if dto_dt < now_dt: return True if dfrom_dt < now_dt: @@ -122,7 +121,7 @@ class HotelRoomTypeImporter(Component): ('channel_plan_id', '=', k_rid) ], limit=1) if room_type: - date_dt = date_utils.get_datetime( + date_dt = fields.Date.from_string( dfrom, dtformat=DEFAULT_WUBOOK_DATE_FORMAT) for day_vals in v_rid: diff --git a/hotel_channel_connector/models/hotel_room_type_availability/importer.py b/hotel_channel_connector/models/hotel_room_type_availability/importer.py index a10301fd5..7651ed9bc 100644 --- a/hotel_channel_connector/models/hotel_room_type_availability/importer.py +++ b/hotel_channel_connector/models/hotel_room_type_availability/importer.py @@ -7,7 +7,6 @@ from odoo.exceptions import ValidationError from odoo.addons.component.core import Component from odoo.addons.hotel_channel_connector.components.core import ChannelConnectorError from odoo.addons.connector.components.mapper import mapping, only_create -from odoo.addons.hotel import date_utils from odoo import fields, api, _ _logger = logging.getLogger(__name__) diff --git a/hotel_channel_connector/models/hotel_room_type_restriction/importer.py b/hotel_channel_connector/models/hotel_room_type_restriction/importer.py index c20db4ce0..48b5d3f4f 100644 --- a/hotel_channel_connector/models/hotel_room_type_restriction/importer.py +++ b/hotel_channel_connector/models/hotel_room_type_restriction/importer.py @@ -6,7 +6,6 @@ from datetime import timedelta from odoo.exceptions import ValidationError from odoo.addons.component.core import Component from odoo.addons.connector.components.mapper import mapping -from odoo.addons.hotel import date_utils from odoo import fields, api, _ _logger = logging.getLogger(__name__) diff --git a/hotel_channel_connector/tests/__init__.py b/hotel_channel_connector/tests/__init__.py index db8af0785..02e8b3fcb 100644 --- a/hotel_channel_connector/tests/__init__.py +++ b/hotel_channel_connector/tests/__init__.py @@ -20,16 +20,3 @@ # along with this program. If not, see . # ############################################################################## -from . import test_wubook -from . import test_room_type_availability_model -from . import test_wubook_issue_model -from . import test_reservation_restriction_item_model -from . import test_reservation_restriction_model -from . import test_res_partner_model -from . import test_product_pricelist_item_model -from . import test_wubook_channel_info_model -from . import test_product_pricelist_model -from . import test_hotel_calendar_management_model -from . import test_hotel_folio_model -from . import test_hotel_room_type_model -from . import test_hotel_reservation_model diff --git a/hotel_channel_connector/wizard/wubook_import_plan_prices.py b/hotel_channel_connector/wizard/wubook_import_plan_prices.py index b07c5ec3e..60ee6fb86 100644 --- a/hotel_channel_connector/wizard/wubook_import_plan_prices.py +++ b/hotel_channel_connector/wizard/wubook_import_plan_prices.py @@ -21,7 +21,6 @@ ############################################################################## from openerp.exceptions import ValidationError from openerp import models, fields, api, _ -from odoo.addons.hotel import date_utils from ..components.backend_adapter import DEFAULT_WUBOOK_DATE_FORMAT @@ -37,8 +36,8 @@ class ImportPlanPricesWizard(models.TransientModel): self.env.context.get('active_id')) if pricelist_id: for record in self: - date_start_dt = date_utils.get_datetime(record.date_start) - date_end_dt = date_utils.get_datetime(record.date_end) + date_start_dt = fields.Date.from_string(record.date_start) + date_end_dt = fields.Date.from_string(record.date_end) wres = self.env['wubook'].fetch_plan_prices( pricelist_id.wpid, date_start_dt.strftime(DEFAULT_WUBOOK_DATE_FORMAT), diff --git a/hotel_channel_connector/wizard/wubook_import_plan_restrictions.py b/hotel_channel_connector/wizard/wubook_import_plan_restrictions.py index 2bca289ad..6f834bfd9 100644 --- a/hotel_channel_connector/wizard/wubook_import_plan_restrictions.py +++ b/hotel_channel_connector/wizard/wubook_import_plan_restrictions.py @@ -21,7 +21,6 @@ ############################################################################## from openerp.exceptions import ValidationError from openerp import models, fields, api, _ -from odoo.addons.hotel import date_utils from ..components.backend_adapter import DEFAULT_WUBOOK_DATE_FORMAT @@ -37,8 +36,8 @@ class ImportPlanRestrictionsWizard(models.TransientModel): self.env.context.get('active_id')) if restriction_id: for record in self: - date_start_dt = date_utils.get_datetime(record.date_start) - date_end_dt = date_utils.get_datetime(record.date_end) + date_start_dt = fields.Date.from_string(record.date_start) + date_end_dt = fields.Date.from_string(record.date_end) if int(restriction_id.wpid) == 0: wres = self.env['wubook'].fetch_rooms_values( date_start_dt.strftime(DEFAULT_WUBOOK_DATE_FORMAT),