refactor: remove scheduler_py and resolve imports

gilsondev · Dec 20, 2023 · e01d16f · e01d16f
1 parent 484e0df
commit e01d16f
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 1,245 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -29,8 +29,8 @@ services:
 
   alembic:
     build:
-      context: ./api
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: Dockerfile.api
     image: checkstatusgovbr/db-migration
     ports:
       - "8000:8000"
@@ -58,8 +58,8 @@ services:
 
   alembic-test:
     build:
-      context: ./api
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: Dockerfile.api
     image: checkstatusgovbr/db-migration
     ports:
       - "8000:8000"

diff --git a/scheduler_py/src/cancelled_domains.py → pipeline/src/cancelled_domains.py b/scheduler_py/src/cancelled_domains.py → pipeline/src/cancelled_domains.py
diff --git a/pipeline/src/main.py b/pipeline/src/main.py
@@ -1,12 +1,13 @@
 import sentry_sdk
+from cancelled_domains import update_domains as update_cancelled_domains
 from collect_csv import prepare_dataset
 from collect_rdap import collect_domain_rdap_data
 from ingestion import ingestion_data
 from normalize import normalize_data
 from sentry_sdk import set_tag
 
-from shared.database_py import create_connection
-from shared.database_py import create_cursor
+from shared.database_py.database import create_connection
+from shared.database_py.database import create_cursor
 
 sentry_sdk.init(
     dsn="https://011f53de8eea0a53cb44e163d0453eb5@o4506032925900800.ingest.sentry.io/4506032926031872",
@@ -27,6 +28,8 @@
 
     ingestion_data(df, cursor)
 
+    update_cancelled_domains(cursor)
+
     conn.commit()
     conn.close()
     cursor.close()
diff --git a/scheduler_py/tests/test_cancelled_domains.py → pipeline/tests/test_cancelled_domains.py b/scheduler_py/tests/test_cancelled_domains.py → pipeline/tests/test_cancelled_domains.py
@@ -1,9 +1,9 @@
 from unittest.mock import MagicMock
 from unittest.mock import patch
 
-from src.cancelled_domains import CANCELLED_DOMAINS_CSV
-from src.cancelled_domains import get_cancelled_domains
-from src.cancelled_domains import update_domains
+from pipeline.src.cancelled_domains import CANCELLED_DOMAINS_CSV
+from pipeline.src.cancelled_domains import get_cancelled_domains
+from pipeline.src.cancelled_domains import update_domains
 
 
 @patch("src.cancelled_domains.get_cancelled_domains")

diff --git a/scheduler_py/Dockerfile b/scheduler_py/Dockerfile
diff --git a/scheduler_py/poetry.lock b/scheduler_py/poetry.lock
diff --git a/scheduler_py/pyproject.toml b/scheduler_py/pyproject.toml
diff --git a/scheduler_py/setup.cfg b/scheduler_py/setup.cfg
diff --git a/scheduler_py/src/__init__.py b/scheduler_py/src/__init__.py
diff --git a/scheduler_py/src/main.py b/scheduler_py/src/main.py
diff --git a/scheduler_py/src/ping.py b/scheduler_py/src/ping.py
diff --git a/scheduler_py/tests/__init__.py b/scheduler_py/tests/__init__.py
diff --git a/scheduler_py/tests/test_ping.py b/scheduler_py/tests/test_ping.py