Merge pull request #466 from Hexlet/sql-rework

rework fetchdata to fix n+1 queries

Dockerfile.dev

@@ -4,7 +4,6 @@ ENV PYTHONFAULTHANDLER=1 \
     PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
-    POETRY_VERSION=1.2.2 \
     POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_CREATE=false \
     POETRY_CACHE_DIR='/var/cache/pypoetry' \
@@ -14,8 +13,8 @@ WORKDIR /usr/local/src/hexlet-friends
 
 COPY pyproject.toml poetry.lock ./
 
-RUN apt-get update \
-    && apt-get install -y curl make git \
-    && curl -sSL https://install.python-poetry.org | python3 - && poetry --version \
-    && git config --global --add safe.directory `pwd` \
-    && poetry install --extras psycopg2-binary
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends curl make git && \
+    pip install --no-cache-dir poetry && poetry --version && \
+    git config --global --add safe.directory "$(pwd)" && \
+    poetry install --extras psycopg2-binary

Makefile

@@ -61,7 +61,10 @@ secretkey:
 
 setup: install
 	$(MAKE) migrate
-	poetry run python manage.py createsuperuser --noinput --username admin --email [email protected]
+	$(MAKE) updatesuperuser
+
+updatesuperuser:
+	poetry run python manage.py updatesuperuser --username admin --email [email protected]
 
 shell:
 	poetry run python manage.py shell_plus --plain