optimize searcher/sort, add search/sort to balance_ref

This commit is contained in:
Frederik Jaeckel 2023-12-29 14:51:39 +01:00
parent 5d8f924960
commit 5ef3a52fdc
6 changed files with 272 additions and 21 deletions

View file

@ -307,6 +307,10 @@ class BookTestCase(object):
Book.search_count([('balance_all', '<', Decimal('5.0'))]),
0)
self.assertEqual(
Book.search_count([('balance_ref', '<', Decimal('5.0'))]),
0)
@with_transaction()
def test_book_deny_btype_set_none(self):
""" create cashbook, add lines,

View file

@ -539,6 +539,194 @@ class ValuestoreTestCase(object):
values[8].rec_name,
'[Lev 0/Lev 1b | 0.00 € | Open]|balance_ref|0.00|2')
@with_transaction()
def test_valstore_search_sort_books(self):
""" create cashbooks add lines, search/sort
with and w/o 'date' in context
"""
pool = Pool()
Book = pool.get('cashbook.book')
Line = pool.get('cashbook.line')
types = self.prep_type()
company = self.prep_company()
(usd, euro) = self.prep_2nd_currency(company)
self.assertEqual(company.currency.rec_name, 'Euro')
with Transaction().set_context({'company': company.id}):
category = self.prep_category(cattype='in')
party = self.prep_party()
books = Book.create([{
'name': 'Cashbook 1',
'btype': types.id,
'company': company.id,
'currency': usd.id,
'number_sequ': self.prep_sequence().id,
'start_date': date(2022, 5, 1),
'lines': [('create', [{
'date': date(2022, 5, 1),
'description': '10 US$',
'category': category.id,
'bookingtype': 'in',
'amount': Decimal('10.0'),
'party': party.id,
}])]}, {
'name': 'Cashbook 2',
'btype': types.id,
'company': company.id,
'currency': euro.id,
'number_sequ': self.prep_sequence().id,
'start_date': date(2022, 5, 1),
}, {
'name': 'Cashbook 3',
'btype': types.id,
'company': company.id,
'currency': euro.id,
'number_sequ': self.prep_sequence().id,
'start_date': date(2022, 5, 1),
}])
self.assertEqual(len(books), 3)
self.assertEqual(books[0].rec_name, 'Cashbook 1 | 10.00 usd | Open')
self.assertEqual(books[1].rec_name, 'Cashbook 2 | 0.00 € | Open')
self.assertEqual(books[2].rec_name, 'Cashbook 3 | 0.00 € | Open')
Line.create([{
'cashbook': books[1].id,
'bookingtype': 'in',
'amount': Decimal('5.0'),
'date': date(2022, 5, 6),
'description': '5€ in',
'category': category.id,
}, {
'cashbook': books[2].id,
'bookingtype': 'in',
'amount': Decimal('6.0'),
'date': date(2022, 5, 7),
'description': '6€ in',
'category': category.id,
}])
# no 'date' in context, using stored values
# workers not yet processed
books = Book.search([], order=[('name', 'ASC')])
self.assertEqual(len(books), 3)
self.assertEqual(books[0].rec_name, 'Cashbook 1 | 10.00 usd | Open')
self.assertEqual(books[1].rec_name, 'Cashbook 2 | 0.00 € | Open')
self.assertEqual(books[2].rec_name, 'Cashbook 3 | 0.00 € | Open')
self.assertEqual(
Book.search_count([('balance', '=', Decimal('0.0'))]),
2)
self.assertEqual(
Book.search_count([('balance_all', '=', Decimal('0.0'))]),
2)
self.assertEqual(
Book.search_count([('balance_ref', '=', Decimal('0.0'))]),
2)
# check sorting - using stored values
books = Book.search([], order=[
('balance_all', 'DESC'), ('name', 'ASC')])
self.assertEqual(len(books), 3)
self.assertEqual(books[0].rec_name, 'Cashbook 1 | 10.00 usd | Open')
self.assertEqual(books[1].rec_name, 'Cashbook 2 | 0.00 € | Open')
self.assertEqual(books[2].rec_name, 'Cashbook 3 | 0.00 € | Open')
# search again with 'date' - using computed values
with Transaction().set_context({'date': date(2022, 5, 6)}):
self.assertEqual(
Book.search_count([('balance', '=', Decimal('5.0'))]),
1)
self.assertEqual(
Book.search_count([
('balance', '>=', Decimal('5.0')),
('balance', '<', Decimal('9.0')),
]),
1)
self.assertEqual(
Book.search_count([
('balance_all', '>=', Decimal('5.0'))]),
3)
self.assertRaisesRegex(
UserError,
"Search with 'date' no allowed for field " +
"'balance_ref' on model 'cashbook.book'.",
Book.search_count,
[('balance_ref', '=', Decimal('0.0'))])
self.assertRaisesRegex(
UserError,
"Search with 'date' no allowed for field " +
"'balance_ref' on model 'cashbook.book'.",
Book.search,
[], order=[('balance_ref', 'ASC')])
# check sorting - using computed values
books = Book.search([], order=[
('balance_all', 'DESC'),
('name', 'ASC'),
('balance', 'ASC')])
self.assertEqual(len(books), 3)
self.assertEqual(
books[0].rec_name, 'Cashbook 1 | 10.00 usd | Open')
self.assertEqual(
books[1].rec_name, 'Cashbook 3 | 0.00 € | Open')
self.assertEqual(books[1].balance_all, Decimal('6.0'))
self.assertEqual(
books[2].rec_name, 'Cashbook 2 | 5.00 € | Open')
with Transaction().set_context({'date': date(2022, 5, 7)}):
self.assertEqual(
Book.search_count([('balance', '=', Decimal('5.0'))]),
1)
self.assertEqual(
Book.search_count([
('balance', '>=', Decimal('5.0')),
('balance', '<', Decimal('9.0')),
]),
2)
# run workers
self.prep_valstore_run_worker()
# check stored values - no 'date' in context
books = Book.search([], order=[('name', 'ASC')])
self.assertEqual(len(books), 3)
self.assertEqual(books[0].rec_name, 'Cashbook 1 | 10.00 usd | Open')
self.assertEqual(books[1].rec_name, 'Cashbook 2 | 5.00 € | Open')
self.assertEqual(books[2].rec_name, 'Cashbook 3 | 6.00 € | Open')
# check sorting - using stored values
# run most sorters
books = Book.search([], order=[
('balance_all', 'DESC'),
('name', 'ASC'),
('balance', 'ASC'),
('balance_ref', 'ASC')])
self.assertEqual(len(books), 3)
self.assertEqual(books[0].rec_name, 'Cashbook 1 | 10.00 usd | Open')
self.assertEqual(books[1].rec_name, 'Cashbook 3 | 6.00 € | Open')
self.assertEqual(books[2].rec_name, 'Cashbook 2 | 5.00 € | Open')
self.assertEqual(
Book.search_count([('balance', '=', Decimal('0.0'))]),
0)
self.assertEqual(
Book.search_count([('balance', '=', Decimal('5.0'))]),
1)
self.assertEqual(
Book.search_count([('balance', '=', Decimal('6.0'))]),
1)
self.assertEqual(
Book.search_count([
('balance', '>=', Decimal('5.0')),
('balance', '<', Decimal('9.0')),
]),
2)
self.assertEqual(
Book.search_count([('balance_ref', '=', Decimal('6.0'))]),
1)
@with_transaction()
def test_valstore_maintain_values(self):
""" create cashbook, check maintenance -