Skip to content

Implement activities model #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 26, 2020
Merged

Implement activities model #44

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
804120c
Fixes #14 - Add Activity model
Angeluz-07 Mar 25, 2020
d5c11c5
Fixes #14 - Add tests for activity
Angeluz-07 Mar 25, 2020
587855b
Fixes #14 - replace http codes by constants
Angeluz-07 Mar 25, 2020
63bcdd4
Fixes #14 - merge with time-entry model
Angeluz-07 Mar 25, 2020
b683c62
Fixes #14 - apply PR observations
Angeluz-07 Mar 26, 2020
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 #14 - merge with time-entry model
  • Loading branch information
@Angeluz-07
Angeluz-07 committed Mar 25, 2020
commit 63bcdd4cfe49dc7f667ff65138037812ae08086f
4 changes: 2 additions & 2 deletions time_tracker_api/activities/activities_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ class ActivityDao(CRUDDao):

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

class ActivitySQLModel(db.Model, SQLModel, AuditedSQLModel):
class ActivitySQLModel(db.Model, AuditedSQLModel):
__tablename__ = 'activity'
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(50), unique=True, nullable=False)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.