fix(spp_hxl_area,spp_import_match): migrate from queue_job to job_worker

These two modules were missed in the original migration (PR #55).
- Replace queue_job dependency with job_worker in manifests
- Replace FailedJobError with UserError in spp_import_match
- Remove queue_job_data.xml (queue.job.function model not in job_worker)
- Update readme descriptions

Author: emjay0921

spp_hxl_area/README.rst

@@ -43,32 +43,32 @@ Key Capabilities
   processing → done)
 - Auto-sync indicators to ``spp.data.value`` for CEL expression access
 - Link imports to hazard incidents for disaster response tracking
-- Process imports asynchronously via queue_job
+- Process imports asynchronously via job_worker
 
 Key Models
 ~~~~~~~~~~
 
-+--------------------------------+-------------------------------------+
-| Model                          | Description                         |
-+================================+=====================================+
-| ``spp.hxl.import.profile``     | Configuration defining area         |
-|                                | matching and rules                  |
-+--------------------------------+-------------------------------------+
-| ``spp.hxl.aggregation.rule``   | Rule specifying what to aggregate   |
-|                                | and how                             |
-+--------------------------------+-------------------------------------+
-| ``spp.hxl.import.batch``       | Track one execution of profile      |
-|                                | against HXL file                    |
-+--------------------------------+-------------------------------------+
-| ``spp.hxl.import.mapping``     | Auto-detected column mapping        |
-|                                | (adjustable pre-run)                |
-+--------------------------------+-------------------------------------+
-| ``spp.hxl.area.indicator``     | Aggregated indicator value stored   |
-|                                | per area                            |
-+--------------------------------+-------------------------------------+
-| ``spp.hxl.area.import.wizard`` | Wizard for uploading files and      |
-|                                | previewing matches                  |
-+--------------------------------+-------------------------------------+
++--------------------------------+------------------------------------+
+| Model                          | Description                        |
++================================+====================================+
+| ``spp.hxl.import.profile``     | Configuration defining area        |
+|                                | matching and rules                 |
++--------------------------------+------------------------------------+
+| ``spp.hxl.aggregation.rule``   | Rule specifying what to aggregate  |
+|                                | and how                            |
++--------------------------------+------------------------------------+
+| ``spp.hxl.import.batch``       | Track one execution of profile     |
+|                                | against HXL file                   |
++--------------------------------+------------------------------------+
+| ``spp.hxl.import.mapping``     | Auto-detected column mapping       |
+|                                | (adjustable pre-run)               |
++--------------------------------+------------------------------------+
+| ``spp.hxl.area.indicator``     | Aggregated indicator value stored  |
+|                                | per area                           |
++--------------------------------+------------------------------------+
+| ``spp.hxl.area.import.wizard`` | Wizard for uploading files and     |
+|                                | previewing matches                 |
++--------------------------------+------------------------------------+
 
 Configuration
 ~~~~~~~~~~~~~
@@ -94,15 +94,13 @@ UI Location
 Security
 ~~~~~~~~
 
-+----------------------------------+-----------------------------------+
-| Group                            | Access                            |
-+==================================+===================================+
-| ``spp_security.group_spp_admin`` | Full CRUD on profiles, rules,     |
-|                                  | indicators                        |
-+----------------------------------+-----------------------------------+
-| ``base.group_user``              | Read profiles/rules; create/edit  |
-|                                  | batches                           |
-+----------------------------------+-----------------------------------+
++----------------------------------+------------------------------------------+
+| Group                            | Access                                   |
++==================================+==========================================+
+| ``spp_security.group_spp_admin`` | Full CRUD on profiles, rules, indicators |
++----------------------------------+------------------------------------------+
+| ``base.group_user``              | Read profiles/rules; create/edit batches |
++----------------------------------+------------------------------------------+
 
 Extension Points
 ~~~~~~~~~~~~~~~~
@@ -118,7 +116,7 @@ Dependencies
 ~~~~~~~~~~~~
 
 ``spp_hxl``, ``spp_area``, ``spp_cel_domain``, ``spp_hazard``,
-``spp_security``, ``queue_job``
+``spp_security``, ``job_worker``
 
 **Table of contents**
 

spp_hxl_area/__manifest__.py

@@ -17,7 +17,7 @@
         "spp_cel_domain",
         "spp_hazard",
         "spp_security",
-        "queue_job",
+        "job_worker",
     ],
     "external_dependencies": {
         "python": [

spp_hxl_area/readme/DESCRIPTION.md

@@ -10,7 +10,7 @@ Import HXL-tagged field data and aggregate to area-level indicators for humanita
 - Track imports as batches with state machine (draft → mapped → processing → done)
 - Auto-sync indicators to `spp.data.value` for CEL expression access
 - Link imports to hazard incidents for disaster response tracking
-- Process imports asynchronously via queue_job
+- Process imports asynchronously via job_worker
 
 ### Key Models
 
@@ -56,4 +56,4 @@ After installing:
 
 ### Dependencies
 
-`spp_hxl`, `spp_area`, `spp_cel_domain`, `spp_hazard`, `spp_security`, `queue_job`
+`spp_hxl`, `spp_area`, `spp_cel_domain`, `spp_hazard`, `spp_security`, `job_worker`

spp_hxl_area/static/description/index.html

@@ -390,15 +390,15 @@ <h1>Key Capabilities</h1>
 processing → done)</li>
 <li>Auto-sync indicators to <tt class="docutils literal">spp.data.value</tt> for CEL expression access</li>
 <li>Link imports to hazard incidents for disaster response tracking</li>
-<li>Process imports asynchronously via queue_job</li>
+<li>Process imports asynchronously via job_worker</li>
 </ul>
 </div>
 <div class="section" id="key-models">
 <h1>Key Models</h1>
 <table border="1" class="docutils">
 <colgroup>
-<col width="46%" />
-<col width="54%" />
+<col width="47%" />
+<col width="53%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Model</th>
@@ -459,8 +459,8 @@ <h1>UI Location</h1>
 <h1>Security</h1>
 <table border="1" class="docutils">
 <colgroup>
-<col width="49%" />
-<col width="51%" />
+<col width="45%" />
+<col width="55%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Group</th>
@@ -469,12 +469,10 @@ <h1>Security</h1>
 </thead>
 <tbody valign="top">
 <tr><td><tt class="docutils literal">spp_security.group_spp_admin</tt></td>
-<td>Full CRUD on profiles, rules,
-indicators</td>
+<td>Full CRUD on profiles, rules, indicators</td>
 </tr>
 <tr><td><tt class="docutils literal">base.group_user</tt></td>
-<td>Read profiles/rules; create/edit
-batches</td>
+<td>Read profiles/rules; create/edit batches</td>
 </tr>
 </tbody>
 </table>
@@ -493,7 +491,7 @@ <h1>Extension Points</h1>
 <div class="section" id="dependencies">
 <h1>Dependencies</h1>
 <p><tt class="docutils literal">spp_hxl</tt>, <tt class="docutils literal">spp_area</tt>, <tt class="docutils literal">spp_cel_domain</tt>, <tt class="docutils literal">spp_hazard</tt>,
-<tt class="docutils literal">spp_security</tt>, <tt class="docutils literal">queue_job</tt></p>
+<tt class="docutils literal">spp_security</tt>, <tt class="docutils literal">job_worker</tt></p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">

spp_import_match/README.rst

@@ -1,12 +1,8 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ====================
 OpenSPP Import Match
 ====================
 
-.. 
+..
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
@@ -44,7 +40,7 @@ Key Capabilities
 - Skip duplicate creation or update existing records when matches are
   found
 - Process imports with more than 100 records asynchronously using
-  ``queue_job``
+  ``job_worker``
 - Clear one2many/many2many associations before update to prevent
   duplicate entries
 
@@ -107,7 +103,7 @@ Extension Points
 Dependencies
 ~~~~~~~~~~~~
 
-``base``, ``spp_base_common``, ``base_import``, ``queue_job``,
+``base``, ``spp_base_common``, ``base_import``, ``job_worker``,
 ``spp_security``
 
 **Table of contents**
@@ -149,4 +145,4 @@ Current maintainers:
 
 This module is part of the `OpenSPP/OpenSPP2 <https://github.com/OpenSPP/OpenSPP2/tree/19.0/spp_import_match>`_ project on GitHub.
 
-You are welcome to contribute.
+You are welcome to contribute.

spp_import_match/__manifest__.py

@@ -12,9 +12,8 @@
     "license": "LGPL-3",
     "development_status": "Beta",
     "maintainers": ["jeremi", "gonzalesedwin1123"],
-    "depends": ["base", "spp_base_common", "base_import", "queue_job", "spp_security"],
+    "depends": ["base", "spp_base_common", "base_import", "job_worker", "spp_security"],
     "data": [
-        "data/queue_job_data.xml",
         "security/ir.model.access.csv",
         "views/import_match_view.xml",
     ],

spp_import_match/data/queue_job_data.xml

@@ -5,10 +5,9 @@
 from os.path import splitext
 
 from odoo import _, models
+from odoo.exceptions import UserError
 from odoo.models import fix_import_export_id_paths
 
-from odoo.addons.queue_job.exception import FailedJobError
-
 from .base import _import_match_local
 
 _logger = logging.getLogger(__name__)
@@ -202,5 +201,5 @@ def _import_one_chunk(self, model_name, attachment, options, context):
         result = model_obj.load(fields, data)
         error_message = [message["message"] for message in result["messages"] if message["type"] == "error"]
         if error_message:
-            raise FailedJobError("\n".join(error_message))
+            raise UserError("\n".join(error_message))
         return result

spp_import_match/models/base_import.py

@@ -6,7 +6,7 @@ Extends Odoo's base import functionality to match incoming records against exist
 - Match on sub-fields within related records (e.g., household ID within individual)
 - Apply conditional matching rules only when specific imported values are present
 - Skip duplicate creation or update existing records when matches are found
-- Process imports with more than 100 records asynchronously using `queue_job`
+- Process imports with more than 100 records asynchronously using `job_worker`
 - Clear one2many/many2many associations before update to prevent duplicate entries
 
 ### Key Models
@@ -46,4 +46,4 @@ After installing:
 
 ### Dependencies
 
-`base`, `spp_base_common`, `base_import`, `queue_job`, `spp_security`
+`base`, `spp_base_common`, `base_import`, `job_worker`, `spp_security`