Expand merging to Localities, Paleo Ctxt, Collecting Event

specifyweb/businessrules/rules/attachment_rules.py

@@ -3,6 +3,7 @@
 from specifyweb.businessrules.orm_signal_handler import orm_signal_handler
 from specifyweb.specify.scoping import Scoping
 from specifyweb.specify import models
+from django.db import transaction
 
 from specifyweb.businessrules.exceptions import AbortSave
 

specifyweb/businessrules/rules/determination_rules.py

@@ -33,4 +33,4 @@ def determination_pre_save(det):
 def only_one_determination_iscurrent(determination):
     if determination.iscurrent:
         Determination.objects.filter(
-            collectionobject=determination.collectionobject_id).update(iscurrent=False)
+            collectionobject=determination.collectionobject_id).update(iscurrent=False)

specifyweb/businessrules/tests/accession.py

@@ -1,7 +1,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 

specifyweb/businessrules/tests/accessionagent.py

@@ -1,7 +1,7 @@
 
 from unittest import skip
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 

specifyweb/businessrules/tests/address.py

@@ -1,4 +1,4 @@
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class AddressTests(ApiTests):
     def test_at_most_one_primary_address_per_agent(self):

specifyweb/businessrules/tests/agent.py

@@ -1,10 +1,8 @@
 
 import unittest
 
-from django.db import transaction
-
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class AgentTests(ApiTests):

specifyweb/businessrules/tests/appraisal.py

@@ -2,7 +2,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class AppraisalTests(ApiTests):

specifyweb/businessrules/tests/author.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class AuthorTests(ApiTests):

specifyweb/businessrules/tests/borrowagent.py

@@ -1,7 +1,7 @@
 
 from unittest import skip
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class BorrowAgentTests(ApiTests):

specifyweb/businessrules/tests/collectingevents.py

@@ -1,7 +1,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class CollectingEventTests(ApiTests):
     def test_collectionobjects_block_delete(self):

specifyweb/businessrules/tests/collection.py

@@ -1,7 +1,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class CollectionTests(ApiTests):

specifyweb/businessrules/tests/collectionobject.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class CollectionObjectTests(ApiTests):

specifyweb/businessrules/tests/collector.py

@@ -1,7 +1,7 @@
 
 from unittest import skip
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class CollectorTests(ApiTests):

specifyweb/businessrules/tests/determination.py

@@ -1,4 +1,4 @@
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class DeterminationTests(ApiTests):
     def test_only_one_determination_iscurrent(self):

specifyweb/businessrules/tests/determiner.py

@@ -1,7 +1,7 @@
 
 from unittest import skipUnless
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class DeterminerTests(ApiTests):

specifyweb/businessrules/tests/discipline.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class DisciplineTests(ApiTests):

specifyweb/businessrules/tests/division.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class DivisionTests(ApiTests):

specifyweb/businessrules/tests/geography.py

@@ -3,7 +3,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class GeographyTests(ApiTests):
     def test_delete_blocked_by_locality(self):

specifyweb/businessrules/tests/geographytreedefitem.py

@@ -1,7 +1,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import TreeBusinessRuleException
 
 class GeographyTreeDefItem(ApiTests):

specifyweb/businessrules/tests/geologictimeperiod.py

@@ -3,7 +3,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class Geologictimeperiod(ApiTests):
     def setUp(self):

specifyweb/businessrules/tests/geologictimeperiodtreedefitem.py

@@ -1,5 +1,5 @@
 from django.db.models import ProtectedError
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import TreeBusinessRuleException
 
 class GeologictimeperiodtreedefitemTests(ApiTests):

specifyweb/businessrules/tests/gift.py

@@ -1,6 +1,6 @@
 from django.db import IntegrityError
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class GiftTests(ApiTests):

specifyweb/businessrules/tests/groupperson.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from specifyweb.specify.agent_types import agent_types
 from ..exceptions import BusinessRuleException
 

specifyweb/businessrules/tests/institution.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class InstitutionTests(ApiTests):

specifyweb/businessrules/tests/journal.py

@@ -1,6 +1,6 @@
 from django.db.models import ProtectedError
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class JournalBusinessRuleTests(ApiTests):
     def test_referenceworks_block_delete(self):

specifyweb/businessrules/tests/lithostrat.py

@@ -4,7 +4,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class LithostratTests(ApiTests):
     def setUp(self):

specifyweb/businessrules/tests/lithostrattreedefitem.py

@@ -1,5 +1,5 @@
 from django.db.models import ProtectedError
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import TreeBusinessRuleException
 from specifyweb.specify import models
 

specifyweb/businessrules/tests/loan.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class LoanTests(ApiTests):

specifyweb/businessrules/tests/locality.py

@@ -1,6 +1,6 @@
 from django.db.models import ProtectedError
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class LocalityBusinessRuleTests(ApiTests):
     def test_collectingevents_block_delete(self):

specifyweb/businessrules/tests/permit.py

@@ -1,6 +1,6 @@
 from django.db.models import ProtectedError
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 

specifyweb/businessrules/tests/picklist.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class PicklistTests(ApiTests):

specifyweb/businessrules/tests/preparation.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 

specifyweb/businessrules/tests/preptype.py

@@ -1,6 +1,6 @@
 from django.db.models import ProtectedError
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class PrepTypeTests(ApiTests):

specifyweb/businessrules/tests/repositoryagreement.py

@@ -1,5 +1,5 @@
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 class RepositoryAgreementTests(ApiTests):

specifyweb/businessrules/tests/shipment.py

@@ -1,7 +1,7 @@
 
 from unittest import skip
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import BusinessRuleException
 
 @skip("these business rules were removed in https://github.com/specify/specify7/issues/474")

specifyweb/businessrules/tests/storage.py

@@ -3,7 +3,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class StorageTests(ApiTests):
     def setUp(self):

specifyweb/businessrules/tests/storagetreedefitem.py

@@ -1,5 +1,5 @@
 from django.db.models import ProtectedError
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import TreeBusinessRuleException
 from specifyweb.specify import models
 

specifyweb/businessrules/tests/taxon.py

@@ -4,7 +4,7 @@
 from django.db.models import ProtectedError
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 
 class TaxonTests(ApiTests):
     def setUp(self):

specifyweb/businessrules/tests/taxontreedefitem.py

@@ -1,5 +1,5 @@
 from django.db.models import ProtectedError
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from ..exceptions import TreeBusinessRuleException
 from specifyweb.specify import models
 

specifyweb/businessrules/tests/uniqueness_rules.py

@@ -3,8 +3,7 @@
 from django.test import Client
 
 from specifyweb.specify import models
-from specifyweb.specify.api_tests import ApiTests
-from specifyweb.businessrules.models import UniquenessRule
+from specifyweb.specify.tests.test_api import ApiTests
 from specifyweb.businessrules.exceptions import BusinessRuleException
 
 

specifyweb/context/tests.py

@@ -4,7 +4,7 @@
 from jsonschema import validate  # type: ignore
 from jsonschema.exceptions import ValidationError  # type: ignore
 
-from specifyweb.specify.api_tests import ApiTests
+from specifyweb.specify.tests.test_api import ApiTests
 from . import viewsets
 
 

specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts

@@ -15,6 +15,7 @@ import type {
   TableFields,
 } from './helperTypes';
 import type { SpecifyResource } from './legacyTypes';
+import { ResourceBase } from './resourceApi';
 import {
   getFieldBlockerKey,
   propagateBlockerEvents,
@@ -476,3 +477,30 @@ export type BusinessRuleResult<SCHEMA extends AnySchema = AnySchema> = {
     }
   | { readonly isValid: false; readonly reason: string }
 );
+
+export const runAllFieldChecks = async (
+  resource: SpecifyResource<AnySchema>
+): Promise<void> => {
+  const relationships = resource.specifyTable.relationships;
+  await Promise.all(
+    relationships.map(({ name }) =>
+      resource.businessRuleManager?.checkField(name)
+    )
+  );
+  const mapResource = (
+    result?: SpecifyResource<AnySchema> | Collection<AnySchema> | null
+  ): RA<SpecifyResource<AnySchema>> =>
+    (result === undefined || result === null
+      ? []
+      : result instanceof ResourceBase
+      ? [result]
+      : (result as Collection<AnySchema>).models) as unknown as RA<
+      SpecifyResource<AnySchema>
+    >;
+  // running only on dependent resources. the order shouldn't matter.....
+  await Promise.all(
+    Object.values(resource.dependentResources)
+      .flatMap(mapResource)
+      .map((next) => runAllFieldChecks(next))
+  );
+};