Merge pull request #3805 from resilient-tech/mergify/bp/version-15-hotfix/pr-3793

fix: give job_id argument to frappe.enqueue in purchase reconciliation tool and GST IMS (backport #3793)

Author: mergify[bot]

india_compliance/gst_india/doctype/gst_invoice_management_system/gst_invoice_management_system.js

@@ -684,14 +684,21 @@ class IMSAction {
     }
 
     async download_ims_data() {
-        await taxpayer_api.call({
+        const { message } = await taxpayer_api.call({
             method: `${DOC_PATH}.download_invoices`,
             args: { company_gstin: this.frm.doc.company_gstin },
         });
 
-        frappe.show_alert({
-            message: __("Downloading Invoices"),
-        });
+        if (message?.message) {
+            frappe.show_alert({
+                message: message.message,
+                indicator: message?.indicator || "blue",
+            });
+        } else {
+            frappe.show_alert({
+                message: __("Downloading Invoices"),
+            });
+        }
     }
 
     async get_ims_data() {

india_compliance/gst_india/doctype/gst_invoice_management_system/gst_invoice_management_system.py

@@ -6,6 +6,7 @@
 from frappe.model.document import Document
 from frappe.query_builder.functions import IfNull
 from frappe.utils import add_to_date, format_date
+from frappe.utils.background_jobs import is_job_enqueued
 
 from india_compliance.gst_india.api_classes.taxpayer_base import (
     TaxpayerBaseAPI,
@@ -248,9 +249,24 @@ def get_link_options(self, doctype, filters):
 def download_invoices(company_gstin):
     frappe.has_permission("GST Invoice Management System", "write", throw=True)
 
+    job_id = f"gst_ims:{company_gstin}"
+
+    if is_job_enqueued(job_id):
+        return {
+            "message": _(
+                "A download job is already in progress for the GSTIN - {0}"
+            ).format(company_gstin),
+        }
+
     TaxpayerBaseAPI(company_gstin).validate_auth_token()
 
-    frappe.enqueue(download_ims_invoices, queue="long", gstin=company_gstin)
+    frappe.enqueue(
+        download_ims_invoices,
+        queue="long",
+        gstin=company_gstin,
+        job_id=job_id,
+        deduplicate=True,
+    )
 
 
 @frappe.whitelist()

india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.js

@@ -1223,7 +1223,14 @@ async function download_gstr(
             gst_categories,
         };
         frm.events.show_progress(frm, "download");
-        await frm.taxpayer_api_call("download_gstr", args);
+        const { message } = await frm.taxpayer_api_call("download_gstr", args);
+
+        if (message?.message) {
+            frappe.show_alert({
+                message: message.message,
+                indicator: message?.indicator || "blue",
+            });
+        }
     });
 }
 

india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.py

@@ -9,6 +9,7 @@
 from frappe.model.document import Document
 from frappe.query_builder.functions import IfNull
 from frappe.utils import add_to_date, cint, now_datetime
+from frappe.utils.background_jobs import is_job_enqueued
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
     get_accounting_dimensions,
 )
@@ -133,6 +134,15 @@ def download_gstr(
     ):
         frappe.has_permission("Purchase Reconciliation Tool", "write", throw=True)
 
+        job_id = f"purchase_reconciliation_tool:{company_gstin}:{return_type}"
+
+        if is_job_enqueued(job_id):
+            return {
+                "message": _(
+                    "A download job is already in progress for the GSTIN - {0} and Return Type - {1}"
+                ).format(company_gstin, return_type),
+            }
+
         TaxpayerBaseAPI(company_gstin).validate_auth_token()
 
         frappe.enqueue(
@@ -144,8 +154,10 @@ def download_gstr(
             force=force,
             gst_categories=gst_categories,
             queue="long",
+            job_id=job_id,
             now=frappe.flags.in_test,
             timeout=1800,
+            deduplicate=True,
         )
 
     @frappe.whitelist()