fix: Don't call get_fields_for_table for skipped tables (#44)

Author: mklaber

poetry.lock

@@ -42,6 +42,7 @@ Sphinx = "^3.3.0"
 sphinx-rtd-theme = "^0.5.0"
 python-dotenv = "^0.15.0"
 six = "^1.15.0"
+pytest-mock = "^3.6.1"
 
 [tool.poetry.scripts]
 qbc = 'quickbase_client.tools.qbc:main'

pyproject.toml

@@ -161,12 +161,6 @@ def add_app_file(self, app_data):
     def add_table_file(self, table, fields):
         table_ident = table['singleRecordName']
         file_name = make_var_name(table_ident)
-        if len(self.table_ids) and not any(
-            x in self.table_ids for x in [table_ident, file_name, table['id']]
-        ):
-            # if table_ids have been specified, and this table's ID, single record name, or var name
-            # is not in the list, skip it
-            return
         if file_name in self.pkg_writer.modules:
             table_ident = table['alias'].replace('_DBID_', '')
             file_name = make_var_name(table_ident)
@@ -196,8 +190,15 @@ def run(self):
         tables = api.get_tables_for_app(self.app_id)
         for table in tables.json():
             table_id = table['id']
-            fields = api.get_fields_for_table(table_id)
-            self.add_table_file(table, fields.json())
+            table_ident = table['singleRecordName']
+            table_var = make_var_name(table_ident)
+            if not len(self.table_ids) or any(
+                x in self.table_ids for x in [table_var, table_ident, table_id]
+            ):
+                # if not table_ids have been specified, or they have but this table's ID, 
+                # single record name, or var name are in the list, generate it
+                fields = api.get_fields_for_table(table_id)
+                self.add_table_file(table, fields.json())
 
         self.pkg_writer.write()
         return True

src/quickbase_client/tools/model_generate.py

@@ -1,5 +1,6 @@
 import os
 from tempfile import TemporaryDirectory
+from unittest.mock import ANY
 
 import pytest
 from requests import Response
@@ -71,6 +72,12 @@ def _asserts(d, _):
             assert os.path.exists(os.path.join(d, 'qbcpy', 'ideas_2.py'))
         run_generator(_asserts, table_ids=['idea', 'cccccc'])
 
+    def test_gets_fields_only_for_requested_tables(self, run_generator, mocker):
+        spy = mocker.spy(model_generate.QuickBaseApiClient, 'get_fields_for_table')
+        run_generator(table_ids=['aaaaaa'])
+        # first arg is `self` because it is an instance method
+        spy.assert_called_once_with(ANY, 'aaaaaa')
+
     def test_writes_table_class(self, run_generator):
         gen = run_generator()
         m = gen.pkg_writer.modules['debug']