fix: merge conflicts

.github/validate_customizations.py

@@ -0,0 +1,166 @@
+import json
+import pathlib
+import sys
+
+
+def scrub(txt: str) -> str:
+	"""Returns sluggified string. e.g. `Sales Order` becomes `sales_order`."""
+	return txt.replace(" ", "_").replace("-", "_").lower()
+
+
+def unscrub(txt: str) -> str:
+	"""Returns titlified string. e.g. `sales_order` becomes `Sales Order`."""
+	return txt.replace("_", " ").replace("-", " ").title()
+
+
+def get_customized_doctypes():
+	apps_dir = pathlib.Path(__file__).resolve().parent.parent.parent
+	apps_order = pathlib.Path(__file__).resolve().parent.parent.parent.parent / "sites" / "apps.txt"
+	apps_order = apps_order.read_text().split("\n")
+	customized_doctypes = {}
+	for _app_dir in apps_order:
+		app_dir = (apps_dir / _app_dir).resolve()
+		if not app_dir.is_dir():
+			continue
+		modules = (app_dir / _app_dir / "modules.txt").read_text().split("\n")
+		for module in modules:
+			if not (app_dir / _app_dir / scrub(module) / "custom").exists():
+				continue
+			for custom_file in list((app_dir / _app_dir / scrub(module) / "custom").glob("**/*.json")):
+				if custom_file.stem in customized_doctypes:
+					customized_doctypes[custom_file.stem].append(custom_file.resolve())
+				else:
+					customized_doctypes[custom_file.stem] = [custom_file.resolve()]
+
+	return dict(sorted(customized_doctypes.items()))
+
+
+def validate_module(customized_doctypes, set_module=False):
+	exceptions = []
+	app_dir = pathlib.Path(__file__).resolve().parent.parent
+	this_app = app_dir.stem
+	for doctype, customize_files in customized_doctypes.items():
+		for customize_file in customize_files:
+			if not this_app in str(customize_file):
+				continue
+			module = customize_file.parent.parent.stem
+			file_contents = json.loads(customize_file.read_text())
+			if file_contents.get("custom_fields"):
+				for custom_field in file_contents.get("custom_fields"):
+					if set_module:
+						custom_field["module"] = unscrub(module)
+						continue
+					if not custom_field.get("module"):
+						exceptions.append(
+							f"Custom Field for {custom_field.get('dt')} in {this_app} '{custom_field.get('fieldname')}' does not have a module key"
+						)
+						continue
+					elif custom_field.get("module") != unscrub(module):
+						exceptions.append(
+							f"Custom Field for {custom_field.get('dt')} in {this_app} '{custom_field.get('fieldname')}' has module key ({custom_field.get('module')}) associated with another app"
+						)
+						continue
+			if file_contents.get("property_setters"):
+				for ps in file_contents.get("property_setters"):
+					if set_module:
+						ps["module"] = unscrub(module)
+						continue
+					if not ps.get("module"):
+						exceptions.append(
+							f"Property Setter for {ps.get('doc_type')} in {this_app} '{ps.get('property')}' on {ps.get('field_name')} does not have a module key"
+						)
+						continue
+					elif ps.get("module") != unscrub(module):
+						exceptions.append(
+							f"Property Setter for {ps.get('doc_type')} in {this_app} '{ps.get('property')}' on {ps.get('field_name')} has module key ({ps.get('module')}) associated with another app"
+						)
+						continue
+			if set_module:
+				with customize_file.open("w", encoding="UTF-8") as target:
+					json.dump(file_contents, target, sort_keys=True, indent=2)
+
+	return exceptions
+
+
+def validate_no_custom_perms(customized_doctypes):
+	exceptions = []
+	this_app = pathlib.Path(__file__).resolve().parent.parent.stem
+	for doctype, customize_files in customized_doctypes.items():
+		for customize_file in customize_files:
+			if not this_app in str(customize_file):
+				continue
+			file_contents = json.loads(customize_file.read_text())
+			if file_contents.get("custom_perms"):
+				exceptions.append(f"Customization for {doctype} in {this_app} contains custom permissions")
+	return exceptions
+
+
+def validate_duplicate_customizations(customized_doctypes):
+	exceptions = []
+	common_fields = {}
+	common_property_setters = {}
+	app_dir = pathlib.Path(__file__).resolve().parent.parent
+	this_app = app_dir.stem
+	for doctype, customize_files in customized_doctypes.items():
+		if len(customize_files) == 1:
+			continue
+		common_fields[doctype] = {}
+		common_property_setters[doctype] = {}
+		for customize_file in customize_files:
+			module = customize_file.parent.parent.stem
+			app = customize_file.parent.parent.parent.parent.stem
+			file_contents = json.loads(customize_file.read_text())
+			if file_contents.get("custom_fields"):
+				fields = [cf.get("fieldname") for cf in file_contents.get("custom_fields")]
+				common_fields[doctype][module] = fields
+			if file_contents.get("property_setters"):
+				ps = [ps.get("name") for ps in file_contents.get("property_setters")]
+				common_property_setters[doctype][module] = ps
+
+	for doctype, module_and_fields in common_fields.items():
+		if this_app not in module_and_fields.keys():
+			continue
+		this_modules_fields = module_and_fields.pop(this_app)
+		for module, fields in module_and_fields.items():
+			for field in fields:
+				if field in this_modules_fields:
+					exceptions.append(
+						f"Custom Field for {unscrub(doctype)} in {this_app} '{field}' also appears in customizations for {module}"
+					)
+
+	for doctype, module_and_ps in common_property_setters.items():
+		if this_app not in module_and_ps.keys():
+			continue
+		this_modules_ps = module_and_ps.pop(this_app)
+		for module, ps in module_and_ps.items():
+			for p in ps:
+				if p in this_modules_ps:
+					exceptions.append(
+						f"Property Setter for {unscrub(doctype)} in {this_app} on '{p}' also appears in customizations for {module}"
+					)
+
+	return exceptions
+
+
+def validate_customizations(set_module):
+	customized_doctypes = get_customized_doctypes()
+	exceptions = validate_no_custom_perms(customized_doctypes)
+	exceptions += validate_module(customized_doctypes, set_module)
+	exceptions += validate_duplicate_customizations(customized_doctypes)
+
+	return exceptions
+
+
+if __name__ == "__main__":
+	exceptions = []
+	set_module = False
+	for arg in sys.argv:
+		if arg == "--set-module":
+			set_module = True
+		exceptions.append(validate_customizations(set_module))
+
+	if exceptions:
+		for exception in exceptions:
+			[print(e) for e in exception]  # TODO: colorize
+
+	sys.exit(1) if all(exceptions) else sys.exit(0)

.pre-commit-config.yaml

@@ -59,6 +59,15 @@ repos:
         exclude: ^tests/
         args: [--ignore-missing-imports]
 
+  - repo: local
+    hooks:
+      - id: validate_customizations
+        always_run: true
+        name: .github/validate_customizations.py
+        entry: python .github/validate_customizations.py
+        language: system
+        types: [python]
+
 ci:
   autoupdate_schedule: weekly
   skip: []

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 
 
+## v14.11.0 (2024-01-08)
+
+### Feature
+
+* feat: Filter check run settings print format to only show enabled and Payment Entry formats (#186) ([`fc0f7d7`](https://github.com/agritheory/check_run/commit/fc0f7d776f83f8bc8b3b194b0362de3e27aa1baa))
+
+### Unknown
+
+* patch: update outsanting in old payment schedule entries (#183) ([`a9e3e8b`](https://github.com/agritheory/check_run/commit/a9e3e8b1685cdad2c243e6c383ad0563f31f5c27))
+
+
 ## v14.10.0 (2023-12-14)
 
 ### Feature

check_run/__init__.py

@@ -1 +1 @@
-__version__ = "14.10.0"
+__version__ = "14.11.0"