replace db and backend

Author: WillSams

.gitignore

@@ -83,30 +83,8 @@ profile_default/
 ipython_config.py
 
 # pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .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
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
+ .python-version
+
 .pdm.toml
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
@@ -165,4 +143,3 @@ serverless.yaml
 
 *-lock.json
 
-logs/

.husky/pre-commit

@@ -1,6 +1,10 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-./node_modules/.bin/prettier frontend/src/**/*.js --single-quote --trailing-comma es5 --write
-./node_modules/.bin/eslint frontend/src --ignore-pattern 'frontend/src/public/' --fix
+npm run format:backend
+npm run lint:backend
+
+npm run format:frontend
+npm run lint:frontend
+
 git add .

.husky/pre-push

@@ -1,6 +1,6 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run test:frontend
 npm run test:backend
+npm run test:frontend
 

backend/.flake8

@@ -0,0 +1,5 @@
+[flake8]
+max-line-length = 88
+ignore =
+    E203, 
+    W503

backend/.isort.cfg

@@ -0,0 +1,6 @@
+[settings]
+line_length=88
+multi_line_output=3
+include_trailing_comma=True
+use_parentheses=True
+force_grid_wrap=0

backend/Dockerfile

@@ -1,11 +1,25 @@
-FROM python:3.11
+FROM python:3.8.3
 
-ARG API_PORT=80
+ARG RESERVATION_PORT=80
+ARG ENV
+ARG PG_URL
+ARG IS_DEBUG
+ARG SECRET_KEY
+ARG REFRESH_SECRET_KEY
 
-WORKDIR /app
+ENV RESERVATION_PORT=${RESERVATION_PORT}
+ENV ENV=${ENV}
+ENV PG_URL=${PG_URL}
+ENV IS_DEBUG=${IS_DEBUG}
+ENV SECRET_KEY=${SECRET_KEY}
+ENV REFRESH_SECRET_KEY=${REFRESH_SECRET_KEY}
 
+WORKDIR /app
 COPY ./src/ /app/
-COPY ./schema.graphql /app/ 
-RUN pip install --upgrade pip && pip install --no-cache-dir -r requirements_docker.txt
- 
+COPY ./schema.graphql /app/
+RUN mkdir logs
+COPY ./requirements-docker.txt ./requirements.txt
+RUN pip install --upgrade pip && pip install --no-cache-dir -r requirements.txt
+
+EXPOSE ${RESERVATION_PORT}
 CMD ["python", "main.py"]

backend/specs/when_generating_an_access_token.py renamed to backend/logs/.deleteme

@@ -0,0 +1,3 @@
+#!/bin/bash
+isort --line-length 88 .
+black ./

backend/requirements-docker.txt

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+flake8 src/ specs/
+find "$(pwd)/src" -type f -name "\"*.py\"" ! -name "\"*test_*\"" \
+    -exec python -m mypy {} +

backend/scripts/format.sh

@@ -0,0 +1,5 @@
+export ENV=test
+export PYTHONDONTWRITEBYTECODE=1
+
+find . -name "__pycache__" -exec rm -r {} +
+python -m pytest --cov=src --cov-report term

backend/scripts/lint.sh

@@ -1,27 +1 @@
-import pytest
-
-from sqlalchemy.orm import Session
-
-from api.models import Reservation, Room
-
-
-@pytest.fixture
-def mock_db_session(mocker):
-    return mocker.MagicMock(spec=Session)
-
-
-@pytest.fixture
-def patch_db_to_resolvers(mocker, mock_db_session):
-    mocker.patch("api.resolvers.queries.DbSession", return_value=mock_db_session)
-    mocker.patch("api.resolvers.mutations.DbSession", return_value=mock_db_session)
-    yield mocker
-
-
-@pytest.fixture
-def mock_is_room_available(mocker):
-    return mocker.patch("api.resolvers.queries.is_room_available")
-
-
-@pytest.fixture
-def mock_room(mocker):
-    return mocker.MagicMock(spec=Room)
+MOCK_EXECUTION_CONTEXT = {"context_key": "context_value"}

backend/scripts/test.sh

@@ -1,53 +1,43 @@
+from datetime import datetime
+
 import pytest
+from asyncpg import Pool
 
-from api.resolvers.queries import get_all_reservations_resolver
 from api.models import Reservation
+from api.resolvers.queries import get_all_reservations_resolver
 
-from . import mock_db_session, patch_db_to_resolvers
+from . import MOCK_EXECUTION_CONTEXT
 
 
 class DescribeAllReservationsResolver:
-    @pytest.mark.usefixtures("patch_db_to_resolvers")
-    def should_return_all_reservations_resolver(
-        self,
-        mock_db_session,
-    ):
-        mock_reservations = [
+    @pytest.mark.asyncio
+    async def should_return_all_reservations(self, mocker):
+        reservations = [
             Reservation(
                 id=1,
                 room_id="room_1",
-                checkin_date="2023-01-01",
-                checkout_date="2023-01-03",
+                checkin_date=datetime(2023, 1, 1, 5, 0),
+                checkout_date=datetime(2023, 1, 1, 5, 0),
+                total_charge=100,
             ),
             Reservation(
                 id=2,
                 room_id="room_2",
-                checkin_date="2023-01-05",
-                checkout_date="2023-01-07",
+                checkin_date=datetime(2023, 1, 1, 5, 0),
+                checkout_date=datetime(2023, 1, 1, 5, 0),
+                total_charge=200,
             ),
         ]
 
-        mock_db_session.query.return_value.all.return_value = mock_reservations
-        mock_execution_context = {"context_key": "context_value"}
+        mock_pool = mocker.AsyncMock(spec=Pool)
+        mocker.patch("asyncpg.create_pool", return_value=mock_pool)
+        mocker.patch(
+            "api.resolvers.queries.DbSession", mocker.AsyncMock(return_value=mock_pool)
+        )
+        mock_pool.fetch = mocker.AsyncMock(return_value=reservations)
 
-        result = get_all_reservations_resolver(None, mock_execution_context)
+        result = await get_all_reservations_resolver(None, MOCK_EXECUTION_CONTEXT)
 
         assert "reservations" in result
-        assert result["reservations"] == [
-            {
-                "id": 1,
-                "room_id": "room_1",
-                "checkin_date": "2023-01-01",
-                "checkout_date": "2023-01-03",
-                "total_charge": None,
-            },
-            {
-                "id": 2,
-                "room_id": "room_2",
-                "checkin_date": "2023-01-05",
-                "checkout_date": "2023-01-07",
-                "total_charge": None,
-            },
-        ]
-
-        mock_db_session.query.assert_called_once_with(Reservation)
+        assert len(result["reservations"]) == 2
+        assert result["reservations"] == reservations

backend/specs/resolvers/__init__.py

@@ -1,27 +1,69 @@
+from datetime import datetime
+
 import pytest
+from asyncpg import Pool
 
-from api.resolvers.mutations import delete_reservation_resolver
 from api.models import Reservation
+from api.resolvers.mutations import delete_reservation_resolver
 
-from . import mock_db_session, patch_db_to_resolvers
+from . import MOCK_EXECUTION_CONTEXT
 
 
 class DescribeDeleteReservationResolver:
-    @pytest.mark.usefixtures("patch_db_to_resolvers")
-    def should_delete_reservation(self, mock_db_session):
-        mock_db_session.query.return_value.all.return_value = [
+    def find_by_id(self, reservation_id):
+        return [
+            reservation
+            for reservation in self.reservations
+            if reservation.id != reservation_id
+        ]
+
+    @pytest.mark.asyncio
+    async def should_delete_existing_reservation(self, mocker):
+        original_reservations = [
             Reservation(
                 id=1,
                 room_id="room_1",
-                checkin_date="2023-01-01",
-                checkout_date="2023-01-03",
-            )
+                checkin_date=datetime(2023, 1, 1, 5, 0),
+                checkout_date=datetime(2023, 1, 1, 5, 0),
+                total_charge=100,
+            ),
+            Reservation(
+                id=2,
+                room_id="room_2",
+                checkin_date=datetime(2023, 1, 1, 5, 0),
+                checkout_date=datetime(2023, 1, 1, 5, 0),
+                total_charge=200,
+            ),
         ]
-        mock_execution_context = {"context_key": "context_value"}
 
-        result = delete_reservation_resolver(
-            None, mock_execution_context, reservationId=1
+        existing_reservation_id = 1
+        expected_reservations = [
+            reservation
+            for reservation in original_reservations
+            if reservation.id != existing_reservation_id
+        ]
+
+        mock_pool = mocker.AsyncMock(spec=Pool)
+        mocker.patch("asyncpg.create_pool", return_value=mock_pool)
+        mocker.patch(
+            "api.resolvers.mutations.DbSession",
+            mocker.AsyncMock(return_value=mock_pool),
+        )
+        mock_pool.fetch = mocker.AsyncMock(return_value=expected_reservations)
+
+        result = await delete_reservation_resolver(
+            None, MOCK_EXECUTION_CONTEXT, reservationId=existing_reservation_id
         )
 
         assert result["success"] is True
-        assert result["reservation"] is not None
+        assert len(result["reservations"]) == len(original_reservations) - 1
+        assert result["reservations"] == expected_reservations
+
+    @pytest.mark.asyncio
+    async def test_should_give_reservation_not_found(self, mocker):
+        result = await delete_reservation_resolver(
+            None, MOCK_EXECUTION_CONTEXT, reservationId=999
+        )
+
+        assert result["success"] is False
+        assert "Reservation with id of 999 not found" in result["errors"]