Apply requested changes

Author: EliuX

tests/conftest.py

@@ -10,13 +10,11 @@
 
 @pytest.fixture(scope='session', params=CONFIGURATIONS)
 def app(request: FixtureRequest) -> Flask:
-    """An instance of the app for tests"""
     return create_app("time_tracker_api.config.%s" % request.param)
 
 
 @pytest.fixture
 def client(app: Flask) -> FlaskClient:
-    """A test client for the app."""
     with app.test_client() as c:
         return c
 

tests/projects/projects_namespace_test.py

@@ -4,7 +4,6 @@
 
 
 def test_list_all_elements(client: FlaskClient, mocker: MockFixture):
-    """Should return all elements in a list"""
     from time_tracker_api.projects.projects_namespace import project_dao
     repository_find_all_mock = mocker.patch.object(project_dao.repository, 'find_all', return_value=[])
 

tests/resources.py

@@ -1,7 +1,7 @@
-from time_tracker_api.sql_repository import db, SQLAuditedModel
+from time_tracker_api.sql_repository import db, AuditedSQLModel
 
 
-class PersonSQLModel(db.Model, SQLAuditedModel):
+class PersonSQLModel(db.Model, AuditedSQLModel):
     __tablename__ = 'tests'
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(80), unique=False, nullable=False)

tests/smoke_test.py

@@ -1,3 +1,2 @@
 def test_app_exists(app):
-    """Does app exists"""
     assert app is not None

tests/sql_repository_test.py

@@ -7,7 +7,6 @@
 
 
 def test_create(sql_repository):
-    """Should create a new Entry"""
     global sample_element
     sample_element = dict(name=fake.name(),
                           email=fake.safe_email(),
@@ -26,7 +25,6 @@ def test_create(sql_repository):
 
 
 def test_find(sql_repository):
-    """Should find created element"""
     existing_element = existing_elements_registry[0]
 
     found_element = sql_repository.find(existing_element.id)
@@ -36,7 +34,6 @@ def test_find(sql_repository):
 
 
 def test_update(sql_repository):
-    """Updates an existing element"""
     existing_element = existing_elements_registry[0]
 
     updated_element = sql_repository.update(existing_element.id,
@@ -52,7 +49,6 @@ def test_update(sql_repository):
 
 
 def test_find_all(sql_repository):
-    """Find all existing elements"""
     existing_elements = sql_repository.find_all()
 
     assert all(e in existing_elements_registry for e in existing_elements)
@@ -78,7 +74,6 @@ def test_find_all_that_contains_property_with_string(sql_repository):
 
 
 def test_delete_existing_element(sql_repository):
-    """Should delete created element"""
     existing_element = existing_elements_registry[0]
 
     result = sql_repository.remove(existing_element.id)

time_tracker_api/projects/projects_model.py

@@ -3,7 +3,7 @@
 from flask import Flask
 
 from time_tracker_api.database import DATABASE_TYPE, CRUDDao
-from time_tracker_api.sql_repository import SQLCRUDDao, SQLAuditedModel, SQLModel
+from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel, SQLModel
 
 
 class PROJECT_TYPE(enum.Enum):
@@ -24,7 +24,7 @@ def create_dao(app: Flask) -> ProjectDao:
     if app.config['DATABASE'] == DATABASE_TYPE.SQL:
         from time_tracker_api.sql_repository import db
 
-        class ProjectSQLModel(db.Model, SQLModel, SQLAuditedModel):
+        class ProjectSQLModel(db.Model, SQLModel, AuditedSQLModel):
             __tablename__ = 'projects'
             id = db.Column(db.Integer, primary_key=True)
             name = db.Column(db.String(50), unique=True, nullable=False)

time_tracker_api/sql_repository.py

@@ -8,7 +8,7 @@
 
 db = None
 SQLModel = None
-SQLAuditedModel = None
+AuditedSQLModel = None
 
 
 def handle_commit_issues(f):
@@ -40,15 +40,15 @@ def to_dto(self):
 
     SQLModel = SQLModelClass
 
-    global SQLAuditedModel
+    global AuditedSQLModel
 
-    class SQLAuditedModelClass():
+    class AuditedSQLModelClass():
         created_at = db.Column(db.DateTime, server_default=db.func.now())
         updated_at = db.Column(db.DateTime, onupdate=datetime.utcnow)
         created_by = db.Column(db.String, default=current_user_id)
         updated_by = db.Column(db.String, onupdate=current_user_id)
 
-    SQLAuditedModel = SQLAuditedModelClass
+    AuditedSQLModel = AuditedSQLModelClass
 
 
 class SQLRepository():