Fixes #14 - Add Activity model

time_tracker_api/activities/activities_model.py

@@ -0,0 +1,30 @@
+from flask import Flask
+
+from time_tracker_api.database import CRUDDao
+
+
+class ActivityDao(CRUDDao):
+    pass
+
+
+def create_dao(app: Flask) -> ActivityDao:
+    from time_tracker_api.sql_repository import db
+    from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel, SQLModel
+
+    class ActivitySQLModel(db.Model, SQLModel, AuditedSQLModel):
+        __tablename__ = 'activity'
+        id = db.Column(db.Integer, primary_key=True)
+        name = db.Column(db.String(50), unique=True, nullable=False)
+        description = db.Column(db.String(250), unique=False, nullable=False)
+
+        def __repr__(self):
+            return '<Activity %r>' % self.name
+
+        def __str___(self):
+            return "the activity \"%s\"" % self.name
+
+    class ActivitySQLDao(SQLCRUDDao):
+        def __init__(self):
+            SQLCRUDDao.__init__(self, ActivitySQLModel)
+
+    return ActivitySQLDao()

time_tracker_api/activities/activities_namespace.py

@@ -1,7 +1,9 @@
 from faker import Faker
 from flask_restplus import fields, Resource, Namespace
 
+from time_tracker_api import flask_app
 from time_tracker_api.api import audit_fields
+from time_tracker_api.activities.activities_model import create_dao
 
 faker = Faker()
 
@@ -40,39 +42,46 @@
     activity_response_fields
 )
 
+activity_dao = create_dao(flask_app)
+
 
 @ns.route('')
 class Activities(Resource):
     @ns.doc('list_activities')
     @ns.marshal_list_with(activity, code=200)
     def get(self):
-        return []
+        """List all activities"""
+        return activity_dao.get_all(), 200
 
     @ns.doc('create_activity')
+    @ns.response(400, 'Bad request')
     @ns.expect(activity_input)
     @ns.marshal_with(activity, code=201)
-    @ns.response(400, 'Invalid format of the attributes of the activity.')
     def post(self):
-        return ns.payload, 201
+        """Create an activity"""
+        return activity_dao.create(ns.payload), 201
 
 
 @ns.route('/<string:id>')
 @ns.response(404, 'Activity not found')
-@ns.param('id', 'The unique identifier of the activity')
+@ns.param('id', 'The activity identifier')
 class Activity(Resource):
     @ns.doc('get_activity')
-    @ns.marshal_with(activity)
+    @ns.marshal_with(activity, code=200)
     def get(self, id):
-        return {}
-
-    @ns.doc('delete_activity')
-    @ns.response(204, 'The activity was deleted successfully (No content is returned)')
-    def delete(self, id):
-        return None, 204
+        """Get an activity"""
+        return activity_dao.get(id)
 
-    @ns.doc('put_activity')
-    @ns.response(400, 'Invalid format of the attributes of the activity.')
+    @ns.doc('update_activity')
     @ns.expect(activity_input)
     @ns.marshal_with(activity)
     def put(self, id):
-        return ns.payload
+        """Update an activity"""
+        return activity_dao.update(id, ns.payload)
+
+    @ns.doc('delete_activity')
+    @ns.response(204, 'Activity deleted successfully')
+    def delete(self, id):
+        """Delete an activity"""
+        activity_dao.delete(id)
+        return None, 204