[CLN] estate: Server101 Appling PR requested changes and cleanup of the code for readability

Author: VincentJanssen-Code

estate/models/estate_property.py

@@ -1,7 +1,7 @@
 from dateutil.relativedelta import relativedelta
 from odoo import fields, models, api, exceptions
 from odoo.tools.float_utils import float_compare, float_is_zero
-from odoo.exceptions import ValidationError
+from odoo.exceptions import ValidationError, UserError
 
 
 class EstateProperty(models.Model):
@@ -12,24 +12,36 @@ class EstateProperty(models.Model):
     _positif_expected_price = models.Constraint("CHECK (expected_price > 0)", "A price can't be negatif")
     _positif_selling_price = models.Constraint("CHECK (selling_price > 0)", "A price can't be negatif")
 
-    state = fields.Selection(selection=[("New", "New"), ("Offer_Received", "Offer Received"), ("Offer_Accepted", "Offer Accepted"), ("Sold", "Sold"), ("Cancelled", "Cancelled")])
+    state = fields.Selection(selection=[
+                            ("new", "New"),
+                            ("offer_received", "Offer Received"),
+                            ("offer_accepted", "Offer Accepted"),
+                            ("sold", "Sold"),
+                            ("cancelled", "Cancelled")
+                            ], default='new')
+
     active = fields.Boolean('Active', default=True)
     name = fields.Char(required=True, default="Unkown")
     description = fields.Text()
     postcode = fields.Char()
-    date_availability = fields.Date("Available From", copy=False, default=fields.Datetime.today() + relativedelta(months=3))
-    last_seen = fields.Date("Last Seen", default=fields.Datetime.now)
+    date_availability = fields.Date("Available From", copy=False, default=lambda self: fields.Datetime.today() + relativedelta(months=3))
+    last_seen = fields.Date("Last Seen", default=lambda self: fields.Datetime.now)
     expected_price = fields.Float(required=True)
     selling_price = fields.Float(readonly=True, copy=False)
-    best_price = fields.Float(string="Best Price", compute="_get_best_price")
+    best_price = fields.Float(string="Best Price", compute="_compute_best_price")
     bedrooms = fields.Integer(default=2)
     living_area = fields.Integer()
     facades = fields.Integer()
     garage = fields.Boolean()
     garden = fields.Boolean()
     garden_area = fields.Integer()
-    garden_orientation = fields.Selection(selection=[('North', 'North'), ('South', 'South'), ('East', 'East'), ('West', 'West')])
-    total_area = fields.Float(compute="_get_total_area", string="Total Area")
+    garden_orientation = fields.Selection(selection=[
+                                        ('north', 'North'),
+                                        ('south', 'South'),
+                                        ('east', 'East'),
+                                        ('west', 'West')])
+
+    total_area = fields.Float(compute="_compute_total_area", string="Total Area")
     property_type_id = fields.Many2one("estate.property.type", string="Type")
     buyer_id = fields.Many2one("res.partner", string="Buyer")
     seller_id = fields.Many2one("res.users", default=lambda self: self.env.user, string="Seller")
@@ -38,43 +50,40 @@ class EstateProperty(models.Model):
 
     def sell_property(self):
         for record in self:
-            if (record.state == "Cancelled"):
-                raise exceptions.UserError("Can't sell cancelled property.")
-            record.state = "Sold"
+            if (record.state == "cancelled"):
+                raise UserError("Can't sell cancelled property.")
+            record.state = "sold"
             return True
 
     def cancel_property(self):
         for record in self:
-            if (record.state == "Sold"):
-                raise exceptions.UserError("Can't cancel sold property.")
-            record.state = "Cancelled"
+            if (record.state == "sold"):
+                raise UserError("Can't cancel sold property.")
+            record.state = "cancelled"
             return True
 
     @api.depends('living_area', 'garden_area')
-    def _get_total_area(self):
+    def _compute_total_area(self):
         for record in self:
             record.total_area = record.garden_area + record.living_area
 
     @api.depends('offer_ids')
-    def _get_best_price(self):
+    def _compute_best_price(self):
         for record in self:
             max: int = 0
-            if (len(record.offer_ids) == 0):
+            if (not record.offer_ids):
                 record.best_price = 0
                 continue
 
-            for offer in record.offer_ids:
-                if (offer.price >= max):
-                    max = offer.price
-                record.best_price = max
+            record.best_price = max(record.offer_ids.mapped('price'))
 
     @api.onchange("garden")
-    def _garden_pre_fill(self):
+    def _on_change_garden(self):
         self.garden_area = 10 if self.garden else 0
         self.garden_orientation = 'North' if self.garden else ''
 
     @api.constrains('selling_price', 'expected_price')
-    def _check_prices(self):
+    def _constrain_prices(self):
         for record in self:
             if float_is_zero(record.selling_price, 2):
                 continue

estate/models/estate_property_offer.py

@@ -11,33 +11,36 @@ class EstatePropertyOffer(models.Model):
     _postif_price = models.Constraint("CHECK (price > 0)", "A price can't be negatif")
 
     price = fields.Float(string="Price")
-    status = fields.Selection(copy=False, selection=[("Accepted", "Accepted"), ("Refused", "Refused")])
+    status = fields.Selection(copy=False, selection=[
+                                            ("accepted", "Accepted"),
+                                            ("refused", "Refused")])
+
     partner_id = fields.Many2one('res.partner', required=True)
     property_id = fields.Many2one('estate.property', required=True)
     validity = fields.Integer(string="Validity Duration", default=7)
-    date_deadline = fields.Date(string="Deadline", compute="_get_date_deadline", inverse="_set_date_deadline")
+    date_deadline = fields.Date(string="Deadline", compute="_compute_date_deadline", inverse="_inverse_date_deadline")
 
     def accept_offer(self):
         for record in self:
             if (record.property_id.selling_price == 0):
-                record.status = "Accepted"
+                record.status = "accepted"
                 record.property_id.buyer_id = record.partner_id
                 record.property_id.selling_price = record.price
         return True
 
     def refused_offer(self):
         for record in self:
-            record.status = "Refused"
+            record.status = "refused"
         return True
 
     @api.depends("validity")
-    def _get_date_deadline(self):
+    def _compute_date_deadline(self):
         for record in self:
             if (isinstance(record.create_date, bool)):
                 record.date_deadline = fields.Datetime.now() + relativedelta(days=record.validity)
                 return
             record.date_deadline = record.create_date + relativedelta(days=record.validity)
 
-    def _set_date_deadline(self):
+    def _inverse_date_deadline(self):
         for record in self:
             record.validity = (datetime.combine(record.date_deadline, time()) - record.create_date).days

estate/views/estate_property_views.xml

@@ -43,7 +43,7 @@
                     </group>
                     <group>
                         <group>
-                            <field name="property_type_id" options="{'no_create_edit': true}"/>
+                            <field name="property_type_id" options="{'no_create_edit': true, 'no_quick_creat':true, 'no_create':true}"/>
                             <field name="postcode"/>
                             <field name="date_availability"/>
                         </group>