form for making a new graph. add username field to db

5 files changed, 20 insertions, 42 deletions

diff --git a/cli/app/sql/common.py b/cli/app/sql/common.py
index d007e23..c8bd557 100644
--- a/cli/app/sql/common.py
+++ b/cli/app/sql/common.py
@@ -21,7 +21,6 @@ from app.settings import app_cfg
 os.makedirs(app_cfg.DIR_DATABASE, exist_ok=True)
 
 connection_url = "sqlite:///{}".format(os.path.join(app_cfg.DIR_DATABASE, 'swimmer.sqlite3'))
-print(connection_url)
 
 engine = create_engine(connection_url, encoding="utf-8", pool_recycle=3600)
 
diff --git a/cli/app/sql/models/graph.py b/cli/app/sql/models/graph.py
index 1f553e9..0d3fdab 100644
--- a/cli/app/sql/models/graph.py
+++ b/cli/app/sql/models/graph.py
@@ -17,6 +17,7 @@ class Graph(Base):
   id = Column(Integer, primary_key=True)
   path = Column(String(64, convert_unicode=True), nullable=False)
   title = Column(String(64, convert_unicode=True), nullable=False)
+  username = Column(String(32, convert_unicode=True), nullable=False)
   description = Column(Text(convert_unicode=True), nullable=False)
   settings = Column(JSON, default={}, nullable=True)
   created_at = Column(UtcDateTime(), default=utcnow())
@@ -29,6 +30,7 @@ class Graph(Base):
       'id': self.id,
       'path': self.path,
       'title': self.title,
+      'username': self.username,
       'description': self.description,
       'settings': self.settings,
       'created_at': self.created_at,
diff --git a/cli/app/sql/models/page.py b/cli/app/sql/models/page.py
index f23db8d..22fcc96 100644
--- a/cli/app/sql/models/page.py
+++ b/cli/app/sql/models/page.py
@@ -16,6 +16,7 @@ class Page(Base):
   graph_id = Column(Integer, ForeignKey('graph.id'), nullable=True)
   path = Column(String(64, convert_unicode=True), nullable=False)
   title = Column(String(64, convert_unicode=True), nullable=False)
+  username = Column(String(32, convert_unicode=True), nullable=False)
   description = Column(Text(convert_unicode=True), nullable=False)
   settings = Column(JSON, default={}, nullable=True)
   created_at = Column(UtcDateTime(), default=utcnow())
@@ -29,6 +30,7 @@ class Page(Base):
       'graph_id': self.graph_id,
       'path': self.path,
       'title': self.title,
+      'username': self.username,
       'description': self.description,
       'settings': self.settings,
       'created_at': self.created_at,
diff --git a/cli/app/sql/versions/202006011944_adding_uploads.py b/cli/app/sql/versions/202006011944_adding_uploads.py
deleted file mode 100644
index f09f013..0000000
--- a/cli/app/sql/versions/202006011944_adding_uploads.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""adding uploads
-
-Revision ID: 5b926731a4ac
-Revises: 7acd0c82a048
-Create Date: 2020-06-01 19:44:30.400513
-
-"""
-from alembic import op
-import sqlalchemy as sa
-import sqlalchemy_utc
-
-
-# revision identifiers, used by Alembic.
-revision = '5b926731a4ac'
-down_revision = '7acd0c82a048'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('upload',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('sha256', sa.String(length=256), nullable=False),
-    sa.Column('fn', sa.String(length=256), nullable=False),
-    sa.Column('ext', sa.String(length=4, _expect_unicode=True), nullable=False),
-    sa.Column('username', sa.String(length=16, _expect_unicode=True), nullable=False),
-    sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True),
-    sa.PrimaryKeyConstraint('id')
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('upload')
-    # ### end Alembic commands ###
diff --git a/cli/app/sql/versions/202006011943_adding_database.py b/cli/app/sql/versions/202006021608_creating_database.py
index 4e5b0e6..7c6e54a 100644
--- a/cli/app/sql/versions/202006011943_adding_database.py
+++ b/cli/app/sql/versions/202006021608_creating_database.py
@@ -1,8 +1,8 @@
-"""adding database
+"""creating database
 
-Revision ID: 7acd0c82a048
+Revision ID: 453787357254
 Revises: 
-Create Date: 2020-06-01 19:43:53.359855
+Create Date: 2020-06-02 16:08:43.195875
 
 """
 from alembic import op
@@ -11,7 +11,7 @@ import sqlalchemy_utc
 
 
 # revision identifiers, used by Alembic.
-revision = '7acd0c82a048'
+revision = '453787357254'
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -23,17 +23,28 @@ def upgrade():
     sa.Column('id', sa.Integer(), nullable=False),
     sa.Column('path', sa.String(length=64, _expect_unicode=True), nullable=False),
     sa.Column('title', sa.String(length=64, _expect_unicode=True), nullable=False),
+    sa.Column('username', sa.String(length=32, _expect_unicode=True), nullable=False),
     sa.Column('description', sa.Text(_expect_unicode=True), nullable=False),
     sa.Column('settings', sa.JSON(), nullable=True),
     sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True),
     sa.Column('updated_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True),
     sa.PrimaryKeyConstraint('id')
     )
+    op.create_table('upload',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('sha256', sa.String(length=256), nullable=False),
+    sa.Column('fn', sa.String(length=256), nullable=False),
+    sa.Column('ext', sa.String(length=4, _expect_unicode=True), nullable=False),
+    sa.Column('username', sa.String(length=16, _expect_unicode=True), nullable=False),
+    sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
     op.create_table('page',
     sa.Column('id', sa.Integer(), nullable=False),
     sa.Column('graph_id', sa.Integer(), nullable=True),
     sa.Column('path', sa.String(length=64, _expect_unicode=True), nullable=False),
     sa.Column('title', sa.String(length=64, _expect_unicode=True), nullable=False),
+    sa.Column('username', sa.String(length=32, _expect_unicode=True), nullable=False),
     sa.Column('description', sa.Text(_expect_unicode=True), nullable=False),
     sa.Column('settings', sa.JSON(), nullable=True),
     sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True),
@@ -62,5 +73,6 @@ def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table('tile')
     op.drop_table('page')
+    op.drop_table('upload')
     op.drop_table('graph')
     # ### end Alembic commands ###