Merge branch 'master' into 'production'

fix mypy flake

See merge request !42

server/api/routes/annotations.py

@@ -2,16 +2,15 @@ import uuid
 from typing import TYPE_CHECKING
 
 from pydantic import BaseModel
-from sqlalchemy import select, asc, join, and_, text
+from sqlalchemy import select, text
 from sqlalchemy.orm import load_only
-from sqlalchemy.dialects.postgresql import json
 from fastapi import APIRouter, Depends, HTTPException, status as http_status, Query
 
 from nacsos_data.db.schemas import \
     BotAnnotationMetaData, \
     AssignmentScope, \
     User, \
-    Annotation, Assignment
+    Annotation
 from nacsos_data.models.annotations import \
     AnnotationSchemeModel, \
     AssignmentScopeModel, \

server/api/routes/auth.py

@@ -2,15 +2,15 @@ from typing import TYPE_CHECKING
 
 from fastapi import APIRouter, Depends
 from fastapi.security import OAuth2PasswordRequestForm
-from nacsos_data.db.schemas.users import AuthToken
 from sqlalchemy import select
 
+from nacsos_data.db.schemas.users import AuthToken
 from nacsos_data.models.users import UserModel, AuthTokenModel
 
 from server.api.errors import NoDataForKeyError
 from server.util.security import get_current_active_user, auth_helper, InvalidCredentialsError, NotAuthenticated
 from server.util.logging import get_logger
-from server import db_engine
+from server.data import db_engine
 
 if TYPE_CHECKING:
     from sqlalchemy.ext.asyncio import AsyncSession  # noqa F401

server/api/routes/users.py

 from typing import TYPE_CHECKING
-import uuid
 
-from fastapi import APIRouter, Depends, Query, HTTPException, status as http_status
+from fastapi import APIRouter, Depends, Query
 
 from nacsos_data.models.users import UserModel, UserInDBModel, UserBaseModel
 from nacsos_data.util.auth import UserPermissions
@@ -82,7 +81,12 @@ async def save_user_self(user: UserInDBModel | UserModel,
         raise UserPermissionError('This is not you!')
 
     async with db_engine.session() as session:  # type: AsyncSession
-        user_db: User | None = (await session.scalars(select(User).where(User.user_id == str(user.user_id)))).one_or_none()
+        user_db: User | None = (await session.scalars(select(User)
+                                                      .where(User.user_id == str(current_user.user_id)))
+                                ).one_or_none()
+
+        if user_db is None:
+            raise DataNotFoundWarning('User does not exist (this error should never happen)!')
 
         password: str | None = getattr(user, 'password', None)
         if password is not None: