Fixes #64 - Update current models to meet new design.

Author: Angeluz-07

time_tracker_api/activities/activities_model.py

@@ -9,11 +9,13 @@ def create_dao() -> ActivityDao:
     from time_tracker_api.sql_repository import db
     from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel
 
-    class ActivitySQLModel(db.Model, AuditedSQLModel):
+    class ActivitySQLModel(db.Model):
         __tablename__ = 'activity'
-        id = db.Column(db.Integer, primary_key=True)
+        id = db.Column(db.String, primary_key=True)
         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)
+        tenant_id = db.Column(db.String, nullable=False)
 
         def __repr__(self):
             return '<Activity %r>' % self.name

time_tracker_api/activities/activities_namespace.py

@@ -24,6 +24,12 @@
         description='Comments about the activity',
         example=faker.paragraph(),
     ),
+    'tenant_id': fields.String(
+        required=True,
+        title='Identifier of Tenant',
+        description='Tenant this activity belongs to',
+        example=faker.uuid4(),
+    )
 })
 
 activity_response_fields = {
@@ -32,8 +38,8 @@
         required=True,
         title='Identifier',
         description='The unique identifier',
-        example=faker.random_int(1, 9999),
-    )
+        example=faker.uuid4(),
+    ),
 }
 activity_response_fields.update(audit_fields)
 

time_tracker_api/api.py

@@ -14,6 +14,15 @@
 
 # Common models structure
 audit_fields = {
+    'deleted': fields.String(
+        readOnly=True,
+        required=True,
+        title='Last event Identifier',
+        description='Last event over this resource',
+        example=faker.uuid4(),
+    ),
+}
+"""
     'created_at': fields.Date(
         readOnly=True,
         title='Created',
@@ -41,6 +50,7 @@
         example='anonymous',
     ),
 }
+"""
 
 # APIs
 from time_tracker_api.projects import projects_namespace

time_tracker_api/projects/projects_model.py

@@ -21,13 +21,15 @@ def create_dao() -> ProjectDao:
     from time_tracker_api.database import COMMENTS_MAX_LENGTH
     from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel
 
-    class ProjectSQLModel(db.Model, AuditedSQLModel):
+    class ProjectSQLModel(db.Model):
         __tablename__ = 'project'
-        id = db.Column(db.Integer, primary_key=True)
+        id = db.Column(db.String, primary_key=True)
         name = db.Column(db.String(50), unique=True, nullable=False)
         description = db.Column(db.String(COMMENTS_MAX_LENGTH), unique=False, nullable=False)
-        type = db.Column(db.String(10), nullable=False)
-        active = db.Column(db.Boolean, default=True)
+        project_type_id = db.Column(db.String, default=None)
+        customer_id = db.Column(db.String, nullable=False)
+        deleted = db.Column(db.String, default=None)
+        tenant_id = db.Column(db.String, nullable=False)
 
         def __repr__(self):
             return '<Project %r>' % self.name

time_tracker_api/projects/projects_namespace.py

@@ -24,20 +24,23 @@
         description='Description about the project',
         example=faker.paragraph(),
     ),
-    'type': fields.String(
-        required=False,
-        title='Type',
-        max_length=10,
-        description='If it is `Costumer`, `Training` or other type',
-        enum=PROJECT_TYPE.valid_type_values(),
-        example=faker.word(PROJECT_TYPE.valid_type_values()),
+    'customer_id': fields.String(
+        required=True,
+        title='Identifier of the Customer',
+        description='Customer this project belongs to',
+        example=faker.uuid4(),
     ),
-    'active': fields.Boolean(
-        title='Is active?',
-        description='Whether the project is active or not',
-        default=True,
-        example=faker.boolean(),
+    'tenant_id': fields.String(
+        required=True,
+        title='Identifier of Tenant',
+        description='Tenant this project belongs to',
+        example=faker.uuid4(),
     ),
+    'project_type_id': fields.String(
+        title='Identifier of Project type',
+        description='Type of the project. Used for grouping',
+        example=faker.uuid4(),
+    )
 })
 
 project_response_fields = {
@@ -46,7 +49,7 @@
         required=True,
         title='Identifier',
         description='The unique identifier',
-        example=faker.random_int(1, 9999),
+        example=faker.uuid4(),
     )
 }
 project_response_fields.update(audit_fields)

time_tracker_api/time_entries/time_entries_model.py

@@ -12,19 +12,23 @@ def create_dao() -> TimeEntriesDao:
     from time_tracker_api.database import COMMENTS_MAX_LENGTH
     from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel
 
-    class TimeEntrySQLModel(db.Model, AuditedSQLModel):
+    class TimeEntrySQLModel(db.Model):
         __tablename__ = 'time_entry'
-        id = db.Column(db.Integer, primary_key=True)
+        id = db.Column(db.String, primary_key=True)
         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)
-        project_id = db.Column(db.Integer,
+        project_id = db.Column(db.String,
                                db.ForeignKey('project.id'),
                                nullable=False)
-        activity_id = db.Column(db.Integer,
+        activity_id = db.Column(db.String,
                                 db.ForeignKey('activity.id'),
                                 nullable=False)
         technologies = db.Column(ScalarListType())
+        uri = db.Column(db.String(500))
+        owner_id = db.Column(db.String, nullable=False)
+        deleted = db.Column(db.String, default=None)
+        tenant_id = db.Column(db.String, nullable=False)
 
         @property
         def running(self):

time_tracker_api/time_entries/time_entries_namespace.py

@@ -14,28 +14,17 @@
 
 # TimeEntry Model
 time_entry_input = ns.model('TimeEntryInput', {
-    'project_id': fields.Integer(
+    'project_id': fields.String(
         required=True,
         title='Project',
         description='The id of the selected project',
-        example=faker.random_int(1, 9999),
+        example=faker.uuid4(),
     ),
-    'activity_id': fields.Integer(
+    'activity_id': fields.String(
+        required=True,
         title='Activity',
         description='The id of the selected activity',
-        example=faker.random_int(1, 9999),
-    ),
-    'technologies': fields.List(
-        fields.String(
-            required=True,
-            title='Technologies',
-            description='Technology names used in this time-entry',
-        ),
-        example=faker.words(
-            3,
-            ['java', 'elixir', 'python', 'docker'],
-            unique=True
-        )
+        example=faker.uuid4(),
     ),
     'description': fields.String(
         title='Comments',
@@ -54,14 +43,34 @@
         description='When the user ended doing this activity',
         example=faker.iso8601(end_datetime=None),
     ),
+    'uri': fields.String(
+        title='Uniform Resource identifier',
+        description='Either identifier or locator',
+        example=faker.words(
+            1,
+            ['http://example.com/mypage.html', '/some/page.html']
+        ),
+    ),
+    'owner_id': fields.String(
+        required=True,
+        title='Owner of time entry',
+        description='User who owns the time entry',
+        example=faker.uuid4(),
+    ),
+    'tenant_id': fields.String(
+        required=True,
+        title='Identifier of Tenant',
+        description='Tenant this project belongs to',
+        example=faker.uuid4(),
+    ),
 })
 
 time_entry_response_fields = {
     'id': fields.String(
         readOnly=True,
         title='Identifier',
         description='The unique identifier',
-        example=faker.random_int(1, 9999),
+        example=faker.uuid4(),
     ),
     'running': fields.Boolean(
         readOnly=True,