Merge pull request #42 from ddxv/fix-parent-categories

WIP: parent categories are incorrect due to children having multiple …
ddxv · Mar 10, 2024 · bed67cc · bed67cc
2 parents 03ae619 + 5ca6bb1
commit bed67cc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,19 +10,19 @@ 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
     hooks:
       - 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: ['<dbt-adapter>', 'sqlfluff-templater-dbt']
diff --git 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
@@ -1,3 +1,4 @@
 SELECT *
 FROM
-    adtech.companies_by_d30_counts;
+    adtech.companies_parent_by_d30_counts
+WHERE category_id IN :categories;