diff --git a/press/patches.txt b/press/patches.txt index e4664662d0..2629493c7c 100644 --- a/press/patches.txt +++ b/press/patches.txt @@ -110,7 +110,6 @@ press.press.doctype.virtual_machine_volume.patches.rename_aws_fields press.patches.v0_7_0.convert_marketplace_description_to_html press.press.doctype.team.patches.remove_invalid_email_addresses press.saas.doctype.product_trial.patches.rename_saas_product_doctypes_to_product_trial -press.press.doctype.usage_record.patches.add_unique_constraint [post_model_sync] press.patches.v0_7_0.rename_plan_to_site_plan diff --git a/press/press/doctype/subscription/test_subscription.py b/press/press/doctype/subscription/test_subscription.py index ca5e6fdb09..0818760c77 100644 --- a/press/press/doctype/subscription/test_subscription.py +++ b/press/press/doctype/subscription/test_subscription.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # Copyright (c) 2020, Frappe and Contributors # See license.txt @@ -92,44 +93,6 @@ def test_subscription_daily(self): invoice = frappe.get_doc("Invoice", {"team": self.team.name, "status": "Draft"}) self.assertEqual(invoice.total, desired_value) - def test_subscription_for_duplicate_usage_record(self): - todo = frappe.get_doc(doctype="ToDo", description="Test todo").insert() - plan = frappe.get_doc( - doctype="Site Plan", - name="Plan-10", - document_type="ToDo", - interval="Daily", - price_usd=30, - price_inr=30, - ).insert() - - subscription = frappe.get_doc( - doctype="Subscription", - team=self.team.name, - document_type="ToDo", - document_name=todo.name, - plan_type="Site Plan", - plan=plan.name, - ).insert() - - # create a usage record - subscription.create_usage_record() - - # since create_usage_record silently skips if a record already exists - # check by manually creating a duplicate record - duplicate_usage_record = frappe.new_doc( - doctype="Usage Record", - team=self.team.name, - document_type="ToDo", - document_name=todo.name, - plan_type="Site Plan", - plan=plan.name, - subscription=subscription.name, - interval="Daily", - ) - with self.assertRaises(frappe.UniqueValidationError): - duplicate_usage_record.insert() - def test_subscription_for_non_chargeable_document(self): todo = frappe.get_doc(doctype="ToDo", description="Test todo").insert() plan = frappe.get_doc( diff --git a/press/press/doctype/usage_record/patches/add_unique_constraint.py b/press/press/doctype/usage_record/patches/add_unique_constraint.py deleted file mode 100644 index c3d98994cd..0000000000 --- a/press/press/doctype/usage_record/patches/add_unique_constraint.py +++ /dev/null @@ -1,6 +0,0 @@ -import frappe - - -def execute(): - frappe.reload_doc("press", "doctype", "usage_record") - frappe.get_doc("DocType", "Usage Record").run_module_method("on_doctype_update") diff --git a/press/press/doctype/usage_record/usage_record.py b/press/press/doctype/usage_record/usage_record.py index fb460370a4..10aedfc8d1 100644 --- a/press/press/doctype/usage_record/usage_record.py +++ b/press/press/doctype/usage_record/usage_record.py @@ -124,4 +124,4 @@ def link_unlinked_usage_records(): def on_doctype_update(): - frappe.db.add_unique("Usage Record", ["subscription", "date"], constraint_name="unique_usage_record") + frappe.db.add_index("Usage Record", ["subscription", "date"])