From 1e36759a211a6c5e2648cef5425f592c3a693184 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 5 Sep 2023 02:36:14 +0200 Subject: [PATCH] added self.tables_data --- controller.py | 4 ++-- matrix_builder.py | 37 +++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/controller.py b/controller.py index 7f8a32a..f5f9dd7 100644 --- a/controller.py +++ b/controller.py @@ -13,7 +13,6 @@ def main(): args = parse_arguments() api = BaserowAPI(args.base_url, args.api_key, args.verbose) data_processor = DataProcessor(api, args.verbose) - matrix_builder = MatrixBuilder(data_processor, args.verbose) if args.table_ids: tables_data = fetch_table_data(data_processor, args.table_ids) @@ -26,7 +25,8 @@ def main(): handle_output(args.quiet, tables_data) if "matrix" in args.output: - matrix_data = matrix_builder.build_multitable_matrix(tables_data) + matrix_builder = MatrixBuilder(data_processor,tables_data, args.verbose) + matrix_data = matrix_builder.build_multitable_matrix() handle_output(args.quiet, matrix_data) if args.database_id: diff --git a/matrix_builder.py b/matrix_builder.py index 46fa7ec..07ff541 100644 --- a/matrix_builder.py +++ b/matrix_builder.py @@ -1,33 +1,34 @@ from data_processor import DataProcessor class MatrixBuilder: - def __init__(self, data_processor, verbose=False): + def __init__(self, data_processor, tables_data, verbose=False): self.data_processor = data_processor + self.tables_data = tables_data self.verbose = verbose - def build_multitable_matrix(self, tables_data): + def build_multitable_matrix(self): matrix = {} - for table_name, table_rows in tables_data.items(): + for table_name, table_rows in self.tables_data.items(): self.print_verbose_message(f"Building matrix for table: {table_name}") - matrix[table_name] = self._build_matrix_for_table(tables_data, table_name, table_rows.copy()) + matrix[table_name] = self._build_matrix_for_table(table_name, table_rows.copy()) return matrix - def _build_matrix_for_table(self, tables_data, table_name, table_rows, reference_map={}): + def _build_matrix_for_table(self, table_name, table_rows, reference_map={}): self.print_verbose_message(f"Starting matrix build for table: {table_name}") matrix = {table_name: table_rows} reference_map = reference_map.copy() - self._process_link_fields(table_name, tables_data, reference_map) - self._populate_matrix_with_related_content(tables_data, matrix, table_name, table_rows, reference_map) + self._process_link_fields(table_name, reference_map) + self._populate_matrix_with_related_content(matrix, table_name, table_rows, reference_map) return matrix[table_name] - def _populate_matrix_with_related_content(self, tables_data, matrix, table_name, table_rows, reference_map): + def _populate_matrix_with_related_content(self, matrix, table_name, table_rows, reference_map): for table_row in table_rows: for column_name, cell_content in table_row.items(): if column_name in reference_map: self.print_verbose_message(f"Handling linked content for column: {column_name}") - self._handle_linked_content(tables_data, matrix, table_row, column_name, cell_content, reference_map) + self._handle_linked_content(matrix, table_row, column_name, cell_content, reference_map) - def _handle_linked_content(self, tables_data, matrix, table_row, column_name, cell_content, reference_map): + def _handle_linked_content(self, matrix, table_row, column_name, cell_content, reference_map): link_table_id = reference_map[column_name]["link_row_table_id"] link_field_id = reference_map[column_name]["link_row_related_field_id"] @@ -35,35 +36,35 @@ class MatrixBuilder: raise Exception("link_row_related_field_id has to be a positive number") self.print_verbose_message(f"Fetching related content for table ID: {link_table_id} and field ID: {link_field_id}") - new_content = self._fetch_related_content(tables_data, matrix, cell_content, link_table_id, link_field_id, reference_map) + new_content = self._fetch_related_content(matrix, cell_content, link_table_id, link_field_id, reference_map) table_row[column_name] = new_content - def _fetch_related_content(self, tables_data, matrix, cell_content, link_table_id, link_field_id, reference_map): + def _fetch_related_content(self, matrix, cell_content, link_table_id, link_field_id, reference_map): new_content = [] for entry in cell_content: related_cell_id = self._generate_related_cell_identifier(link_table_id, link_field_id, entry["id"]) self.print_verbose_message(f"Generated related cell identifier: {related_cell_id}") if related_cell_id not in reference_map.get("embeded", []): reference_map.setdefault("embeded", []).append(related_cell_id) - matrix[link_table_id] = self._build_matrix_for_table(tables_data, link_table_id, tables_data[link_table_id].copy(), reference_map) + matrix[link_table_id] = self._build_matrix_for_table(link_table_id, self.tables_data[link_table_id].copy(), reference_map) new_content.append(entry) return new_content def _generate_related_cell_identifier(self, table_id, column_id, row_id): return f"table_{table_id}_field_{column_id}_row_{row_id}" - def _process_link_fields(self, table_name, tables_data, reference_map): + def _process_link_fields(self, table_name, reference_map): link_fields = self.data_processor.get_link_fields_for_table(table_name) for link_field in link_fields: self.print_verbose_message(f"Processing link fields for table: {table_name}") - self._load_table_data_if_missing(link_field, tables_data) + self._load_table_data_if_missing(link_field) self._update_reference_map(link_field, reference_map) - def _load_table_data_if_missing(self, link_field, tables_data): + def _load_table_data_if_missing(self, link_field): link_table_id = link_field["link_row_table_id"] - if link_table_id not in tables_data: + if link_table_id not in self.tables_data: self.print_verbose_message(f"Loading data for missing table ID: {link_table_id}") - tables_data[link_table_id] = self.data_processor.get_all_rows_from_table(link_table_id) + self.tables_data[link_table_id] = self.data_processor.get_all_rows_from_table(link_table_id) def _update_reference_map(self, link_field, reference_map): field_name = f"field_{link_field['id']}"