Added "Try again" as a default solution message

Seluj78 · Seluj78 · commit fd884a4215a1 · 2020-06-28T10:43:52.000+02:00
diff --git a/backend/PyMatcha/models/user.py b/backend/PyMatcha/models/user.py
@@ -110,16 +110,15 @@ def create(
         # Check correct gender
         if gender not in ["male", "female", "other"]:
             logging.error("Gender must be male, female or other, not {}".format(gender))
-            raise ConflictError("Gender must be male, female or other, not {}".format(gender), "Try again")
+            raise ConflictError("Gender must be male, female or other, not {}".format(gender))
 
         # Check correct orientation
         if orientation not in ["heterosexual", "homosexual", "bisexual", "other"]:
             logging.error(
                 "Sexual Orientation must be heterosexual, homosexual, bisexual or other, not {}".format(orientation)
             )
             raise ConflictError(
-                "Sexual Orientation must be heterosexual, homosexual, bisexual or other, not {}".format(orientation),
-                "Try again",
+                "Sexual Orientation must be heterosexual, homosexual, bisexual or other, not {}".format(orientation)
             )
 
         # Check correct geohash
@@ -521,6 +520,6 @@ def get_user(uid: Any[int, str]) -> Optional[User]:
     # If none of those worked, throw an error
     if not_found == 3:
         logging.debug("User {} not found.".format(uid))
-        raise NotFoundError("User {} not found.".format(uid), "Try again with another uid")
+        raise NotFoundError("User {} not found.".format(uid))
     logging.debug("Found user {} from {}".format(f_user.id, uid))
     return f_user
diff --git a/backend/PyMatcha/routes/api/auth/login.py b/backend/PyMatcha/routes/api/auth/login.py
@@ -55,10 +55,10 @@ def auth_login():
         u = get_user(username)
     except NotFoundError:
         current_app.logger.debug("/auth/login -> User not found")
-        raise UnauthorizedError("Incorrect username or password", "Try again")
+        raise UnauthorizedError("Incorrect username or password")
     if not u.check_password(password):
         current_app.logger.debug("/auth/login -> Password invalid")
-        raise UnauthorizedError("Incorrect username or password", "Try again")
+        raise UnauthorizedError("Incorrect username or password")
 
     if not u.is_confirmed:
         current_app.logger.debug("/auth/login -> User is trying to login unconfirmed")
diff --git a/backend/PyMatcha/routes/api/auth/password.py b/backend/PyMatcha/routes/api/auth/password.py
@@ -82,12 +82,12 @@ def reset_password():
     else:
         if token_type != "reset":
             current_app.logger.debug("/auth/password/reset -> Wrong token type")
-            raise BadRequestError("Wrong token type", "Try again with the correct type")
+            raise BadRequestError("Wrong token type")
         try:
             u = get_user(email)
         except NotFoundError:
             current_app.logger.debug("/auth/password/reset -> User not found")
-            raise NotFoundError("User not found", "Try again with another user.")
+            raise NotFoundError("User not found")
         if u.previous_reset_token == data["token"]:
             current_app.logger.debug("/auth/password/reset -> Token already used")
             raise BadRequestError("Token already used", "Please request a new one")
diff --git a/backend/PyMatcha/routes/api/debug.py b/backend/PyMatcha/routes/api/debug.py
@@ -35,7 +35,7 @@ def debug_confirm_user(uid):
         u = get_user(uid)
     except NotFoundError:
         current_app.logger.debug("/debug/users/confirm -> User not found")
-        raise NotFoundError("User {} not found".format(uid), "Check the uid and try again")
+        raise NotFoundError("User {} not found".format(uid))
     if u.is_confirmed:
         current_app.logger.debug("/debug/users/confirm -> User already confirmed")
         return Success("User already confirmed.")
@@ -53,7 +53,7 @@ def delete_user(uid):
     try:
         u = get_user(uid)
     except NotFoundError:
-        raise NotFoundError("User {} not found".format(uid), "Check given id and try again")
+        raise NotFoundError("User {} not found".format(uid))
     else:
         current_app.logger.info("/debug/users/{} -> DELETE user {}".format(uid, uid))
         u.delete()
diff --git a/backend/PyMatcha/routes/api/like.py b/backend/PyMatcha/routes/api/like.py
@@ -18,11 +18,11 @@ def like_profile(uid):
     try:
         u = get_user(uid)
     except NotFoundError:
-        raise NotFoundError(f"User {uid} not found", "try again")
+        raise NotFoundError(f"User {uid} not found")
     if current_user.id == u.id:
-        raise BadRequestError("Cannot like yourself", "Try again")
+        raise BadRequestError("Cannot like yourself")
     if current_user.already_likes(u.id):
-        raise BadRequestError("You already liked this person", "Try again")
+        raise BadRequestError("You already liked this person")
     Like.create(liker_id=current_user.id, liked_id=u.id)
 
     if u.already_likes(current_user.id):
@@ -38,11 +38,11 @@ def unlike_profile(uid):
     try:
         u = get_user(uid)
     except NotFoundError:
-        raise NotFoundError(f"User {uid} not found", "try again")
+        raise NotFoundError(f"User {uid} not found")
     if current_user.id == u.id:
-        raise BadRequestError("Cannot unlike yourself", "Try again")
+        raise BadRequestError("Cannot unlike yourself")
     if not current_user.already_likes(u.id):
-        raise BadRequestError("You never liked this person in the first place", "Try again")
+        raise BadRequestError("You never liked this person in the first place")
     Like.get_multi(liked_id=u.id, liker_id=current_user.id).delete()
     return Success(f"Unliked user {u.id}.")
 
diff --git a/backend/PyMatcha/routes/api/messages.py b/backend/PyMatcha/routes/api/messages.py
@@ -68,10 +68,10 @@ def send_message():
     try:
         to_user = get_user(to_uid)
     except NotFoundError:
-        raise NotFoundError(f"Recipient {to_uid} not found", "Try again")
+        raise NotFoundError(f"Recipient {to_uid} not found")
 
     if current_user.id == to_user.id:
-        raise BadRequestError("Cannot send a message to yourself.", "Try again")
+        raise BadRequestError("Cannot send a message to yourself.")
 
     current_user.send_message(to_id=to_user.id, content=content)
     current_app.logger.debug("/messages -> Message successfully sent to {}.".format(to_uid))
@@ -85,7 +85,7 @@ def get_conversation_messsages(with_uid):
     try:
         with_user = get_user(with_uid)
     except NotFoundError:
-        raise NotFoundError("With user {} not found", "Try again")
+        raise NotFoundError("With user {} not found")
     message_list = current_user.get_messages_with_user(with_user.id)
     message_list = [m.to_dict() for m in message_list]
     return SuccessOutput("messages", message_list)
@@ -97,7 +97,7 @@ def see_conversation_messages(with_uid):
     try:
         with_user = get_user(with_uid)
     except NotFoundError:
-        raise NotFoundError(f"With user {with_uid} not found", "Try again")
+        raise NotFoundError(f"With user {with_uid} not found")
     unseen_messages = Message.get_multis(from_id=with_user.id, to_id=current_user.id, is_seen=False)
     if unseen_messages:
         for message in unseen_messages:
@@ -112,9 +112,9 @@ def like_message(message_id):
     try:
         message = Message.get(message_id)
     except NotFoundError:
-        raise NotFoundError(f"Message {message_id} not found", "Try again")
+        raise NotFoundError(f"Message {message_id} not found")
     if message.to_id != current_user.id:
-        raise BadRequestError("Cannot like a message that isn't destined to you", "Try again")
+        raise BadRequestError("Cannot like a message that isn't destined to you")
     message.is_liked = True
     message.save()
     return Success(f"Liked message {message_id}")
diff --git a/backend/PyMatcha/routes/api/profile/complete.py b/backend/PyMatcha/routes/api/profile/complete.py
@@ -50,22 +50,22 @@ def complete_profile():
     try:
         birthdate = datetime.datetime.strptime(birthdate, "%d/%m/%Y").date()
     except ValueError:
-        raise BadRequestError("Birthdate format must be %d/%m/%Y (day/month/year)", "Try again")
+        raise BadRequestError("Birthdate format must be %d/%m/%Y (day/month/year)")
 
     if len(bio) <= 50:
-        raise BadRequestError("Bio is too short", "Try again")
+        raise BadRequestError("Bio is too short")
 
     if len(tags) < 3:
-        raise BadRequestError("At least 3 tags are required", "Try again")
+        raise BadRequestError("At least 3 tags are required")
 
     if len(tags) != len(set(tags)):
-        raise BadRequestError("Duplicate tags", "Try again")
+        raise BadRequestError("Duplicate tags")
 
     today = datetime.datetime.utcnow()
 
     age = today.year - birthdate.year - ((today.month, today.day) < (birthdate.month, birthdate.day))
     if age < 18:
-        raise BadRequestError("You must be 18 years old or older", "Try again later")
+        raise BadRequestError("You must be 18 years old or older")
 
     for tag in tags:
         Tag.create(name=tag, user_id=current_user.id)
diff --git a/backend/PyMatcha/routes/api/profile/edit.py b/backend/PyMatcha/routes/api/profile/edit.py
@@ -69,26 +69,26 @@ def edit_profile():
     try:
         birthdate = datetime.datetime.strptime(birthdate, "%d/%m/%Y").date()
     except ValueError:
-        raise BadRequestError("Birthdate format must be %d/%m/%Y (day/month/year)", "Try again")
+        raise BadRequestError("Birthdate format must be %d/%m/%Y (day/month/year)")
 
     today = datetime.datetime.utcnow()
 
     age = today.year - birthdate.year - ((today.month, today.day) < (birthdate.month, birthdate.day))
     if age < 18:
-        raise BadRequestError("You must be 18 years old or older", "Try again later")
+        raise BadRequestError("You must be 18 years old or older")
 
     try:
         get_user(username)
     except NotFoundError:
         pass
     else:
-        raise BadRequestError("Username taken", "Try again")
+        raise BadRequestError("Username taken")
 
     if orientation not in ["heterosexual", "homosexual", "bisexual", "other"]:
-        raise BadRequestError("Orientation must be heterosexual, homosexual, bisexual or other", "Try again")
+        raise BadRequestError("Orientation must be heterosexual, homosexual, bisexual or other")
 
     if gender not in ["male", "female", "other"]:
-        raise BadRequestError("Gender must be male, female or other", "Try again")
+        raise BadRequestError("Gender must be male, female or other")
 
     current_user.first_name = first_name
     current_user.last_name = last_name
@@ -108,7 +108,7 @@ def edit_email():
     data = request.get_json()
     new_email = data["email"].lower()
     if current_user.email == new_email:
-        raise BadRequestError("The new email is the same as the old one !", "Try again")
+        raise BadRequestError("The new email is the same as the old one !")
     current_user.email = new_email
     current_user.is_confirmed = False
     current_user.save()
@@ -127,7 +127,7 @@ def edit_password():
     old_password = data["old_password"]
     new_password = data["new_password"]
     if not current_user.check_password(old_password):
-        raise UnauthorizedError("Incorrect password", "Try again")
+        raise UnauthorizedError("Incorrect password")
     current_user.password = hash_password(new_password)
     current_user.save()
     send_mail_text.delay(
diff --git a/backend/PyMatcha/routes/api/profile/report.py b/backend/PyMatcha/routes/api/profile/report.py
@@ -38,7 +38,7 @@ def report_profile(uid):
     reason = data["reason"]
 
     if reason not in ["harassment", "bot", "spam", "inappropriate content"]:
-        raise BadRequestError("Reason must be 'harassment', 'bot', 'spam' or 'inappropriate content'", "Try again")
+        raise BadRequestError("Reason must be 'harassment', 'bot', 'spam' or 'inappropriate content'")
 
     try:
         details = data["details"]
@@ -47,9 +47,9 @@ def report_profile(uid):
     try:
         u = get_user(uid)
     except NotFoundError:
-        raise NotFoundError(f"User {uid} not found", "try again")
+        raise NotFoundError(f"User {uid} not found")
     if current_user.id == u.id:
-        raise BadRequestError("Cannot report yourself", "Try again")
+        raise BadRequestError("Cannot report yourself")
     Report.create(reporter_id=current_user.id, reported_id=u.id, reason=reason, details=details)
 
     return Success(f"Report created on user {u.email}")
diff --git a/backend/PyMatcha/routes/api/profile/view.py b/backend/PyMatcha/routes/api/profile/view.py
@@ -41,7 +41,7 @@ def view_profile(uid):
     try:
         u = get_user(uid)
     except NotFoundError:
-        raise NotFoundError(f"User {uid} not found", "try again")
+        raise NotFoundError(f"User {uid} not found")
 
     if current_user.id != u.id:
         View.create(profile_id=u.id, viewer_id=current_user.id)
diff --git a/backend/PyMatcha/routes/api/user.py b/backend/PyMatcha/routes/api/user.py
@@ -47,7 +47,7 @@ def get_one_user(uid):
     try:
         u = get_user(uid)
     except NotFoundError:
-        raise NotFoundError("User {} not found".format(uid), "Check given uid and try again")
+        raise NotFoundError("User {} not found".format(uid))
     else:
         current_app.logger.info("/users/{} -> Returning info on user {}".format(uid, uid))
         return jsonify(u.to_dict())
diff --git a/backend/PyMatcha/utils/decorators.py b/backend/PyMatcha/utils/decorators.py
@@ -21,11 +21,11 @@ def wrapper(*args, **kwargs):
             try:
                 data = request.get_json()
             except BadRequest:
-                raise BadRequestError("The Json Body is malformed", "Please check it and try again")
+                raise BadRequestError("The Json Body is malformed")
 
             # If the data dict is empty
             if not data:
-                raise BadRequestError("Missing json body.", "Please fill your json body")
+                raise BadRequestError("Missing json body.")
 
             missing = []
             for item in required.keys():
@@ -48,7 +48,7 @@ def wrapper(*args, **kwargs):
                     if required[key] == int:
                         pass
                     else:
-                        raise BadRequestError(f"The item {key} cannot be None or empty", "Please try again.")
+                        raise BadRequestError(f"The item {key} cannot be None or empty")
 
             wrong_types = [r for r in required.keys() if not isinstance(data[r], required[r])]
             wrong_types += [r for r in optional.keys() if r in data and not isinstance(data[r], optional[r])]
@@ -72,9 +72,9 @@ def decorated_function(*args, **kwargs):
         token = request.headers.get("debug-auth-token", None)
         if token:
             if token != os.getenv("DEBUG_AUTH_TOKEN"):
-                raise UnauthorizedError("Incorrect debug auth token.", "Try again")
+                raise UnauthorizedError("Incorrect debug auth token.")
         else:
-            raise UnauthorizedError("Missing debug auth token.", "Try again")
+            raise UnauthorizedError("Missing debug auth token.")
         return f(*args, **kwargs)
 
     return decorated_function
diff --git a/backend/PyMatcha/utils/errors/badrequest.py b/backend/PyMatcha/utils/errors/badrequest.py
@@ -25,7 +25,7 @@ class BadRequestError(Exception):
     This is the BadRequestError class for the Exception.
     """
 
-    def __init__(self, msg: str, solution: str) -> None:
+    def __init__(self, msg: str, solution: str = "Try again.") -> None:
         self.name = "Bad Request"
         self.msg = msg
         self.solution = solution
diff --git a/backend/PyMatcha/utils/errors/conflict.py b/backend/PyMatcha/utils/errors/conflict.py
@@ -25,7 +25,7 @@ class ConflictError(Exception):
     This is the ConflictError class for the Exception.
     """
 
-    def __init__(self, msg: str, solution: str) -> None:
+    def __init__(self, msg: str, solution: str = "Try again.") -> None:
         self.name = "Conflict Error"
         self.msg = msg
         self.solution = solution
diff --git a/backend/PyMatcha/utils/errors/forbidden.py b/backend/PyMatcha/utils/errors/forbidden.py
@@ -25,7 +25,7 @@ class ForbiddenError(Exception):
     This is the ForbiddenError class for the Exception.
     """
 
-    def __init__(self, msg: str, solution: str) -> None:
+    def __init__(self, msg: str, solution: str = "Try again.") -> None:
         self.name = "Forbidden Error"
         self.msg = msg
         self.solution = solution
diff --git a/backend/PyMatcha/utils/errors/notfound.py b/backend/PyMatcha/utils/errors/notfound.py
@@ -25,7 +25,7 @@ class NotFoundError(Exception):
     This is the NotFoundError class for the Exception.
     """
 
-    def __init__(self, msg: str, solution: str) -> None:
+    def __init__(self, msg: str, solution: str = "Try again.") -> None:
         self.name = "Not Found Error"
         self.msg = msg
         self.solution = solution
diff --git a/backend/PyMatcha/utils/errors/unauthorized.py b/backend/PyMatcha/utils/errors/unauthorized.py
@@ -25,7 +25,7 @@ class UnauthorizedError(Exception):
     This is the UnauthorizedError class for the Exception.
     """
 
-    def __init__(self, msg: str, solution: str) -> None:
+    def __init__(self, msg: str, solution: str = "Try again.") -> None:
         self.name = "Unauthorized Error"
         self.msg = msg
         self.solution = solution
