refactor: code structure

prefeitura-rio · Jul 26, 2024 · 61c5215 · 61c5215
1 parent 2fc7b5d
commit 61c5215
Show file tree

Hide file tree

Showing 97 changed files with 138 additions and 1,699 deletions.
diff --git a/api/.flake8 → .flake8 b/api/.flake8 → .flake8
diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - ".github/workflows/api*"
-      - "api/**/*"
+      - "./**/*"
 
 jobs:
   lint:
@@ -21,14 +21,12 @@ jobs:
 
       - name: Set up dependencies
         run: |
-          cd api/
           pip install -U pip poetry
           poetry config virtualenvs.create false
           poetry install --with dev
 
       - name: Run linters
         run: |
-          cd api/
           task lint
 
   tests:
@@ -56,20 +54,17 @@ jobs:
 
       - name: Set up dependencies
         run: |
-          cd api/
           pip install -U pip poetry
           poetry config virtualenvs.create false
           poetry install --with dev
 
       - name: Set up database
         run: |
-          cd api/
           aerich init-db || true
           aerich upgrade || true
 
       - name: Run tests
         run: |
-          cd api/
           task test
 
   deploy:
@@ -109,8 +104,8 @@ jobs:
       - name: Build and push image
         uses: docker/build-push-action@v2
         with:
-          context: api/
-          file: api/Dockerfile
+          context: .
+          file: ./Dockerfile
           push: true
           tags: |
             us-central1-docker.pkg.dev/rj-sms/docker/prontuario-integrado:${{ github.sha }}

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,135 @@
-.vscode/launch.json
-.env
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env*
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# VSCode project settings
+.vscode/
+
+# Generated API keys
+api-key*.txt
diff --git a/api/.kubernetes.yaml → .kubernetes.yaml b/api/.kubernetes.yaml → .kubernetes.yaml
diff --git a/api/Dockerfile → Dockerfile b/api/Dockerfile → Dockerfile
diff --git a/api/.gitignore b/api/.gitignore
diff --git a/api/app/__init__.py → app/__init__.py b/api/app/__init__.py → app/__init__.py
diff --git a/api/app/config/__init__.py → app/config/__init__.py b/api/app/config/__init__.py → app/config/__init__.py
diff --git a/api/app/config/base.py → app/config/base.py b/api/app/config/base.py → app/config/base.py
diff --git a/api/app/config/dev.py → app/config/dev.py b/api/app/config/dev.py → app/config/dev.py
diff --git a/api/app/config/prod.py → app/config/prod.py b/api/app/config/prod.py → app/config/prod.py
diff --git a/api/app/datalake/__init__.py → app/datalake/__init__.py b/api/app/datalake/__init__.py → app/datalake/__init__.py
diff --git a/api/app/datalake/formatters.py → app/datalake/formatters.py b/api/app/datalake/formatters.py → app/datalake/formatters.py
diff --git a/api/app/datalake/models.py → app/datalake/models.py b/api/app/datalake/models.py → app/datalake/models.py
diff --git a/api/app/datalake/uploader.py → app/datalake/uploader.py b/api/app/datalake/uploader.py → app/datalake/uploader.py
diff --git a/api/app/datalake/utils.py → app/datalake/utils.py b/api/app/datalake/utils.py → app/datalake/utils.py
diff --git a/api/app/db.py → app/db.py b/api/app/db.py → app/db.py
diff --git a/api/app/dependencies.py → app/dependencies.py b/api/app/dependencies.py → app/dependencies.py
diff --git a/api/app/enums.py → app/enums.py b/api/app/enums.py → app/enums.py
diff --git a/api/app/main.py → app/main.py b/api/app/main.py → app/main.py
diff --git a/api/app/models.py → app/models.py b/api/app/models.py → app/models.py
diff --git a/api/app/pydantic_models.py → app/pydantic_models.py b/api/app/pydantic_models.py → app/pydantic_models.py
diff --git a/api/app/routers/__init__.py → app/routers/__init__.py b/api/app/routers/__init__.py → app/routers/__init__.py
diff --git a/api/app/routers/auth.py → app/routers/auth.py b/api/app/routers/auth.py → app/routers/auth.py
diff --git a/api/app/routers/entities.py → app/routers/entities.py b/api/app/routers/entities.py → app/routers/entities.py
diff --git a/api/app/routers/entities_mrg.py → app/routers/entities_mrg.py b/api/app/routers/entities_mrg.py → app/routers/entities_mrg.py
diff --git a/api/app/routers/entities_raw.py → app/routers/entities_raw.py b/api/app/routers/entities_raw.py → app/routers/entities_raw.py
diff --git a/api/app/routers/entities_std.py → app/routers/entities_std.py b/api/app/routers/entities_std.py → app/routers/entities_std.py
diff --git a/api/app/utils.py → app/utils.py b/api/app/utils.py → app/utils.py
diff --git a/api/app/validators.py → app/validators.py b/api/app/validators.py → app/validators.py
diff --git a/api/compose-entrypoint.sh → compose-entrypoint.sh b/api/compose-entrypoint.sh → compose-entrypoint.sh
diff --git a/api/data/city.csv → data/city.csv b/api/data/city.csv → data/city.csv
diff --git a/api/data/conditioncode.csv → data/conditioncode.csv b/api/data/conditioncode.csv → data/conditioncode.csv
diff --git a/api/data/country.csv → data/country.csv b/api/data/country.csv → data/country.csv
diff --git a/api/data/datasource.csv → data/datasource.csv b/api/data/datasource.csv → data/datasource.csv
diff --git a/api/data/gender.csv → data/gender.csv b/api/data/gender.csv → data/gender.csv
diff --git a/api/data/meta.json → data/meta.json b/api/data/meta.json → data/meta.json
diff --git a/api/data/nationality.csv → data/nationality.csv b/api/data/nationality.csv → data/nationality.csv
diff --git a/api/data/ocupacao_cbo.csv → data/ocupacao_cbo.csv b/api/data/ocupacao_cbo.csv → data/ocupacao_cbo.csv
diff --git a/api/data/ocupacao_familias.csv → data/ocupacao_familias.csv b/api/data/ocupacao_familias.csv → data/ocupacao_familias.csv
diff --git a/api/data/race.csv → data/race.csv b/api/data/race.csv → data/race.csv
diff --git a/api/data/state.csv → data/state.csv b/api/data/state.csv → data/state.csv
diff --git a/api/docker-compose.yaml → docker-compose.yaml b/api/docker-compose.yaml → docker-compose.yaml
diff --git a/api/kustomization.yaml → kustomization.yaml b/api/kustomization.yaml → kustomization.yaml
diff --git a/lib/.flake8 b/lib/.flake8