[15.0][FIX] calendar: Select correct base event when current is archived #149349

CarlosRoca13 · 2024-01-15T07:44:34Z

When the base event is archived, it continues being the base event of the recurrence, and when trying to change the recurrence of all the events of the recurrence, an error is thrown or some inconsistencies occur.

To test the problem, you can follow these steps:

Create a recurrence of events from a non included day on the recurrence (example: recurrence on tuesday and friday and the start of the recurrence on monday). The first event will be archived automatically.
Open other event of the recurrence.
Modify the recurrence for all events (example: change the weekdays, set just tuesday instead of tuesday and friday)

An error will be thrown.

See next gif:

By making these changes, the base event will be updated, as indicated in the _select_new_base_event method, so these inconsistencies will not occur when making the changes.

See next gif:

cc @Tecnativa TT46742

ping @pedrobaeza @chienandalu

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

robodoo · 2024-01-15T07:45:00Z

Pull request status dashboard.

pedrobaeza · 2024-01-15T10:35:10Z

Isn't this reproducible when you add the recurrence from a non-included day? Or do you need to manually archive the base event?

CarlosRoca13 · 2024-01-15T10:41:01Z

Yes sorry, when a recurring calendar event is created from a day that is not included in the recurrence, it is archived and the recurrence data in that event is lost, but it remains the base event of the recurrence. Therefore, when trying to make changes to the recurrence, the following error is thrown:

RPC_ERROR
Odoo Server Error
Traceback (most recent call last):
  File "/opt/odoo/custom/src/odoo/odoo/addons/base/models/ir_http.py", line 237, in _dispatch
    result = request.dispatch()
  File "/opt/odoo/custom/src/odoo/odoo/http.py", line 698, in dispatch
    result = self._call_function(**self.params)
  File "/opt/odoo/custom/src/odoo/odoo/http.py", line 368, in _call_function
    return checked_call(self.db, *args, **kwargs)
  File "/opt/odoo/custom/src/odoo/odoo/service/model.py", line 94, in wrapper
    return f(dbname, *args, **kwargs)
  File "/opt/odoo/custom/src/odoo/odoo/http.py", line 357, in checked_call
    result = self.endpoint(*a, **kw)
  File "/opt/odoo/custom/src/odoo/odoo/http.py", line 921, in __call__
    return self.method(*args, **kw)
  File "/opt/odoo/custom/src/odoo/odoo/http.py", line 546, in response_wrap
    response = f(*args, **kw)
  File "/opt/odoo/auto/addons/web/controllers/main.py", line 1324, in call_kw
    return self._call_kw(model, method, args, kwargs)
  File "/opt/odoo/auto/addons/web/controllers/main.py", line 1316, in _call_kw
    return call_kw(request.env[model], method, args, kwargs)
  File "/opt/odoo/custom/src/odoo/odoo/api.py", line 469, in call_kw
    result = _call_kw_multi(method, model, args, kwargs)
  File "/opt/odoo/custom/src/odoo/odoo/api.py", line 456, in _call_kw_multi
    result = method(recs, *args, **kwargs)
  File "/opt/odoo/auto/addons/calendar/models/calendar_event.py", line 502, in write
    self._rewrite_recurrence(values, time_values, recurrence_values)
  File "/opt/odoo/auto/addons/calendar/models/calendar_event.py", line 913, in _rewrite_recurrence
    detached_events = base_event._apply_recurrence_values(new_values)
  File "/opt/odoo/auto/addons/sale_planner_calendar/models/calendar.py", line 51, in _apply_recurrence_values
    return super()._apply_recurrence_values(values, future=future)
  File "/opt/odoo/auto/addons/calendar/models/calendar_event.py", line 809, in _apply_recurrence_values
    return to_update._apply_recurrence()
  File "/opt/odoo/auto/addons/calendar/models/calendar_recurrence.py", line 225, in _apply_recurrence
    ranges = recurrence._range_calculation(event, duration)
  File "/opt/odoo/auto/addons/calendar/models/calendar_recurrence.py", line 421, in _range_calculation
    ranges = set(self._get_ranges(event.start, duration))
  File "/opt/odoo/auto/addons/calendar/models/calendar_recurrence.py", line 435, in _get_ranges
    starts = self._get_occurrences(start)
  File "/opt/odoo/auto/addons/calendar/models/calendar_recurrence.py", line 450, in _get_occurrences
    return self._get_rrule(dtstart=dtstart)
  File "/opt/odoo/auto/addons/calendar/models/calendar_recurrence.py", line 530, in _get_rrule
    freq_to_rrule(freq), **rrule_params
  File "/opt/odoo/auto/addons/calendar/models/calendar_recurrence.py", line 85, in freq_to_rrule
    return SELECT_FREQ_TO_RRULE[freq]
Exception

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "/opt/odoo/custom/src/odoo/odoo/http.py", line 654, in _handle_exception
    return super(JsonRequest, self)._handle_exception(exception)
  File "/opt/odoo/custom/src/odoo/odoo/http.py", line 301, in _handle_exception
    raise exception.with_traceback(None) from new_cause
KeyError: False

pedrobaeza

And please change the steps to reproduce the problem (both in the main PR message and in the commit message) with the real use case.

addons/calendar/models/calendar_event.py

CarlosRoca13 · 2024-01-15T12:02:02Z

Changes done @pedrobaeza

arj-odoo

Hello, thanks for these changes. Could you add a small test to make sure the issue is not coming back ? It will improve our codebase. Thanks a lot. :-)

CarlosRoca13 · 2024-01-15T16:37:37Z

@arj-odoo test added 😄

arj-odoo · 2024-01-16T07:50:54Z

addons/calendar/tests/test_event_recurrence.py

+class TestUpdateMultiDayWeeklyDayNotIncludedRecurrentEvents(TestRecurrentEvents):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.event = cls.env['calendar.event'].create({
+            'name': 'Recurrent Event',
+            'start': datetime(2019, 10, 22, 1, 0),
+            'stop': datetime(2019, 10, 22, 2, 0),
+            'recurrency': True,
+            'rrule_type': 'weekly',
+            'tue': False,
+            'wed': True,
+            'fri': True,
+            'interval': 1,
+            'count': 3,
+            'event_tz': 'Etc/GMT-4',
+        })
+        cls.recurrence = cls.env['calendar.recurrence'].search([])
+        cls.events = cls.recurrence.calendar_event_ids.sorted('start')
+        # Tuesday datetime(2019, 10, 22, 1, 0)
+        # Wednesday datetime(2019, 10, 23, 1, 0)
+        # Friday datetime(2019, 10, 25, 1, 0)
+        # Wednesday datetime(2019, 10, 30, 1, 0)


Why are you adding a new test class ? The setup will be heavy for just one single test. You can do everything in the current class. Your test coould be in the class TestUpdateRecurrentEvents. Thanks :-)

arj-odoo · 2024-01-16T07:51:59Z

addons/calendar/models/calendar_event.py

+        if values.get("active") is False:
+            recurrences = self.env["calendar.recurrence"].search([
+                ('base_event_id', 'in', self.ids)
+            ])
+            recurrences._select_new_base_event()


Your change is working but I am afraid of the performances with a large amount of events. I hope it won't be too slow and rollback 🤔

For this PR I have used the same philosophy that has been used for the unlink method. So I understand that there will be the same doubt for that method…

odoo/addons/calendar/models/calendar_event.py

Lines 585 to 592 in 7778644

recurrences = self.env["calendar.recurrence"].search([

('base_event_id.id', 'in', [e.id for e in self])

])

result = super().unlink()

if recurrences:

recurrences._select_new_base_event()

Anyway, the scope is limited to when you archive an event, so the impact is also very limited.

arj-odoo · 2024-01-18T14:54:34Z

@robodoo r+

robodoo · 2024-01-18T19:57:41Z

@CarlosRoca13 @arj-odoo staging failed: ci/runbot on 2cccbdeb2f28e3439cc0669109012d8d471f8b70 (view more at https://runbot.odoo.com/runbot/build/56671293)

CarlosRoca13 · 2024-05-15T08:33:45Z

Something has failed when trying to set this changes @arj-odoo

arj-odoo · 2024-05-15T08:38:19Z

Something has failed when trying to set this changes @arj-odoo

Can you rebase the code? I lost this one in the process, sorry /o\

When the base event is archived, it continues being the base event of the recurrence, and when trying to change the recurrence of all the events of the recurrence, an error is thrown or some inconsistencies occur. To test the problem, you can follow these steps: 1. Create a recurrence of events from a non included day on the recurrence (example: recurrence on tuesday and friday and the start of the recurrence on monday). The first event will be archived automatically. 2. Open other event of the recurrence. 3. Modify the recurrence for all events (example: change the weekdays, set just tuesday instead of tuesday and friday) An error will be thrown. By making these changes, the base event will be updated, as indicated in the _select_new_base_event method, so these inconsistencies will not occur when making the changes.

CarlosRoca13 · 2024-05-15T08:52:34Z

Done @arj-odoo

arj-odoo · 2024-05-15T12:48:59Z

@robodoo r+

When the base event is archived, it continues being the base event of the recurrence, and when trying to change the recurrence of all the events of the recurrence, an error is thrown or some inconsistencies occur. To test the problem, you can follow these steps: 1. Create a recurrence of events from a non included day on the recurrence (example: recurrence on tuesday and friday and the start of the recurrence on monday). The first event will be archived automatically. 2. Open other event of the recurrence. 3. Modify the recurrence for all events (example: change the weekdays, set just tuesday instead of tuesday and friday) An error will be thrown. By making these changes, the base event will be updated, as indicated in the _select_new_base_event method, so these inconsistencies will not occur when making the changes. closes #149349 Signed-off-by: Arnaud Joset (arj) <arj@odoo.com>

CarlosRoca13 force-pushed the 15.0-FIX-calendar branch 2 times, most recently from f441349 to 8f7b3a1 Compare January 15, 2024 07:46

C3POdoo requested a review from a team January 15, 2024 07:48

pedrobaeza reviewed Jan 15, 2024

View reviewed changes

addons/calendar/models/calendar_event.py Outdated Show resolved Hide resolved

CarlosRoca13 force-pushed the 15.0-FIX-calendar branch from 8f7b3a1 to d8b8847 Compare January 15, 2024 11:40

pedrobaeza reviewed Jan 15, 2024

View reviewed changes

addons/calendar/models/calendar_event.py Outdated Show resolved Hide resolved

pedrobaeza reviewed Jan 15, 2024

View reviewed changes

addons/calendar/models/calendar_event.py Outdated Show resolved Hide resolved

CarlosRoca13 force-pushed the 15.0-FIX-calendar branch from d8b8847 to 744cac9 Compare January 15, 2024 12:00

pedrobaeza approved these changes Jan 15, 2024

View reviewed changes

arj-odoo requested changes Jan 15, 2024

View reviewed changes

CarlosRoca13 force-pushed the 15.0-FIX-calendar branch from 744cac9 to 1d4f89e Compare January 15, 2024 16:36

arj-odoo reviewed Jan 16, 2024

View reviewed changes

CarlosRoca13 force-pushed the 15.0-FIX-calendar branch from 1d4f89e to c134a8a Compare January 18, 2024 07:06

CarlosRoca13 force-pushed the 15.0-FIX-calendar branch from c134a8a to 20d96b5 Compare May 15, 2024 08:48

CarlosRoca13 force-pushed the 15.0-FIX-calendar branch from 20d96b5 to 34873de Compare May 15, 2024 08:51

robodoo temporarily deployed to merge May 15, 2024 14:24 Inactive

robodoo closed this May 15, 2024

This was referenced May 15, 2024

[FW][15.0][FIX] calendar: Select correct base event when current is archived #165636

Open

[FW][15.0][FIX] calendar: Select correct base event when current is archived #165659

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[15.0][FIX] calendar: Select correct base event when current is archived #149349

[15.0][FIX] calendar: Select correct base event when current is archived #149349

CarlosRoca13 commented Jan 15, 2024 •

edited

robodoo commented Jan 15, 2024

pedrobaeza commented Jan 15, 2024

CarlosRoca13 commented Jan 15, 2024

pedrobaeza left a comment

CarlosRoca13 commented Jan 15, 2024

arj-odoo left a comment

CarlosRoca13 commented Jan 15, 2024

arj-odoo Jan 16, 2024

arj-odoo Jan 16, 2024

CarlosRoca13 Jan 18, 2024 •

edited

pedrobaeza Jan 18, 2024

arj-odoo commented Jan 18, 2024

robodoo commented Jan 18, 2024

CarlosRoca13 commented May 15, 2024

arj-odoo commented May 15, 2024

CarlosRoca13 commented May 15, 2024

arj-odoo commented May 15, 2024

	recurrences = self.env["calendar.recurrence"].search([
	('base_event_id.id', 'in', [e.id for e in self])
	])

	result = super().unlink()

	if recurrences:
	recurrences._select_new_base_event()

[15.0][FIX] calendar: Select correct base event when current is archived #149349

[15.0][FIX] calendar: Select correct base event when current is archived #149349

Conversation

CarlosRoca13 commented Jan 15, 2024 • edited

robodoo commented Jan 15, 2024

pedrobaeza commented Jan 15, 2024

CarlosRoca13 commented Jan 15, 2024

pedrobaeza left a comment

Choose a reason for hiding this comment

CarlosRoca13 commented Jan 15, 2024

arj-odoo left a comment

Choose a reason for hiding this comment

CarlosRoca13 commented Jan 15, 2024

arj-odoo Jan 16, 2024

Choose a reason for hiding this comment

arj-odoo Jan 16, 2024

Choose a reason for hiding this comment

CarlosRoca13 Jan 18, 2024 • edited

Choose a reason for hiding this comment

pedrobaeza Jan 18, 2024

Choose a reason for hiding this comment

arj-odoo commented Jan 18, 2024

robodoo commented Jan 18, 2024

CarlosRoca13 commented May 15, 2024

arj-odoo commented May 15, 2024

CarlosRoca13 commented May 15, 2024

arj-odoo commented May 15, 2024

CarlosRoca13 commented Jan 15, 2024 •

edited

CarlosRoca13 Jan 18, 2024 •

edited