Fixing minor bugs (#150)

* fixed #149

* fixed #131

Author: terazus

ptmd/api/queries/users.py

@@ -200,6 +200,7 @@ def reset_password(token: str) -> tuple[Response, int]:
         user: User = reset_token_from_db.user_reset[0]
         user.set_password(password)
         session.delete(reset_token_from_db)  # type: ignore
+        session.commit()
         return jsonify({"msg": "Password changed successfully"}), 200
     except (PasswordPolicyError, TokenInvalidError, TokenExpiredError) as e:
         return jsonify({"msg": str(e)}), 400

ptmd/boot/core.py

@@ -1,7 +1,10 @@
 """ This module contains the main initializer of the application.
 """
+from os.path import exists
+from os import mkdir
+
 from ptmd.config import app, engine
-from ptmd.const import ADMIN_EMAIL, ADMIN_USERNAME, ADMIN_PASSWORD
+from ptmd.const import ADMIN_EMAIL, ADMIN_USERNAME, ADMIN_PASSWORD, DOWNLOAD_DIRECTORY_PATH
 from ptmd.database import User, Base
 from ptmd.lib import GoogleDriveConnector
 from ptmd.logger import LOGGER
@@ -24,6 +27,7 @@ def initialize() -> None:
     """
     LOGGER.info('Initializing the application')
     create_config_file()
+    create_download_directory()
     connector: GoogleDriveConnector = GoogleDriveConnector()
     Base.metadata.create_all(engine)
 
@@ -41,3 +45,11 @@ def initialize() -> None:
         LOGGER.error('Error initializing the application: %s', e)
         raise e
     LOGGER.info('Application initialized')
+
+
+def create_download_directory() -> None:
+    """ Create the download directory under ptmd/resources/.
+    """
+    if not exists(DOWNLOAD_DIRECTORY_PATH):
+        mkdir(DOWNLOAD_DIRECTORY_PATH)
+        LOGGER.info('Download directory created')

ptmd/database/models/user.py

@@ -127,6 +127,7 @@ def __enable_account(self) -> None:
         self.role = 'enabled'
         if self.activation_token:
             session.delete(self.activation_token)  # type: ignore
+            session.commit()
         send_validation_mail(self)
 
     def __activate_account(self) -> None:

ptmd/database/queries/users.py

@@ -55,6 +55,7 @@ def get_token(token: str) -> Token:
     if token_from_db is None:
         raise TokenInvalidError
     if token_from_db.expires_on < datetime.now(token_from_db.expires_on.tzinfo):
-        # session.delete(token_from_db)  # type: ignore
+        session.delete(token_from_db)  # type: ignore
+        session.commit()
         raise TokenExpiredError
     return token_from_db

tests/test_api/test_queries/test_users.py

@@ -220,11 +220,16 @@ def test_validate_account(self, mock_get_current_user, mock_verify_jwt, mock_ver
                 response = client.get('/api/users/2/activate', headers={'Authorization': f'Bearer {123}', **HEADERS})
                 self.assertEqual(response.json, {'msg': 'Account validated'})
 
-    def test_enable_account_errors(self, mock_get_current_user, mock_verify_jwt, mock_verify_in_request):
+    @patch('ptmd.api.queries.users.session.delete')
+    @patch('ptmd.api.queries.users.session.commit')
+    def test_enable_account_errors(self, mock_session_commit, mock_session_delete,
+                                   mock_get_current_user, mock_verify_jwt, mock_verify_in_request):
         with patch('ptmd.database.queries.users.Token') as mocked_token:
             mocked_token.query.filter().first.return_value.expires_on = datetime.now() - timedelta(days=11)
             with app.test_client() as client:
                 response = client.get('/api/users/enable/2', headers={'Authorization': f'Bearer {123}', **HEADERS})
+                mock_session_commit.assert_called_once()
+                mock_session_delete.assert_called_once_with(mocked_token.query.filter().first.return_value)
                 self.assertEqual(response.json, {'msg': 'Token expired'})
                 self.assertEqual(response.status_code, 400)
 

tests/test_boot/test_core.py

@@ -2,6 +2,8 @@
 from unittest.mock import patch
 
 from ptmd.boot import initialize
+from ptmd.boot.core import create_download_directory
+from ptmd.const import DOWNLOAD_DIRECTORY_PATH
 
 
 class MockUser:
@@ -40,3 +42,20 @@ def test_init_error(self, mock_boot, mock_gdc, mock_user, mock_base):
         mock_boot.assert_not_called()
         mock_base.metadata.drop_all.assert_called_once()
         mock_gdc.assert_called_once()
+
+
+class TestUtils(TestCase):
+
+    @patch('ptmd.boot.core.mkdir')
+    @patch('ptmd.boot.core.exists', return_value=False)
+    def test_create_download_directory_true(self, exists_mock, mkdir_mock):
+        create_download_directory()
+        exists_mock.assert_called_once_with(DOWNLOAD_DIRECTORY_PATH)
+        mkdir_mock.assert_called_once_with(DOWNLOAD_DIRECTORY_PATH)
+
+    @patch('ptmd.boot.core.mkdir')
+    @patch('ptmd.boot.core.exists', return_value=True)
+    def test_create_download_directory_false(self, exists_mock, mkdir_mock):
+        create_download_directory()
+        exists_mock.assert_called_once_with(DOWNLOAD_DIRECTORY_PATH)
+        mkdir_mock.assert_not_called()

tests/test_database/test_queries/test_users.py

@@ -51,10 +51,14 @@ def test_create_users(self, mock_user, mock_organisation, mock_users_session, mo
         self.assertEqual(user[0], 123)
 
     @patch('ptmd.database.queries.users.Token')
-    def test_get_token(self, mock_token):
+    @patch('ptmd.database.queries.users.session.delete')
+    @patch('ptmd.database.queries.users.session.commit')
+    def test_get_token(self, mock_session_commit, mock_session_delete, mock_token):
         mock_token.query.filter().first.return_value = None
         with self.assertRaises(TokenInvalidError) as context:
             get_token('ABC')
+            mock_session_delete.assert_not_called()
+            mock_session_commit.assert_not_called()
         self.assertEqual(str(context.exception), 'Invalid token')
 
         class MockToken:
@@ -64,4 +68,6 @@ def __init__(self):
         mock_token.query.filter().first.return_value = MockToken()
         with self.assertRaises(TokenExpiredError) as context:
             get_token('ABC')
+            mock_session_delete.assert_called_once_with(mock_token.query.filter().first())
+            mock_session_commit.assert_called_once()
         self.assertEqual(str(context.exception), 'Token expired')