[REF] estate: Refactor based on guidelines and feedbacks

- Model description
- Error messages
- Views group
- Default data type
- Simplify conditional check

Author: nguyenntph

estate/models/estate_property.py

@@ -5,7 +5,7 @@
 
 class EstateProperty(models.Model):
     _name = 'estate.property'
-    _description = 'All properties'
+    _description = 'Estate Properties'
     _order = 'id desc'
 
     name = fields.Char(required=True)
@@ -79,16 +79,15 @@ def _compute_total_area(self):
     @api.depends('offer_ids')
     def _compute_best_price(self):
         for record in self:
-            offers = record.offer_ids or []
-            record.best_price = max(offers.mapped('price')) if len(offers) else 0
+            record.best_price = max(record.offer_ids.mapped('price'), default=0.0)
 
     @api.onchange('garden')
     def _onchange_garden(self):
         if self.garden:
             self.garden_area = 10
             self.garden_orientation = 'north'
         else:
-            self.garden_area = None
+            self.garden_area = 0
             self.garden_orientation = None
 
     @api.constrains('selling_price', 'expected_price')
@@ -109,13 +108,13 @@ def _unlink_if_new_or_cancelled(self):
     def action_mark_as_sold(self):
         for record in self:
             if record.state == 'cancelled':
-                raise UserError('Property is already cancelled')
+                raise UserError('Cannot sell cancelled properties')
 
             record.state = 'sold'
 
     def action_mark_as_cancelled(self):
         for record in self:
             if record.state == 'sold':
-                raise UserError('Property is already sold')
+                raise UserError('Cannot cancel sold properties')
 
             record.state = 'cancelled'

estate/models/estate_property_offer.py

@@ -4,7 +4,7 @@
 
 class EstatePropertyOffer(models.Model):
     _name = 'estate.property.offer'
-    _description = 'All offers'
+    _description = 'Estate Offers'
     _order = 'price desc'
 
     price = fields.Float(required=True)
@@ -18,7 +18,7 @@ class EstatePropertyOffer(models.Model):
     partner_id = fields.Many2one('res.partner', string='Partner')
     property_id = fields.Many2one('estate.property', string='Property')
     validity = fields.Integer(default=7)
-    date_deadline = fields.Date(compute='_compute_deadline', inverse="_inverse_deadline")
+    date_deadline = fields.Date(compute='_compute_date_deadline', inverse="_inverse_date_deadline")
     property_type_id = fields.Many2one(related="property_id.property_type_id", store=True)
 
     _check_price = models.Constraint(
@@ -27,13 +27,18 @@ class EstatePropertyOffer(models.Model):
     )
 
     @api.depends('create_date', 'validity')
-    def _compute_deadline(self):
+    def _compute_date_deadline(self):
         for record in self:
             created_date = record.create_date or fields.Date.today()
             record.date_deadline = fields.Date.add(
                 created_date, days=record.validity,
             )
 
+    def _inverse_date_deadline(self):
+        for record in self:
+            created_date = record.create_date.date() or fields.Date.today()
+            record.validity = (record.date_deadline - created_date).days
+
     @api.model
     def create(self, val_lists):
         for vals in val_lists:
@@ -44,16 +49,10 @@ def create(self, val_lists):
             linked_property.state = 'offer_received'
         return super().create(val_lists)
 
-    def _inverse_deadline(self):
-        for record in self:
-            created_date = record.create_date.date() or fields.Date.today()
-            record.validity = (record.date_deadline - created_date).days
-
     def action_mark_as_accepted(self):
         for record in self:
             if (
-                record.property_id.state != 'new'
-                and record.property_id.state != 'offer_received'
+                record.property_id.state not in ('new', 'offer_received')
             ):
                 raise UserError('Cannot accept offer in this state')
 
@@ -66,6 +65,6 @@ def action_mark_as_refused(self):
         for record in self:
             if record.status == 'accepted':
                 record.property_id.state = 'offer_received'
-                record.property_id.selling_price = None
+                record.property_id.selling_price = 0.0
                 record.property_id.buyer_id = None
             record.status = 'refused'

estate/models/estate_property_tag.py

@@ -3,7 +3,7 @@
 
 class EstatePropertyTag(models.Model):
     _name = 'estate.property.tag'
-    _description = 'All property tags'
+    _description = 'Estate Property Tags'
     _order = 'name asc'
 
     name = fields.Char(required=True)

estate/models/estate_property_type.py

@@ -3,7 +3,7 @@
 
 class EstatePropertyType(models.Model):
     _name = 'estate.property.type'
-    _description = 'All property types'
+    _description = 'Estate Property Types'
     _order = 'name asc'
 
     name = fields.Char(required=True)

estate/views/estate_property_offer_views.xml

@@ -45,24 +45,12 @@
             <form string="Property Offer">
                 <sheet>
                     <group>
-                        <group>
-                            <field name="property_id"/>
-                        </group>
-                        <group>
-                            <field name="partner_id"/>
-                        </group>
-                        <group>
-                            <field name="price"/>
-                        </group>
-                        <group>
-                            <field name="status"/>
-                        </group>
-                        <group>
-                            <field name="validity" string="Validity (days)"/>
-                        </group>
-                        <group>
-                            <field name="date_deadline" string="Deadline"/>
-                        </group>
+                        <field name="property_id"/>
+                        <field name="partner_id"/>
+                        <field name="price"/>
+                        <field name="status"/>
+                        <field name="validity" string="Validity (days)"/>
+                        <field name="date_deadline" string="Deadline"/>
                     </group>
                 </sheet>
             </form>

estate/views/estate_property_tag_views.xml

@@ -24,8 +24,6 @@
                 <sheet>
                     <group>
                         <field name="name"/>
-                    </group>
-                    <group>
                         <field name="color" widget="color_picker"/>
                     </group>
                 </sheet>

estate/views/estate_property_views.xml

@@ -135,7 +135,7 @@
 
                 <separator/>
 
-                <filter string="Available" name="available" domain="['|', ('state', '=', 'new'), ('state', '=', 'offer_received')]"/>
+                <filter string="Available" name="available" domain="[('state', 'in', ('new', 'offer_recevied'))]"/>
                 <filter string="Postcode" name="postcode" context="{'group_by':'postcode'}"/>
             </search>
         </field>