diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 9016a0a..69cbc32 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -36,37 +36,36 @@ jobs: - name: Run Mypy uses: jashparekh/mypy-action@v2 with: - path: "app" mypy_version: "0.910" requirement_files: "app/requirements.txt" python_version: "3.12" -# Tests: -# runs-on: ubuntu-latest -# steps: -# - name: Checkout repository -# uses: actions/checkout@v2 -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v1 -# - name: Run Docker Compose -# run: docker compose -f docker-compose.yaml up -d -# - name: Check Docker container -# run: sleep 3 -# - -# run: docker ps -a -# - -# run: docker compose logs -# - name: Test Docker Start -# run: curl http://127.0.0.1:8000 -# - -# run: curl http://localhost:8000/unique_notes -# - uses: actions/setup-python@v2 -# with: -# python-version: '3.12' -# architecture: 'x64' -# - name: Install requirements -# run: pip install -r requirements.txt -# - name: Run tests -# run: coverage run -m pytest tests/test_application.py -# - name: Tests report -# run: coverage report \ No newline at end of file + Tests: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Run Docker Compose + run: docker compose -f docker-compose.yaml up -d + - name: Check Docker container + run: sleep 3 + - + run: docker ps -a + - + run: docker compose logs + - name: Test Docker Start + run: curl http://127.0.0.1:8000 + - + run: curl http://localhost:8000/unique_notes + - uses: actions/setup-python@v2 + with: + python-version: '3.12' + architecture: 'x64' + - name: Install requirements + run: pip install -r requirements.txt + - name: Run tests + run: coverage run -m pytest tests/test_application.py + - name: Tests report + run: coverage report \ No newline at end of file diff --git a/app/models.py b/app/models.py index 4641f3a..7cb3a28 100644 --- a/app/models.py +++ b/app/models.py @@ -1,3 +1,5 @@ +import typing + from sqlalchemy import Boolean, Column, ForeignKey, Integer, String from sqlalchemy.dialects.postgresql import ARRAY, JSON from sqlalchemy.orm import DeclarativeBase, relationship @@ -13,7 +15,7 @@ class Coffee(Base): title = Column(String(200), nullable=False) origin = Column(String(200)) intensifier = Column(String(100)) - notes = Column(ARRAY(String(100))) + notes : Column[list[str]] = Column(ARRAY(String)) def __repr__(self): return f"Coffee(id={self.id}),title={self.title}, origin={self.origin}, intensifier={self.intensifier}, notes={self.notes}"