Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes #64 - apply PR observations
  • Loading branch information
Angeluz-07 committed Apr 3, 2020
commit d7b81917a28053e208789a89a66cf7b801d58e9e
5 changes: 4 additions & 1 deletion tests/resources.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
from time_tracker_api.sql_repository import db, AuditedSQLModel

from sqlalchemy_utils import UUIDType
import uuid


class PersonSQLModel(db.Model, AuditedSQLModel):
__tablename__ = 'test'
id = db.Column(db.Integer, primary_key=True)
id = db.Column(UUIDType(binary=False), primary_key=True, default=uuid.uuid4)
name = db.Column(db.String(80), unique=False, nullable=False)
email = db.Column(db.String(120), unique=True, nullable=False)
age = db.Column(db.Integer, nullable=False)
Expand Down
6 changes: 4 additions & 2 deletions time_tracker_api/activities/activities_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ class ActivityDao(CRUDDao):

def create_dao() -> ActivityDao:
from time_tracker_api.sql_repository import db
from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel
from time_tracker_api.sql_repository import SQLCRUDDao
from sqlalchemy_utils import UUIDType
import uuid

class ActivitySQLModel(db.Model):
__tablename__ = 'activity'
id = db.Column(db.String, primary_key=True)
id = db.Column(UUIDType(binary=False), primary_key=True, default=uuid.uuid4)
name = db.Column(db.String(50), unique=True, nullable=False)
description = db.Column(db.String(250), unique=False, nullable=False)
deleted = db.Column(db.String, default=None)
Expand Down
29 changes: 0 additions & 29 deletions time_tracker_api/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,35 +22,6 @@
example=faker.uuid4(),
),
}
"""
'created_at': fields.Date(
readOnly=True,
title='Created',
description='Date of creation',
example=faker.iso8601(end_datetime=None),
),
'updated_at': fields.Date(
readOnly=True,
title='Updated',
description='Date of update',
example=faker.iso8601(end_datetime=None),
),
'created_by': fields.String(
readOnly=True,
title='Creator',
max_length=64,
description='User that created it',
example='anonymous',
),
'updated_by': fields.String(
readOnly=True,
title='Updater',
max_length=64,
description='User that updated it',
example='anonymous',
),
}
"""

# APIs
from time_tracker_api.projects import projects_namespace
Expand Down
6 changes: 4 additions & 2 deletions time_tracker_api/projects/projects_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ class ProjectDao(CRUDDao):
def create_dao() -> ProjectDao:
from time_tracker_api.sql_repository import db
from time_tracker_api.database import COMMENTS_MAX_LENGTH
from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel
from time_tracker_api.sql_repository import SQLCRUDDao
from sqlalchemy_utils import UUIDType
import uuid

class ProjectSQLModel(db.Model):
__tablename__ = 'project'
id = db.Column(db.String, primary_key=True)
id = db.Column(UUIDType(binary=False), primary_key=True, default=uuid.uuid4)
name = db.Column(db.String(50), unique=True, nullable=False)
description = db.Column(db.String(COMMENTS_MAX_LENGTH), unique=False, nullable=False)
project_type_id = db.Column(db.String, default=None)
Expand Down
6 changes: 4 additions & 2 deletions time_tracker_api/time_entries/time_entries_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ class TimeEntriesDao(CRUDDao):
def create_dao() -> TimeEntriesDao:
from time_tracker_api.sql_repository import db
from time_tracker_api.database import COMMENTS_MAX_LENGTH
from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel
from time_tracker_api.sql_repository import SQLCRUDDao
from sqlalchemy_utils import UUIDType
import uuid

class TimeEntrySQLModel(db.Model):
__tablename__ = 'time_entry'
id = db.Column(db.String, primary_key=True)
id = db.Column(UUIDType(binary=False), primary_key=True, default=uuid.uuid4)
description = db.Column(db.String(COMMENTS_MAX_LENGTH))
start_date = db.Column(db.DateTime, server_default=db.func.now())
end_date = db.Column(db.DateTime)
Expand Down
6 changes: 5 additions & 1 deletion time_tracker_api/time_entries/time_entries_namespace.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@
description='Either identifier or locator',
example=faker.words(
1,
['http://example.com/mypage.html', '/some/page.html']
[
'https://github.com/ioet/time-tracker-backend/issues/51',
'#54',
'TT-54'
]
),
),
'owner_id': fields.String(
Expand Down