Added test to translation and fixed stuff

Added logs
Fixed problems with pull request
Added documentation
Added typing information

Author: annashtirberg

app/internal/translation.py

@@ -6,7 +6,8 @@
 from textblob.exceptions import NotTranslated
 
 from app.database.database import SessionLocal
-from app.database.models import User
+from loguru import logger
+from app.routers.user import get_users
 
 download_corpora.download_all()
 
@@ -19,8 +20,8 @@ def translate_text(text: str,
     Translate text to the target language
     optionally given the original language
     """
-    if len(text) <= 0:
-        return "No text to translate"
+    if not text.strip():
+        return ""
     if original_lang is None:
         original_lang = _detect_text_language(text)
     else:
@@ -50,11 +51,10 @@ def _get_user_language(user_id: int, session: SessionLocal) -> str:
     Gets a user-id and returns the language he speaks
     Uses the DB"""
     try:
-        user = (
-            session.query(User).filter(User.id == user_id).first()
-        )
+        user = get_users(session, id=user_id)[0]
         language_user = user.language
     except SQLAlchemyError:
+        logger.exception("User of user preferred language was not found in the database.")
         return ""
     else:
         return language_user
@@ -74,4 +74,8 @@ def translate_text_for_user(text: str,
 
 
 def _lang_full_to_short(full_lang: str) -> str:
+    """
+    Gets the full language name and
+    converts it to a two-letter language name
+    """
     return languages.get(name=full_lang.capitalize()).alpha2

app/routers/user.py

@@ -7,7 +7,7 @@
 from app.internal.utils import save
 
 
-def create_user(username, password, email, language, session: Session) -> User:
+def create_user(username: str, password: str, email: str, language: str, session: Session) -> User:
     """Creates and saves a new user."""
 
     user = User(

tests/test_translation.py

@@ -69,12 +69,12 @@ def test_translate_text_with_same_original_target_lang_without_original_lang(
 
 def test_translate_text_without_text_with_original_target_lang():
     answer = translate_text("", "english", "russian")
-    assert answer == "No text to translate"
+    assert answer == ""
 
 
 def test_translate_text_without_text_without_original_lang():
     answer = translate_text("", "english")
-    assert answer == "No text to translate"
+    assert answer == ""
 
 
 def test_lang_short_to_full():
@@ -126,3 +126,17 @@ def test_translate_text_with_text_impossible_to_translate(
 def test_translate_text_with_symbols(text, target_lang, original_lang):
     answer = translate_text(text, target_lang, original_lang)
     assert "@ Hello # my $ friend!" == answer
+
+
+@pytest.mark.parametrize("text, target_lang, original_lang",
+                         [("Привет мой друг", "italian", "spanish"),
+                          ("Hola mi amigo", "english", "russian"),
+                          ("Bonjour, mon ami", "russian", "german"),
+                          ("Ciao amico", "french", "german")
+                          ])
+def test_translate_text_with_with_incorrect_lang(
+        text,
+        target_lang,
+        original_lang):
+    answer = translate_text(text, target_lang, original_lang)
+    assert answer == text