remove unnecessary try block, add default registerd_on value

Author: npalaska

lib/pbench/server/api/resources/users_api.py

@@ -1,5 +1,4 @@
 import jwt
-import datetime
 from flask import request, jsonify, make_response
 from flask_restful import Resource, abort
 from flask_bcrypt import check_password_hash
@@ -127,7 +126,6 @@ def post(self):
                 first_name=first_name,
                 last_name=last_name,
                 email=email_id,
-                registered_on=datetime.datetime.now(),
             )
 
             # insert the user
@@ -472,15 +470,7 @@ def put(self, username):
             )
             abort(400, message="Invalid fields in update request payload")
         try:
-            # We will update the user object with the keys and values provided in the request payload.
-            # THe keys need to match with the column names in the user model.
             user.update(**post_data)
-        except ValueError:
-            self.logger.warning(
-                "Either provided values to update the user does not adhere to the user model "
-                "datatype or user attempted to update the protected properties."
-            )
-            abort(400, message="Invalid fields in update request payload")
         except Exception:
             self.logger.exception("Exception occurred during updating user object")
             abort(500, message="INTERNAL ERROR")

lib/pbench/server/database/alembic/env.py

@@ -11,7 +11,6 @@
 
 from alembic import context
 
-from pbench.common.exceptions import BadConfig, ConfigFileNotSpecified
 from pbench.server.database.database import Database
 from pbench.common.logger import get_pbench_logger
 from pbench.server.api import get_server_config
@@ -57,7 +56,7 @@ def run_migrations_offline():
     try:
         server_config = get_server_config()
         logger = get_pbench_logger(__name__, server_config)
-    except (ConfigFileNotSpecified, BadConfig) as e:
+    except Exception as e:
         print(e)
         sys.exit(1)
 
@@ -86,7 +85,7 @@ def run_migrations_online():
     try:
         server_config = get_server_config()
         logger = get_pbench_logger(__name__, server_config)
-    except (ConfigFileNotSpecified, BadConfig) as e:
+    except Exception as e:
         print(e)
         sys.exit(1)
 

lib/pbench/server/database/models/users.py

@@ -1,9 +1,9 @@
+import datetime
 from flask_bcrypt import generate_password_hash
 from email_validator import validate_email
 from sqlalchemy import Column, Integer, String, DateTime, LargeBinary
 from pbench.server.database.database import Database
-from sqlalchemy.orm import relationship
-from sqlalchemy.orm import validates
+from sqlalchemy.orm import relationship, validates
 
 
 class User(Database.Base):
@@ -16,7 +16,7 @@ class User(Database.Base):
     first_name = Column(String(255), unique=False, nullable=False)
     last_name = Column(String(255), unique=False, nullable=False)
     password = Column(LargeBinary(128), nullable=False)
-    registered_on = Column(DateTime, nullable=False)
+    registered_on = Column(DateTime, nullable=False, default=datetime.datetime.now())
     email = Column(String(255), unique=True, nullable=False)
     auth_tokens = relationship("ActiveTokens", backref="users")
 
@@ -39,21 +39,16 @@ def get_protected():
     @staticmethod
     def query(id=None, username=None, email=None):
         # Currently we would only query with single argument. Argument need to be either username/id/email
-        try:
-            if username:
-                user = (
-                    Database.db_session.query(User).filter_by(username=username).first()
-                )
-            elif id:
-                user = Database.db_session.query(User).filter_by(id=id).first()
-            elif email:
-                user = Database.db_session.query(User).filter_by(email=email).first()
-            else:
-                user = None
-        except Exception as e:
-            raise e
+        if username:
+            user = Database.db_session.query(User).filter_by(username=username).first()
+        elif id:
+            user = Database.db_session.query(User).filter_by(id=id).first()
+        elif email:
+            user = Database.db_session.query(User).filter_by(email=email).first()
         else:
-            return user
+            user = None
+
+        return user
 
     def add(self):
         """
@@ -73,13 +68,10 @@ def evaluate_password(self, key, value):
     # validate the email field
     @validates("email")
     def evaluate_email(self, key, value):
-        try:
-            valid = validate_email(value)
-            email = valid.email
-        except Exception as e:
-            raise e
-        else:
-            return email
+        valid = validate_email(value)
+        email = valid.email
+
+        return email
 
     def update(self, **kwargs):
         """

lib/pbench/test/unit/server/test_user_auth.py

@@ -92,7 +92,6 @@ def test_registration_with_registered_user(client, server_config):
             username="user",
             first_name="firstname",
             last_name="lastname",
-            registered_on=datetime.datetime.now(),
         )
         Database.db_session.add(user)
         Database.db_session.commit()