[CLN] estate{_account}: applied suggested review comments

Author: Mohamed-Khaled308

estate/models/__init__.py

@@ -1,5 +1,5 @@
 from . import estate_property
-from . import estate_property_type
-from . import estate_property_tag
 from . import estate_property_offer
+from . import estate_property_tag
+from . import estate_property_type
 from . import res_users

estate/models/estate_property.py

@@ -1,5 +1,6 @@
 from dateutil.relativedelta import relativedelta
-from odoo import api, models, fields
+
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 from odoo.tools.float_utils import float_compare, float_is_zero
 
@@ -12,7 +13,9 @@ class EstateProperty(models.Model):
     name = fields.Char(required=True)
     description = fields.Text()
     postcode = fields.Char()
-    date_availability = fields.Date(copy=False, default=fields.Date.today() + relativedelta(months=+3))
+    date_availability = fields.Date(
+        copy=False, default=fields.Date.today() + relativedelta(months=+3)
+    )
     expected_price = fields.Float(required=True, default=1)
     selling_price = fields.Float(readonly=True, copy=False)
     bedrooms = fields.Integer(default=2)
@@ -22,78 +25,91 @@ class EstateProperty(models.Model):
     garden = fields.Boolean()
     garden_area = fields.Integer()
     garden_orientation = fields.Selection(
-        selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]
+        selection=[
+            ("north", "North"),
+            ("south", "South"),
+            ("east", "East"),
+            ("west", "West"),
+        ]
     )
     active = fields.Boolean(default=True)
     state = fields.Selection(
         selection=[
-            ('new', 'New'),
-            ('offer_received', 'Offer Received'),
-            ('offer_accepted', 'Offer Accepted'),
-            ('sold', 'Sold'),
-            ('cancelled', 'Cancelled')
+            ("new", "New"),
+            ("offer_received", "Offer Received"),
+            ("offer_accepted", "Offer Accepted"),
+            ("sold", "Sold"),
+            ("cancelled", "Cancelled"),
         ],
         required=True,
         copy=False,
-        default='new'
+        default="new",
     )
     property_type_id = fields.Many2one("estate.property.type", string="Property Type")
     buyer_id = fields.Many2one("res.partner", copy=False)
     salesperson_id = fields.Many2one("res.users", default=lambda self: self.env.user)
     property_tag_ids = fields.Many2many("estate.property.tag", string="Propert Tags")
-    offer_ids = fields.One2many('estate.property.offer', 'property_id', string="Offers")
-
+    offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers")
     total_area = fields.Float(compute="_compute_total_area")
     best_price = fields.Float(compute="_compute_best_price")
-
-    _positive_expected_price = models.Constraint(
-        'CHECK(expected_price > 0)',
-        'The Expected Price of a Property must be strictly positive'
+    _check_positive_expected_price = models.Constraint(
+        "CHECK(expected_price > 0)",
+        "The Expected Price of a Property must be strictly positive",
     )
-
-    _positive_selling_price = models.Constraint(
-        'CHECK(selling_price > 0)',
-        'The Selling Price of a Property must be strictly positive'
+    _check_positive_selling_price = models.Constraint(
+        "CHECK(selling_price > 0)",
+        "The Selling Price of a Property must be strictly positive",
     )
 
-    @api.constrains('expected_price', 'selling_price')
+    @api.constrains("expected_price", "selling_price")
     def _check_selling_price(self):
-        for prop in self:
-            percentage = prop.selling_price / prop.expected_price
-            if not float_is_zero(prop.selling_price, precision_digits=2) \
-                    and float_compare(percentage, 0.9, precision_digits=2) == -1:
-                raise UserError("selling price cannot be lower than 90% of the expected price")
+        for property in self:
+            percentage = property.selling_price / property.expected_price
+            if (
+                not float_is_zero(property.selling_price, precision_digits=2)
+                and float_compare(percentage, 0.9, precision_digits=2) == -1
+            ):
+                raise UserError(
+                    "selling price cannot be lower than 90% of the expected price"
+                )
 
-    @api.depends('living_area', 'garden_area')
+    @api.depends("living_area", "garden_area")
     def _compute_total_area(self):
-        for prop in self:
-            prop.total_area = prop.living_area + prop.garden_area
+        self.ensure_one()
+        for property in self:
+            property.total_area = property.living_area + property.garden_area
 
-    @api.depends('offer_ids')
+    @api.depends("offer_ids")
     def _compute_best_price(self):
-        for prop in self:
-            prop.best_price = max(prop.offer_ids.mapped('price') or [0])
+        self.ensure_one()
+        for property in self:
+            property.best_price = max(property.offer_ids.mapped("price") or [0])
 
-    @api.onchange('garden')
+    @api.onchange("garden")
     def _onchange_garden(self):
         self.garden_area = 10 if self.garden else 0
-        self.garden_orientation = 'north' if self.garden else ''
+        self.garden_orientation = "north" if self.garden else ""
 
     @api.ondelete(at_uninstall=False)
     def _unlink_if_new_or_cancelled_state(self):
-        if any(not (prop.state == 'new' or prop.state == 'cancelled') for prop in self):
+        if any(
+            not (property.state == "new" or property.state == "cancelled")
+            for property in self
+        ):
             raise UserError("You can only delete new or cancelled properties")
 
     def action_sold(self):
-        for prop in self:
-            if prop.state == "cancelled":
+        self.ensure_one()
+        for property in self:
+            if property.state == "cancelled":
                 raise UserError("You cannot sell a cancelled property")
-            prop.state = "sold"
+            property.state = "sold"
         return True
 
     def action_cancel(self):
-        for prop in self:
-            if prop.state == "sold":
+        self.ensure_one()
+        for property in self:
+            if property.state == "sold":
                 raise UserError("You cannot cancel a sold property")
-            prop.state = "cancelled"
+            property.state = "cancelled"
         return True

estate/models/estate_property_offer.py

@@ -1,5 +1,6 @@
 from dateutil.relativedelta import relativedelta
-from odoo import api, models, fields
+
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 
 
@@ -10,43 +11,56 @@ class EstatePropertyOffer(models.Model):
 
     price = fields.Float()
     status = fields.Selection(
-        selection=[('accepted', 'Accepted'), ('refused', 'Refused')],
-        copy=False
+        selection=[("accepted", "Accepted"), ("refused", "Refused")], copy=False
+    )
+    partner_id = fields.Many2one("res.partner", string="Partner", required=True)
+    property_id = fields.Many2one(
+        "estate.property", string="Property", required=True, ondelete="cascade"
     )
-    partner_id = fields.Many2one('res.partner', string="Partner", required=True)
-    property_id = fields.Many2one('estate.property', string="Property", required=True, ondelete="cascade")
     validity = fields.Integer(default=7)
-    date_deadline = fields.Date(compute="_compute_date_deadline", inverse="_inverse_date_deadline")
+    date_deadline = fields.Date(
+        compute="_compute_date_deadline", inverse="_inverse_date_deadline"
+    )
     property_state = fields.Selection(related="property_id.state")
-    property_type_id = fields.Many2one(related="property_id.property_type_id", store=True)
-
-    _positive_offer_price = models.Constraint(
-        'CHECK(price > 0)',
-        'The Offer Price must be strictly positive'
+    property_type_id = fields.Many2one(
+        related="property_id.property_type_id", store=True
+    )
+    _check_positive_offer_price = models.Constraint(
+        "CHECK(price > 0)", "The Offer Price must be strictly positive"
     )
 
     @api.depends("validity", "create_date")
     def _compute_date_deadline(self):
+        self.ensure_one()
         for offer in self:
-            offer.date_deadline = (offer.create_date or fields.Date.today()) + relativedelta(days=+offer.validity)
+            offer.date_deadline = (
+                offer.create_date or fields.Date.today()
+            ) + relativedelta(days=+offer.validity)
 
     def _inverse_date_deadline(self):
+        self.ensure_one()
         for offer in self:
-            offer.validity = (offer.date_deadline - (offer.create_date or fields.Date.today()).date()).days
+            offer.validity = (
+                offer.date_deadline - (offer.create_date or fields.Date.today()).date()
+            ).days
 
     @api.model
-    def create(self, vals):
-        for offer in vals:
-            prop = self.env['estate.property'].browse(offer['property_id'])
-            prop.state = "offer_received"
-            if offer['price'] < prop.best_price:
-                raise UserError(f"The offer must be higher than {prop.best_price}")
-        return super().create(vals)
-
-    def accept_offer(self):
+    def create(self, vals_list):
+        EstateProperties = self.env["estate.property"].with_prefetch(
+            [vals["property_id"] for vals in vals_list]
+        )
+        for offer in vals_list:
+            property = EstateProperties.browse(offer["property_id"])
+            property.state = "offer_received"
+            if offer["price"] < property.best_price:
+                raise UserError(f"The offer must be higher than {property.best_price}")
+        return super().create(vals_list)
+
+    def action_accept_offer(self):
+        self.ensure_one()
         for offer in self:
-            if offer.status == 'refused':
-                raise UserError("You cann't accept a refused offer")
+            if offer.status == "refused":
+                raise UserError("You cannot accept a refused offer")
             if offer.property_id.buyer_id:
                 raise UserError("Only one offer can be accepted")
             offer.property_id.buyer_id = offer.partner_id
@@ -55,9 +69,10 @@ def accept_offer(self):
             offer.status = "accepted"
         return True
 
-    def refuse_offer(self):
+    def action_refuse_offer(self):
+        self.ensure_one()
         for offer in self:
-            if offer.status == 'accepted':
+            if offer.status == "accepted":
                 raise UserError("You cannot refuse an accepted offer")
             offer.status = "refused"
         return True

estate/models/estate_property_tag.py

@@ -1,4 +1,4 @@
-from odoo import models, fields
+from odoo import fields, models
 
 
 class EstatePropertyTag(models.Model):
@@ -8,8 +8,7 @@ class EstatePropertyTag(models.Model):
 
     name = fields.Char(required=True)
     color = fields.Integer()
-
-    _unique_name = models.Constraint(
-        'UNIQUE(name)',
-        'The name must be unique',
+    _check_unique_name = models.Constraint(
+        "UNIQUE(name)",
+        "The name must be unique",
     )

estate/models/estate_property_type.py

@@ -1,4 +1,4 @@
-from odoo import api, models, fields
+from odoo import api, fields, models
 
 
 class EstatePropertyType(models.Model):
@@ -8,13 +8,16 @@ class EstatePropertyType(models.Model):
 
     name = fields.Char(required=True)
     sequence = fields.Integer(default=1)
-    estate_property_ids = fields.One2many("estate.property", "property_type_id", string="Properties")
-    offer_ids = fields.One2many("estate.property.offer", "property_type_id", string="Offers")
+    estate_property_ids = fields.One2many(
+        "estate.property", "property_type_id", string="Properties"
+    )
+    offer_ids = fields.One2many(
+        "estate.property.offer", "property_type_id", string="Offers"
+    )
     offer_count = fields.Integer(compute="_compute_offer_count")
-
-    _unique_name = models.Constraint(
-        'UNIQUE(name)',
-        'The name must be unique',
+    _check_unique_name = models.Constraint(
+        "UNIQUE(name)",
+        "The name must be unique",
     )
 
     @api.depends("offer_ids")

estate/models/res_users.py

@@ -1,9 +1,19 @@
-from odoo import models, fields
+from odoo import fields, models
 
 
 class ResUsers(models.Model):
-    _inherit = 'res.users'
-    _description = 'user with properties model'
+    _inherit = "res.users"
+    _description = "user with properties model"
 
-    property_ids = fields.One2many('estate.property', 'salesperson_id', string='Estate Properties',
-                                   domain=['|', ('state', '=', 'new'), ('state', '=', 'offer_received')])
+    property_ids = fields.One2many(
+        "estate.property",
+        "salesperson_id",
+        string="Estate Properties",
+        domain=[
+            (
+                "state",
+                "in",
+                ["new", "offer_received"],
+            ),
+        ],
+    )

estate/views/estate_menus.xml

@@ -4,37 +4,32 @@
             id="estate_property_menu_root"
             name="Real Estate"
     />
-
     <menuitem
             id="estate_property_menu_advertisements"
             name="Advertisements"
             parent="estate_property_menu_root"
             sequence="1"
     />
-
     <menuitem
             id="estate_property_menu_properties"
             name="Properties"
             parent="estate_property_menu_advertisements"
             action="estate_property_action"
             sequence="1"
     />
-
     <menuitem
             id="estate_property_menu_settings"
             name="Settings"
             parent="estate_property_menu_root"
             sequence="2"
     />
-
     <menuitem
             id="estate_property_menu_property_type"
             name="Property Types"
             parent="estate_property_menu_settings"
             action="estate_property_type_action"
             sequence="1"
     />
-
     <menuitem
             id="estate_property_menu_property_tag"
             name="Property Tags"

estate/views/estate_property_offer_views.xml

@@ -28,10 +28,10 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="validity" string="Validity (days)"/>
                 <field name="date_deadline" string="Deadline"/>
-                <button name="accept_offer" type="object" icon="fa-check"
-                        invisible="not not status or property_state == 'offer_accepted' or property_state == 'sold' or property_state == 'cancelled'"/>
-                <button name="refuse_offer" type="object" icon="fa-close"
-                        invisible="not not status or property_state == 'offer_accepted' or property_state == 'sold' or property_state == 'cancelled'"/>
+                <button name="action_accept_offer" type="object" icon="fa-check"
+                        invisible="status or property_state in['offer_accepted', 'sold', 'cancelled']"/>
+                <button name="action_refuse_offer" type="object" icon="fa-close"
+                        invisible="status or property_state in['offer_accepted', 'sold', 'cancelled']"/>
                 <field name="property_type_id" string="Property Type"/>
             </list>
         </field>