Fix merge conflict in http_controller.py

Author: John75SunCity

records_management/controllers/http_controller.py

@@ -8,25 +8,10 @@
 INVENTORY_PAGE_LIMIT = 100  # Limit for scalability
 
 class MyController(http.Controller):
-<<<<<<< HEAD
     """
     Controller for managing inventory-related HTTP requests.
     """
 
-    def _get_partner_inventory(self, partner):
-        """
-        Fetch inventory items associated with the given partner.
-        Args:
-            partner: res.partner record.
-        Returns:
-            Recordset of stock.quant matching the criteria.
-        """
-        serials = http.request.env['stock.production.lot'].search([(CUSTOMER_FIELD, '=', partner.id)])
-        return http.request.env['stock.quant'].search([
-            ('lot_id', 'in', serials.ids),
-            ('location_id.usage', '=', INTERNAL_USAGE)
-        ])
-=======
     def _get_current_user(self):
         """
         Helper to get the current Odoo user.
@@ -66,12 +51,6 @@ def _get_partner_inventory(self, partner, limit=INVENTORY_PAGE_LIMIT):
             limit (int): Max number of records to return.
         Returns:
             stock.quant recordset.
-        Example:
-            >>> self._get_partner_inventory(partner)
-            stock.quant(1, 2, 3)
-        Edge Cases:
-            - Partner has no inventory: returns empty recordset.
-            - Large inventory: returns only up to 'limit' records.
         """
         try:
             serials = http.request.env['stock.production.lot'].search([(CUSTOMER_FIELD, '=', partner.id)])
@@ -95,13 +74,6 @@ def _parse_item_ids(self, form):
             form: werkzeug.form object.
         Returns:
             List of item_ids as integers, or None if parsing fails.
-        Example:
-            >>> self._parse_item_ids(form)
-            [1, 2, 3]
-        Edge Cases:
-            - No item_ids: returns None.
-            - Non-integer values: returns None.
-            - Duplicates: returns unique integers.
         """
         item_ids = form.getlist('item_ids')
         if not item_ids:
@@ -121,41 +93,10 @@ def _parse_item_ids(self, form):
         except Exception as e:
             _logger.error("Error parsing item_ids: %s. Data: %s", e, item_ids)
             return None
->>>>>>> 46620db (Update: latest changes)
-
-    def _parse_item_ids(self, form):
-        """
-        Helper to safely parse item_ids from form data.
-        Args:
-            form: werkzeug.form object.
-        Returns:
-            List of item_ids as integers, or None if parsing fails.
-        """
-        try:
-            return [int(id) for id in form.getlist('item_ids')]
-        except (ValueError, TypeError):
-            return None
 
     @http.route('/my/inventory/request_pickup', type='http', auth='user', methods=['POST'], csrf=True)
     def request_pickup(self, **kw):
         """
-<<<<<<< HEAD
-        Handle inventory pickup requests for logged-in users.
-        """
-        user = http.request.env.user
-        partner = user.partner_id
-        _logger.info('Inventory accessed by partner ID %s', partner.id)
-
-        item_ids = self._parse_item_ids(http.request.httprequest.form)
-        if not item_ids:
-            _logger.warning("User ID: %s provided invalid item_ids: %s", user.id, http.request.httprequest.form.getlist('item_ids'))
-            # Redirect with error and user friendly message
-            return http.request.redirect('/my/inventory?error=invalid_item_ids&message=Please+provide+valid+item+IDs.')
-
-        _logger.info('Pickup requested for items %s by partner ID %s', item_ids, partner.id)
-        # ...existing pickup processing code should be placed here...
-        return http.request.redirect('/my/inventory?success=pickup_requested')
-=======
         Handle pickup requests for inventory items.
         Enhanced logging, error handling, and user feedback.
         """
@@ -164,49 +105,20 @@ def request_pickup(self, **kw):
         _logger.info('Pickup request initiated by user %s (ID: %s), partner %s', user.login, user.id, partner.id)
         item_ids = self._parse_item_ids(http.request.httprequest.form)
         if item_ids is None:
-            error_msg = (
-                "Invalid item selection. Please select valid inventory items. "
-                "If the problem persists, contact support."
-            )
             _logger.warning("User %s (ID: %s) provided invalid item_ids: %s", user.login, user.id, http.request.httprequest.form.getlist('item_ids'))
             return http.request.redirect('/my/inventory?error=invalid_item_ids')
         try:
             # ...existing code for processing pickup...
             _logger.info('Pickup requested for items %s by partner %s', item_ids, partner.id)
             # On success:
-            success_msg = "Pickup request submitted successfully for selected items."
             return http.request.redirect('/my/inventory?success=pickup_requested')
         except Exception as e:
             _logger.error("Error processing pickup request for user %s: %s", user.login, e)
-            error_msg = (
-                "An error occurred while processing your pickup request. "
-                "Please try again later or contact support."
-            )
             return http.request.redirect('/my/inventory?error=pickup_failed')
->>>>>>> 46620db (Update: latest changes)
 
     @http.route('/my/inventory', type='http', auth='user', website=True, methods=['GET'], csrf=True)
     def my_inventory(self, **kw):
         """
-<<<<<<< HEAD
-        Display inventory relevant to the logged-in user.
-        """
-        user = http.request.env.user
-        partner = user.partner_id
-        quants = self._get_partner_inventory(partner)
-
-        # Show error message from query parameters if present
-        error = http.request.params.get('error')
-        message = http.request.params.get('message', '')
-        success = http.request.params.get('success')
-        if error:
-            message = message or 'There was a problem with your request.'
-        elif not quants:
-            message = 'No inventory items found. Please contact support if this issue persists.'
-        elif success:
-            message = 'Your pickup request has been submitted.'
-
-=======
         Render the inventory page for the current user.
         Enhanced with pagination, user-friendly messages, and tooltips.
         """
@@ -224,23 +136,17 @@ def my_inventory(self, **kw):
         if not quants:
             message_ctx['message'] = 'No inventory items found. If you believe this is an error, please contact support.'
             message_ctx['message_type'] = 'info'
-        # Add tooltips/explanations for inventory actions
         inventory_tooltips = {
             'pickup': 'Request pickup for selected inventory items. Only available for items in internal locations.'
         }
->>>>>>> 46620db (Update: latest changes)
         return http.request.render(
             'records_management.inventory_template',
             {
                 'quants': quants,
-<<<<<<< HEAD
-                'message': message
-=======
                 'message': message_ctx['message'],
                 'message_type': message_ctx['message_type'],
                 'tooltips': inventory_tooltips,
                 'page_limit': INVENTORY_PAGE_LIMIT,
->>>>>>> 46620db (Update: latest changes)
             }
         )