Merge branch 'main' of dev.discours.io:discoursio-api into feature/refactoring-services

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:slim
 WORKDIR /app
 
-EXPOSE 80
+EXPOSE 8080
 # ADD nginx.conf.sigil ./
 COPY requirements.txt .
 RUN apt-get update && apt-get install -y build-essential git

resolvers/load.py

@@ -1,6 +1,4 @@
 from datetime import datetime, timedelta, timezone
-from sqlalchemy.engine import ObjectKind
-
 from sqlalchemy.orm import joinedload, aliased
 from sqlalchemy.sql.expression import (
     desc,
@@ -15,9 +13,8 @@ from sqlalchemy.sql.expression import (
 
 from auth.authenticate import login_required
 from auth.credentials import AuthCredentials
-from base.exceptions import ObjectNotExist  # , OperationNotAllowed
-from base.orm import local_session
-from base.resolvers import query
+from services.db import local_session
+from services.schema import query
 from orm import TopicFollower
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutAuthor, ShoutTopic

settings.py

@@ -1,6 +1,6 @@
 from os import environ
 
-PORT = 80
+PORT = 8080
 
 DB_URL = (
     environ.get("DATABASE_URL") or environ.get("DB_URL") or