Merge pull request #301 from SFDO-Tooling/feature/record-type-None-fix

Fix cases where some records have record types and others don't

snowfakery/__init__.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Tuple, Union, Optional, Dict, TextIO
+from typing import Tuple, Union, Optional, Dict, TextIO, Sequence
 from contextlib import ExitStack
 
 from .plugins import SnowfakeryPlugin, lazy  # noqa
@@ -28,6 +28,7 @@ def generate_data(
     generate_continuation_file: Union[TextIO, Path] = None,
     generate_cci_mapping_file: Union[TextIO, Path] = None,
     should_create_cci_record_type_tables: bool = False,
+    load_declarations: Sequence[Union[Path, str]] = None
 ):
     from .cli import generate_cli
 
@@ -66,4 +67,5 @@ def open_if_necessary_and_close_later(file_like, mode):
             generate_continuation_file=generate_continuation_file,
             generate_cci_mapping_file=generate_cci_mapping_file,
             should_create_cci_record_type_tables=should_create_cci_record_type_tables,
+            load_declarations=load_declarations,
         )

snowfakery/salesforce.py

@@ -37,7 +37,7 @@ def _populate_rt_table(connection, table: Table, columnname: str, rt_table: Tabl
     query_res = connection.execute(
         select([column]).where(column is not None).distinct()
     )
-    record_types = [res[0] for res in query_res]
+    record_types = [res[0] for res in query_res if res[0]]
 
     if record_types:
         insert_stmt = rt_table.insert()

tests/cci/circular_references.yml

@@ -0,0 +1,18 @@
+- object: Opportunity
+  fields:
+    Contact:
+      reference: Contact
+    Account:
+      reference: Account
+- object: Contact
+  fields:
+    Account:
+      reference: Account
+    Opportunity:
+      reference: Opportunity
+- object: Account
+  fields:
+    Contact:
+      reference: Contact
+    Opportunity:
+      reference: Opportunity

tests/cci/test_declaration_parser.py

@@ -1,7 +1,9 @@
 from pathlib import Path
+from io import StringIO
 
 from snowfakery.cci_mapping_files.declaration_parser import (
     SObjectRuleDeclaration,
+    SObjectRuleDeclarationFile,
     unify,
 )
 from snowfakery.cli import generate_cli
@@ -138,3 +140,22 @@ def test_cli__multiple_files(self, tmpdir):
         assert map_data["Insert Account"]["api"] == "rest"
         assert map_data["Insert Contact"]["api"] == "rest"
         assert map_data["Insert Opportunity"]["api"] == "bulk"
+
+    def test_circular_references__force_order(self, generate_in_tmpdir):
+        circular_test = (Path(__file__).parent / "circular_references.yml").read_text()
+        print(generate_in_tmpdir)
+        with generate_in_tmpdir(
+            circular_test, load_declarations=["tests/cci/mapping_mixins.load.yml"]
+        ) as (mapping, connection):
+            assert tuple(mapping.keys()) == tuple(
+                ["Insert Account", "Insert Contact", "Insert Opportunity"]
+            )
+
+    def test_parse_from_open_file(self):
+        s = StringIO(
+            """
+         - sf_object: Foo
+           api: bulk
+        """
+        )
+        SObjectRuleDeclarationFile.parse_from_yaml(s)

tests/test_generate_mapping.py

@@ -271,6 +271,20 @@ def test_Case_recordtypes(self, tmpdir, generate_in_tmpdir):
             assert records == [("Bar", "Bar")], records
             assert mapping["Insert Case"]["fields"]["RecordTypeId"] == "recordtype"
 
+    def test_incomplete_record_types(self, tmpdir, generate_in_tmpdir):
+        recipe_data = """
+            - object: Case
+              fields:
+                recordtype: Bar
+            - object: Case
+              fields:
+                blah: Blah
+              """
+        with generate_in_tmpdir(recipe_data) as (mapping, db):
+            records = list(db.execute("SELECT * from Case_rt_mapping"))
+            assert records == [("Bar", "Bar")], records
+            assert mapping["Insert Case"]["fields"]["RecordTypeId"] == "recordtype"
+
 
 class TestPersonAccounts:
     def test_basic_person_accounts(self, generate_in_tmpdir):