[REM] website_event_track_online: merge into website_event_track

PURPOSE

Clean organization and models linked to Event Online feature introduced in
semi stable saas-13.3 at odoo/odoo@981f95bbf46658eda9f2d33751b9310cc67d86aa and odoo/enterprise@14722028ae0773c3710ea48ce48ff44703e83b5a

Also clean website event menu not being available in website event but only
in website event track, which implies some extra-code to manage it.

In short: merge website_event_online in website_event, website_event_track
_(online/session) in website_event_track.

RATIONALE

_online modules have been added to extend content of website_event and
website_event_track without having any impact on those module. First step
of cleaning is to move this content directly in base module.

track_session module is mainly a rewrite of track module. Second step of
cleaning is to move its content directly in website_event_track.

SPECIFICATIONS

Move remaining content of website event track online to website event track.
Agenda notably is completely replaced by the new one developed within
track_online module.

Update dependencies accordingly.

LINKS

Task ID-2319779
COM odoo/odoo#56067
ENT odoo/enterprise#12520
UPG odoo/upgrade#1654

5 files changed, 31 insertions, 15 deletions

diff --git a/addons/website_event_track_exhibitor/__manifest__.py b/addons/website_event_track_exhibitor/__manifest__.py
index 9fd2503da71..b2f9f8de957 100644
--- a/addons/website_event_track_exhibitor/__manifest__.py
+++ b/addons/website_event_track_exhibitor/__manifest__.py
@@ -11,7 +11,7 @@
     'website': 'https://www.odoo.com/page/events',
     'description': "",
     'depends': [
-        'website_event_track_online',
+        'website_event_track',
         'website_jitsi',
     ],
     'data': [
diff --git a/addons/website_event_track_exhibitor/controllers/exhibitor.py b/addons/website_event_track_exhibitor/controllers/exhibitor.py
index 9e37ae03d2e..4f96c90e2da 100644
--- a/addons/website_event_track_exhibitor/controllers/exhibitor.py
+++ b/addons/website_event_track_exhibitor/controllers/exhibitor.py
@@ -6,12 +6,12 @@ from random import randint, sample
 from werkzeug.exceptions import NotFound, Forbidden
 
 from odoo import exceptions, http
-from odoo.addons.website_event_track.controllers.main import WebsiteEventTrackController
+from odoo.addons.website_event_track.controllers.event_track import EventTrackController
 from odoo.http import request
 from odoo.osv import expression
 
 
-class ExhibitorController(WebsiteEventTrackController):
+class ExhibitorController(EventTrackController):
 
     def _get_event_sponsors_base_domain(self, event):
         search_domain_base = [
diff --git a/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py b/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py
index 7856eb8e091..e011510662d 100644
--- a/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py
+++ b/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from datetime import date, datetime, timedelta
+from datetime import datetime
+from unittest.mock import patch
 
-from odoo.addons.website_event_track_online.tests.common import TestEventTrackOnlineCommon
+from odoo.addons.website_event_track.tests.common import TestEventTrackOnlineCommon
+from odoo.fields import Datetime as FieldsDatetime
 from odoo.tests.common import users
 
 
@@ -18,6 +20,14 @@ class TestSponsorData(TestEventTrackOnlineCommon):
             'hour_to': 18.0,
         })
 
+        cls.wevent_exhib_dt = patch(
+            'odoo.addons.website_event_track_exhibitor.models.event_sponsor.fields.Datetime',
+            wraps=FieldsDatetime
+        )
+        cls.mock_wevent_exhib_dt = cls.wevent_exhib_dt.start()
+        cls.mock_wevent_exhib_dt.now.return_value = cls.reference_now
+        cls.addClassCleanup(cls.wevent_exhib_dt.stop)
+
     @users('user_eventmanager')
     def test_event_date_computation(self):
         """ Test date computation. Pay attention that mocks returns UTC values, meaning
@@ -29,42 +39,48 @@ class TestSponsorData(TestEventTrackOnlineCommon):
         self.assertTrue(event.is_ongoing)
 
         # After hour_from (9 > 8)
-        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 6, 7, 0, 0)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 6, 7, 0, 0)
+        self.mock_wevent_exhib_dt.now.return_value = datetime(2020, 7, 6, 7, 0, 0)
         event.invalidate_cache(fnames=['is_ongoing'])
         sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
         self.assertTrue(sponsor.is_in_opening_hours)
         self.assertTrue(event.is_ongoing)
 
         # At hour_from (8 = 8)
-        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 6, 6, 0, 0)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 6, 6, 0, 0)
+        self.mock_wevent_exhib_dt.now.return_value = datetime(2020, 7, 6, 6, 0, 0)
         event.invalidate_cache(fnames=['is_ongoing'])
         sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
         self.assertTrue(sponsor.is_in_opening_hours)
         self.assertTrue(event.is_ongoing)
 
         # Started but not opened (7h59 < 8)
-        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 6, 5, 59, 59)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 6, 5, 59, 59)
+        self.mock_wevent_exhib_dt.now.return_value = datetime(2020, 7, 6, 5, 59, 59)
         event.invalidate_cache(fnames=['is_ongoing'])
         sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
         self.assertFalse(sponsor.is_in_opening_hours)
         self.assertTrue(event.is_ongoing)
 
         # Evening event is not in opening hours (20 > 18)
-        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 6, 18, 0, 0)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 6, 18, 0, 0)
+        self.mock_wevent_exhib_dt.now.return_value = datetime(2020, 7, 6, 18, 0, 0)
         event.invalidate_cache(fnames=['is_ongoing'])
         sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
         self.assertFalse(sponsor.is_in_opening_hours)
         self.assertTrue(event.is_ongoing)
 
         # First day begins later
-        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 5, 6, 30, 0)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 5, 6, 30, 0)
+        self.mock_wevent_exhib_dt.now.return_value = datetime(2020, 7, 5, 6, 30, 0)
         event.invalidate_cache(fnames=['is_ongoing'])
         sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
         self.assertFalse(sponsor.is_in_opening_hours)
         self.assertFalse(event.is_ongoing)
 
         # End day finished sooner
-        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 7, 13, 0, 1)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 7, 13, 0, 1)
+        self.mock_wevent_exhib_dt.now.return_value = datetime(2020, 7, 7, 13, 0, 1)
         event.invalidate_cache(fnames=['is_ongoing'])
         sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
         self.assertFalse(sponsor.is_in_opening_hours)
diff --git a/addons/website_event_track_exhibitor/views/event_event_views.xml b/addons/website_event_track_exhibitor/views/event_event_views.xml
index ff33ca4d6a8..2c151398461 100644
--- a/addons/website_event_track_exhibitor/views/event_event_views.xml
+++ b/addons/website_event_track_exhibitor/views/event_event_views.xml
@@ -2,7 +2,7 @@
 <odoo>
     <record id="event_event_view_form" model="ir.ui.view">
         <field name="name">event.event.view.form.inherit.exhibitor</field>
-        <field name="inherit_id" ref="website_event_track_online.event_event_view_form"/>
+        <field name="inherit_id" ref="website_event_track.event_event_view_form"/>
         <field name="model">event.event</field>
         <field name="priority" eval="3"/>
         <field name="arch" type="xml">
diff --git a/addons/website_event_track_exhibitor/views/event_sponsor_views.xml b/addons/website_event_track_exhibitor/views/event_sponsor_views.xml
index 268342973b7..511ed56b884 100644
--- a/addons/website_event_track_exhibitor/views/event_sponsor_views.xml
+++ b/addons/website_event_track_exhibitor/views/event_sponsor_views.xml
@@ -3,7 +3,7 @@
     <record id="event_sponsor_view_search" model="ir.ui.view">
         <field name="name">event.sponsor.view.search.inherit.exhibitor</field>
         <field name="model">event.sponsor</field>
-        <field name="inherit_id" ref="website_event_track_online.event_sponsor_view_search"/>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_view_search"/>
         <field name="arch" type="xml">
             <xpath expr="//filter[@name='archived']" position="after">
                 <separator/>
@@ -15,7 +15,7 @@
     <record id="event_sponsor_view_tree" model="ir.ui.view">
         <field name="name">event.sponsor.view.tree.inherit.exhibitor</field>
         <field name="model">event.sponsor</field>
-        <field name="inherit_id" ref="website_event_track_online.event_sponsor_view_tree"/>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_view_tree"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='sponsor_type_id']" position="after">
                 <field name="is_published" optional="show"/>
@@ -38,7 +38,7 @@
     <record id="event_sponsor_view_form" model="ir.ui.view">
         <field name="name">event.sponsor.view.form.inherit.exhibitor</field>
         <field name="model">event.sponsor</field>
-        <field name="inherit_id" ref="website_event_track_online.event_sponsor_view_form"/>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//widget[@name='web_ribbon']" position="before">
                 <div class="oe_button_box" name="button_box">