From ebddbd16489e3ca0598fdc6f9a6287377741bda2 Mon Sep 17 00:00:00 2001
From: Antoine Huret <ahuret@skilld.cloud>
Date: Tue, 11 Apr 2023 11:26:15 +0200
Subject: [PATCH] add combined criterions operators

---
 README.md | 14 ++++++++++++-
 odoo.go   | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 083726b8..7aec33df 100644
--- a/README.md
+++ b/README.md
@@ -167,7 +167,19 @@ one2many and many2many are represented by the `Relation` type and allow you to e
 
 ### Criteria and Options
 
-`Criteria` is a set of criterion and allow you to query models. [More informations](https://www.odoo.com/documentation/13.0/reference/orm.html#search-domains)
+`Criteria` is a set of Criterion and allow you to query models. [More informations](https://www.odoo.com/documentation/13.0/reference/orm.html#search-domains)
+
+#### Combined Criterions
+
+Criterions can be combined using AND (arity 2), OR (arity 2) and NOT (arity 1) operators.
+Criteria have And, Or and Not methods to be able to do such query eg:
+
+```go
+c := odoo.NewCriteria().Or(
+	odoo.NewCriterion("user_id.name", "=", "Jane Doe"),
+	odoo.NewCriterion("user_id.name", "=", "John Doe"),
+)
+```
 
 `Options` allow you to filter results.
 
diff --git a/odoo.go b/odoo.go
index 8f6cced8..c289d184 100644
--- a/odoo.go
+++ b/odoo.go
@@ -82,28 +82,74 @@ func (c *Client) Version() (Version, error) {
 	return v, nil
 }
 
-type criterion []interface{}
+type combinedCriterionOperator string
+
+const (
+	and combinedCriterionOperator = "&"
+	or                            = "|"
+	not                           = "!"
+)
+
+type Criterion []interface{}
+
+func (c *Criterion) ToInterface() []interface{} {
+	if c != nil {
+		return ([]interface{})(*c)
+	}
+	return []interface{}{}
+}
+
+type combinedCriterions struct {
+	combinedCriterionOperator
+	Criterions []*Criterion
+}
 
 /*
-Criteria is a set of criterion, each criterion is a triple (field_name, operator, value).
+Criteria is a set of Criterion, each Criterion is a triple (field_name, operator, value).
 It allow you to search models.
 see documentation: https://www.odoo.com/documentation/13.0/reference/orm.html#reference-orm-domains
 */
-type Criteria []*criterion
+type Criteria []interface{}
 
 // NewCriteria creates a new *Criteria.
 func NewCriteria() *Criteria {
 	return &Criteria{}
 }
 
-func newCriterion(field, operator string, value interface{}) *criterion {
-	c := criterion(newTuple(field, operator, value))
+func NewCriterion(field, operator string, value interface{}) *Criterion {
+	c := Criterion(newTuple(field, operator, value))
 	return &c
 }
 
-// Add a new criterion to a *Criteria.
+// Add a new Criterion to a *Criteria.
 func (c *Criteria) Add(field, operator string, value interface{}) *Criteria {
-	*c = append(*c, newCriterion(field, operator, value))
+	*c = append(*c, NewCriterion(field, operator, value).ToInterface())
+	return c
+}
+
+// Add a new Criterion to a *Criteria.
+func (c *Criteria) AddCriterion(cri *Criterion) *Criteria {
+	*c = append(*c, cri.ToInterface())
+	return c
+}
+
+func (c *Criteria) And(c1, c2 *Criterion) *Criteria {
+	return c.combinedCriterions(and, c1, c2)
+}
+
+func (c *Criteria) Or(c1, c2 *Criterion) *Criteria {
+	return c.combinedCriterions(or, c1, c2)
+}
+
+func (c *Criteria) Not(cri *Criterion) *Criteria {
+	return c.combinedCriterions(not, cri)
+}
+
+func (c *Criteria) combinedCriterions(op combinedCriterionOperator, cc ...*Criterion) *Criteria {
+	*c = append(*c, op)
+	for _, cri := range cc {
+		*c = append(*c, cri.ToInterface())
+	}
 	return c
 }