[IMP] : add myaccount controller and improve ticket filtering based o…

…n property permissions

pms_helpdesk_mgmt/__manifest__.py

@@ -15,6 +15,7 @@
     "data": [
         "views/helpdesk_ticket_views.xml",
         "views/helpdesk_ticket_templates.xml",
+        "securitty/helpdesk_security_pms.xml",
     ],
     "demo": ["demo/helpdesk_demo.xml"],
     "assets": {

pms_helpdesk_mgmt/controllers/__init__.py

@@ -1 +1,3 @@
 from . import main
+from . import myaccount
+

pms_helpdesk_mgmt/controllers/main.py

@@ -6,13 +6,25 @@
 
 import odoo.http as http
 from odoo.http import request
-
+from odoo.exceptions import UserError, AccessError
 from odoo.addons.helpdesk_mgmt.controllers.main import HelpdeskTicketController
 
 _logger = logging.getLogger(__name__)
 
 
 class CustomHelpdeskTicketController(HelpdeskTicketController):
+    @http.route("/get_companies", type="json", auth="user")
+    def get_companies(self):
+        user = request.env.user
+        allowed_pms_property_ids = user.get_active_property_ids()
+        if allowed_pms_property_ids:
+            properties = request.env['pms.property'].sudo().browse(allowed_pms_property_ids)
+            companies = properties.mapped('company_id')
+        else:
+            companies = request.env['res.company'].sudo().search([])  # Si no hay propiedades activas, lista todas las compañías
+
+        companies_data = [{"id": company.id, "name": company.name} for company in companies]
+        return {"companies": companies_data}
     @http.route("/get_properties", type="json", auth="user")
     def get_properties(self, company_id):
         properties = (
@@ -44,10 +56,9 @@ def create_new_ticket(self, **kw):
         company = request.env.company
         tag_model = http.request.env["helpdesk.ticket.tag"]
         tags = tag_model.with_company(company.id).search([("active", "=", True)])
-        property_model = http.request.env["pms.property"]
-        properties = property_model.sudo().search(
-            [("user_ids", "in", [http.request.env.user.id])]
-        )
+        allowed_pms_property_ids = user.get_active_property_ids()
+        properties = request.env['pms.property'].sudo().browse(allowed_pms_property_ids)
+        companies = properties.mapped('company_id')
         all_room_ids = [
             room_id for property in properties for room_id in property.room_ids.ids
         ]
@@ -56,7 +67,7 @@ def create_new_ticket(self, **kw):
         response.qcontext.update(
             {
                 "user_belongs_to_group": user_belongs_to_group,
-                "companies": assigned_companies,
+                "companies": companies,
                 "properties": properties,
                 "rooms": rooms,
                 "tags": tags,
@@ -82,3 +93,5 @@ def _prepare_submit_ticket_vals(self, **kw):
             }
         )
         return vals
+
+

pms_helpdesk_mgmt/controllers/myaccount.py

@@ -0,0 +1,89 @@
+from odoo.http import request
+from odoo.addons.helpdesk_mgmt.controllers.myaccount import CustomerPortalHelpdesk
+from odoo.osv.expression import AND, OR
+from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
+from collections import OrderedDict
+from operator import itemgetter
+from odoo import _, http
+from odoo.exceptions import AccessError, MissingError
+from odoo.tools import groupby as groupbyelem
+
+
+class CustomCustomerPortalHelpdesk(CustomerPortalHelpdesk):
+    @http.route(
+        ["/my/tickets", "/my/tickets/page/<int:page>"],
+        type="http",
+        auth="user",
+        website=True,
+    )
+    def portal_my_tickets(self, **kw):
+        response = super(CustomCustomerPortalHelpdesk, self).portal_my_tickets(**kw)
+        page = response.qcontext.get('page', 1)
+        HelpdeskTicket = request.env["helpdesk.ticket"].sudo() 
+
+        # Llamamos al método del padre para obtener los valores de la vista
+        values = super(CustomCustomerPortalHelpdesk, self)._prepare_portal_layout_values()
+        if not HelpdeskTicket.check_access_rights("read", raise_exception=False):
+            return request.redirect("/my")
+
+        domain = response.qcontext.get('domain', [])
+        order = response.qcontext.get('order', '')
+        sortby = response.qcontext.get('sortby', {})
+        groupby = response.qcontext.get('groupby', '')
+
+        active_property_ids = request.env.user.get_active_property_ids() 
+        if active_property_ids:
+            domain.append(("pms_property_id", "in", active_property_ids))
+
+        HelpdeskTicket = request.env["helpdesk.ticket"].sudo() 
+        ticket_count = HelpdeskTicket.search_count(domain)
+        pager = portal_pager(
+            url="/my/tickets",
+            url_args={
+                "date_begin": response.qcontext.get('date_begin', {}),
+                "date_end": response.qcontext.get('date_end', {}),
+                "sortby": sortby,
+                "filterby": response.qcontext.get('filterby', ''),
+                "groupby": groupby,
+                "search": response.qcontext.get('search', ''),
+                "search_in": response.qcontext.get('search_in', ''),
+            },
+            total=ticket_count,
+            page=page,
+            step=self._items_per_page,
+        )
+        tickets = HelpdeskTicket.search(
+            domain,
+            order=order,
+            limit=self._items_per_page,
+            offset=pager["offset"],
+        )
+        request.session["my_tickets_history"] = tickets.ids[:100]
+
+        group = response.qcontext.get('group', None)
+        grouped_tickets = [tickets] if not group else [
+            request.env["helpdesk.ticket"].concat(*g)
+            for k, g in groupbyelem(tickets, itemgetter(group))
+        ]
+        values.update(
+            {
+                "date": response.qcontext.get('date_begin', {}),
+                "date_end": response.qcontext.get('date_end', {}),
+                "grouped_tickets": grouped_tickets,
+                "page_name": "ticket",
+                "default_url": "/my/tickets",
+                "pager": pager,
+                "searchbar_sortings": response.qcontext.get('searchbar_sortings', []),
+                "searchbar_groupby": response.qcontext.get('searchbar_groupby', []),
+                "searchbar_inputs": response.qcontext.get('searchbar_inputs', []),
+                "search_in": response.qcontext.get('search_in', ''),
+                "search": response.qcontext.get('search', ''),
+                "sortby": sortby,
+                "groupby": groupby,
+                "searchbar_filters": OrderedDict(sorted(response.qcontext.get('searchbar_filters', {}).items())),
+                "filterby": response.qcontext.get('filterby', ''),
+            }
+        )
+        return request.render("helpdesk_mgmt.portal_my_tickets", values)
+
+

pms_helpdesk_mgmt/models/helpdesk_ticket.py

@@ -11,10 +11,10 @@ class PmsHelpdeskTicket(models.Model):
     _inherit = "helpdesk.ticket"
 
     pms_property_id = fields.Many2one(
-        comodel_name="pms.property",
-        string="Property",
-        domain="[('company_id', '=', company_id)]",
-        help="The property associated with this ticket",
+        'pms.property',
+        string="PMS Property",
+        help="The property linked to this ticket.",
+        required=True,
     )
     room_id = fields.Many2one(
         comodel_name="pms.room",
@@ -24,30 +24,33 @@ class PmsHelpdeskTicket(models.Model):
         widget="many2one_tags",
     )
 
+    @api.model
+    def _get_default_pms_property(self):
+        user = self.env.user
+        active_property_ids = user.get_active_property_ids()
+        if active_property_ids:
+            return active_property_ids[0]  
+        return None
+
     @api.onchange("company_id")
     def _onchange_company_id(self):
         if self.company_id:
             allowed_pms_property_ids = self.env.user.get_active_property_ids()
+            if self.pms_property_id and self.pms_property_id.company_id != self.company_id:
+                self.pms_property_id = False
+
             return {
-                "domain": {"pms_property_id": [("id", "in", allowed_pms_property_ids)]}
+                "domain": {
+                    "pms_property_id": [
+                        ("id", "in", allowed_pms_property_ids),
+                        ("company_id", "=", self.company_id.id),
+                    ]
+                }
             }
         else:
+            self.pms_property_id = False  # Reinicia la propiedad si no hay compañía seleccionada
             return {"domain": {"pms_property_id": []}}
 
-    @api.constrains("company_id", "pms_property_id")
-    def _check_property_company_consistency(self):
-        for record in self:
-            if (
-                record.pms_property_id
-                and record.pms_property_id.company_id != record.company_id
-            ):
-                raise UserError(
-                    _(
-                        "The selected property does not belong to the selected company. "
-                        "Please select a property that belongs to the correct company."
-                    )
-                )
-
     @api.onchange("pms_property_id")
     def _onchange_property_id(self):
         if self.pms_property_id:
@@ -60,3 +63,9 @@ def _onchange_property_id(self):
             return {"domain": {"room_id": [("id", "in", room_ids)]}}
         else:
             return {"domain": {"room_id": []}}
+
+
+    def write(self, vals):
+        if 'partner_id' not in vals or not vals.get('partner_id'):
+            vals['partner_id'] = self.env.uid 
+        return super(PmsHelpdeskTicket, self).write(vals)

pms_helpdesk_mgmt/securitty/helpdesk_security_pms.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="0">
+        <record id="helpdesk_ticket_property_rule" model="ir.rule">
+            <field name="name">Helpdesk Tickets by Property</field>
+            <field ref="model_helpdesk_ticket" name="model_id" />
+            <field name="domain_force">[
+                '|', 
+                ('pms_property_id', '=', False), 
+                ('pms_property_id', 'in', user.get_active_property_ids())
+            ]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]" />
+        </record>
+        <record id="helpdesk_ticket_property_rule_portal" model="ir.rule">
+            <field name="name">Helpdesk Tickets by Property</field>
+            <field ref="model_helpdesk_ticket" name="model_id" />
+            <field name="domain_force">[
+                '|', 
+                ('pms_property_id', '=', False), 
+                ('pms_property_id', 'in', user.get_active_property_ids())
+            ]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]" />
+        </record>
+    </data>
+</odoo>

pms_helpdesk_mgmt/static/src/js/hotel_on_company.js

@@ -17,20 +17,17 @@ odoo.define("pms_helpdesk_mgmt.hotel_on_company", function (require) {
             var $propertySelect = this.$('select[name="pms_property_id"]');
 
             if (companyId) {
-                // Hacer una llamada AJAX para obtener las propiedades de la compañía seleccionada
                 this._rpc({
                     route: "/get_properties",
                     params: {
                         company_id: companyId,
                     },
                 }).then(function (result) {
-                    // Limpiar el select de propiedades
                     $propertySelect.empty();
                     $propertySelect.append(
                         '<option value="">Select a Property</option>'
                     );
 
-                    // Agregar las propiedades obtenidas al select
                     _.each(result.properties, function (property) {
                         $propertySelect.append(
                             '<option value="' +
@@ -42,7 +39,6 @@ odoo.define("pms_helpdesk_mgmt.hotel_on_company", function (require) {
                     });
                 });
             } else {
-                // Limpiar el select de propiedades si no hay compañía seleccionada
                 $propertySelect.empty();
                 $propertySelect.append('<option value="">Select a Property</option>');
             }
@@ -54,26 +50,22 @@ odoo.define("pms_helpdesk_mgmt.hotel_on_company", function (require) {
             var $roomSelect = this.$('select[name="room_id"]');
 
             if (propertyId) {
-                // Hacer una llamada AJAX para obtener las habitaciones de la propiedad seleccionada
                 this._rpc({
                     route: "/get_rooms",
                     params: {
                         property_id: propertyId,
                     },
                 }).then(function (result) {
-                    // Limpiar el select de habitaciones
                     $roomSelect.empty();
                     $roomSelect.append('<option value="">Select a Room</option>');
 
-                    // Agregar las habitaciones obtenidas al select
                     _.each(result.rooms, function (room) {
                         $roomSelect.append(
                             '<option value="' + room.id + '">' + room.name + "</option>"
                         );
                     });
                 });
             } else {
-                // Limpiar el select de habitaciones si no hay propiedad seleccionada
                 $roomSelect.empty();
                 $roomSelect.append('<option value="">Select a Room</option>');
             }