From 5ca6bb19f0223a21e79e2ea82fe6d8909aa5cb23 Mon Sep 17 00:00:00 2001 From: james Date: Sat, 9 Mar 2024 10:32:22 -0800 Subject: [PATCH] WIP: parent categories are incorrect due to children having multiple categories --- .pre-commit-config.yaml | 20 +++++++++---------- .../dbcon/sql/query_top_companies_month.sql | 3 ++- .../sql/query_top_companies_month_parent.sql | 3 ++- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 74f1304..d5f46be 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: rev: v1.8.0 hooks: - id: mypy - additional_dependencies: ["types-requests", "types-PyYAML"] + additional_dependencies: ['types-requests', 'types-PyYAML'] ## JS ## - repo: https://github.com/pre-commit/mirrors-prettier rev: v4.0.0-alpha.8 @@ -18,11 +18,11 @@ repos: - id: prettier args: [ - "--config", - "frontend/.prettierrc", - "--ignore-unknown", - "--write", - "--check", + '--config', + 'frontend/.prettierrc', + '--ignore-unknown', + '--write', + '--check', ] language: node entry: frontend/node_modules/.bin/prettier @@ -46,8 +46,8 @@ repos: - svelte - typescript - eslint-plugin-svelte - - "@typescript-eslint/eslint-plugin" - - "@typescript-eslint/parser" + - '@typescript-eslint/eslint-plugin' + - '@typescript-eslint/parser' - svelte-eslint-parser - repo: local hooks: @@ -63,9 +63,9 @@ repos: rev: 3.0.0a6 hooks: - id: sqlfluff-lint - args: ["--config", "backend/pyproject.toml"] # Specify the config file location here + args: ['--config', 'backend/pyproject.toml'] # Specify the config file location here - id: sqlfluff-fix - args: ["--config", "backend/pyproject.toml"] # Specify the config file location here + args: ['--config', 'backend/pyproject.toml'] # Specify the config file location here # Arbitrary arguments to show an example # args: [--rules, "LT02,CP02"] # additional_dependencies: ['', 'sqlfluff-templater-dbt'] diff --git a/backend/dbcon/sql/query_top_companies_month.sql b/backend/dbcon/sql/query_top_companies_month.sql index 4d45fb4..70d49db 100644 --- a/backend/dbcon/sql/query_top_companies_month.sql +++ b/backend/dbcon/sql/query_top_companies_month.sql @@ -1,3 +1,4 @@ SELECT * FROM - adtech.companies_parent_by_d30_counts; + adtech.companies_by_d30_counts +WHERE category_id IN :categories; diff --git a/backend/dbcon/sql/query_top_companies_month_parent.sql b/backend/dbcon/sql/query_top_companies_month_parent.sql index d000c45..eddb653 100644 --- a/backend/dbcon/sql/query_top_companies_month_parent.sql +++ b/backend/dbcon/sql/query_top_companies_month_parent.sql @@ -1,3 +1,4 @@ SELECT * FROM - adtech.companies_by_d30_counts; + adtech.companies_parent_by_d30_counts +WHERE category_id IN :categories;