fix: handle RetryError

alyf-de · Jul 10, 2023 · 6320e31 · 6320e31
1 parent 91e7790
commit 6320e31
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/erpnext_germany/erpnext_germany/doctype/vat_id_check/vat_id_check.json b/erpnext_germany/erpnext_germany/doctype/vat_id_check/vat_id_check.json
@@ -105,7 +105,7 @@
    "fieldname": "status",
    "fieldtype": "Select",
    "label": "Status",
-   "options": "Planned\nRunning\nCompleted",
+   "options": "Planned\nRunning\nCompleted\nUnavailable",
    "read_only": 1
   },
   {
@@ -168,7 +168,7 @@
   }
  ],
  "links": [],
- "modified": "2023-07-10 23:59:04.133772",
+ "modified": "2023-07-11 00:31:49.194157",
  "modified_by": "Administrator",
  "module": "ERPNext Germany",
  "name": "VAT ID Check",

diff --git a/erpnext_germany/erpnext_germany/doctype/vat_id_check/vat_id_check.py b/erpnext_germany/erpnext_germany/doctype/vat_id_check/vat_id_check.py
@@ -5,6 +5,8 @@
 from frappe.model.document import Document
 from erpnext_germany.utils.eu_vat import check_vat_approx, parse_vat_id
 
+from tenacity import RetryError
+
 
 class VATIDCheck(Document):
 	def before_insert(self):
@@ -33,16 +35,21 @@ def run_check(doc: VATIDCheck):
 		requester_country_code, requester_vat_number = parse_vat_id(doc.requester_vat_id)
 
 	country_code, vat_number = parse_vat_id(doc.customer_vat_id)
-	result = check_vat_approx(
-		country_code=country_code,
-		vat_number=vat_number,
-		trader_name=doc.trader_name,
-		trader_street=doc.trader_street,
-		trader_postcode=doc.trader_postcode,
-		trader_city=doc.trader_city,
-		requester_country_code=requester_country_code,
-		requester_vat_number=requester_vat_number
-	)
+	try:
+		result = check_vat_approx(
+			country_code=country_code,
+			vat_number=vat_number,
+			trader_name=doc.trader_name,
+			trader_street=doc.trader_street,
+			trader_postcode=doc.trader_postcode,
+			trader_city=doc.trader_city,
+			requester_country_code=requester_country_code,
+			requester_vat_number=requester_vat_number
+		)
+	except RetryError:
+		doc.db_set("status", "Service Unavailable", notify=True)
+		return
+
 	doc.db_set(
 		{
 			"status": "Completed",

diff --git a/erpnext_germany/erpnext_germany/doctype/vat_id_check/vat_id_check_list.js b/erpnext_germany/erpnext_germany/doctype/vat_id_check/vat_id_check_list.js
@@ -10,6 +10,8 @@ frappe.listview_settings["VAT ID Check"] = {
 			return [__("Planned"), "blue", "status,=,Planned"];
 		} else if (doc.status === "Running") {
 			return [__("Running"), "yellow", "status,=,Running"];
+		} else if (doc.status === "Service Unavailable") {
+			return [__("Service Unavailable"), "gray", "status,=,Service Unavailable"];
 		}
 	},
 };