Add endpoints for Users and accounts.

Author: drmacsika

__pycache__/main.cpython-39.pyc

@@ -59,7 +59,6 @@ async def create(self, *, obj_in: UserCreate, db: AsyncSession, slug_field: str
             raise ie.orig
         except SQLAlchemyError as se:
             raise se
-        
 
     async def update(
         self, *,

accounts/crud.py

@@ -45,16 +45,8 @@ def update_user_me(
     """
     Update own user.
     """
-    current_user_data = jsonable_encoder(current_user)
-    user_in = schemas.UserUpdate(**current_user_data)
-    if password is not None:
-        user_in.password = password
-    if full_name is not None:
-        user_in.full_name = full_name
-    if email is not None:
-        user_in.email = email
-    user = crud.user.update(db, db_obj=current_user, obj_in=user_in)
-    return user
+    return current_user
+    
 
 
 

accounts/main.py

@@ -1,12 +1,14 @@
 from fastapi import FastAPI
 
+from accounts import main as account_router
 from blog import main as blog_router
 from contact import main as contact_router
 
 app = FastAPI()
 
 app.include_router(blog_router.router)
 app.include_router(contact_router.router, tags=["Contact"])
+app.include_router(account_router.router, tags=["Users"])
 
 
 @app.get("/", tags=["Home"])

main.py

@@ -0,0 +1,31 @@
+"""Rename read_length to read_time
+
+Revision ID: 1e0c0d4f51f6
+Revises: 9150a2b603d9
+Create Date: 2021-10-17 13:56:31.265803
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from core.base import Base
+
+
+# revision identifiers, used by Alembic.
+revision = '1e0c0d4f51f6'
+down_revision = '9150a2b603d9'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('posts', sa.Column('read_time', sa.Integer(), nullable=True))
+    op.drop_column('posts', 'read_length')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('posts', sa.Column('read_length', sa.INTEGER(), nullable=True))
+    op.drop_column('posts', 'read_time')
+    # ### end Alembic commands ###

migrations/versions/1e0c0d4f51f6_rename_read_length_to_read_time.py

@@ -0,0 +1,106 @@
+"""Init
+
+Revision ID: 29ab561fd33d
+Revises: 
+Create Date: 2021-10-12 00:09:19.054328
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from core.base import Base
+
+
+# revision identifiers, used by Alembic.
+revision = '29ab561fd33d'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('categories',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('title', sa.String(length=100), nullable=True),
+    sa.Column('description', sa.String(length=250), nullable=True),
+    sa.Column('slug', sa.String(length=255), nullable=False),
+    sa.Column('active', sa.Boolean(), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True),
+    sa.Column('updated', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_categories_id'), 'categories', ['id'], unique=False)
+    op.create_index(op.f('ix_categories_slug'), 'categories', ['slug'], unique=True)
+    op.create_index(op.f('ix_categories_title'), 'categories', ['title'], unique=False)
+    op.create_table('contacts',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('firstname', sa.String(length=100), nullable=False),
+    sa.Column('lastname', sa.String(length=100), nullable=False),
+    sa.Column('email', sa.String(length=255), nullable=False),
+    sa.Column('message', sa.Text(), nullable=False),
+    sa.Column('status', sa.Boolean(), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_contacts_email'), 'contacts', ['email'], unique=False)
+    op.create_index(op.f('ix_contacts_id'), 'contacts', ['id'], unique=False)
+    op.create_table('users',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('firstname', sa.String(length=100), nullable=False),
+    sa.Column('lastname', sa.String(length=100), nullable=False),
+    sa.Column('username', sa.String(length=100), nullable=False),
+    sa.Column('email', sa.String(length=255), nullable=False),
+    sa.Column('password', sa.Text(), nullable=False),
+    sa.Column('active', sa.Boolean(), nullable=True),
+    sa.Column('staff', sa.Boolean(), nullable=True),
+    sa.Column('admin', sa.Boolean(), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True),
+    sa.Column('updated', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
+    op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=False)
+    op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
+    op.create_table('posts',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('author_id', sa.Integer(), nullable=True),
+    sa.Column('category_id', sa.Integer(), nullable=True),
+    sa.Column('title', sa.String(length=100), nullable=False),
+    sa.Column('description', sa.String(length=250), nullable=True),
+    sa.Column('intro', sa.String(length=200), nullable=True),
+    sa.Column('content', sa.Text(), nullable=True),
+    sa.Column('post_image', sa.Text(), nullable=True),
+    sa.Column('slug', sa.String(length=255), nullable=False),
+    sa.Column('read_length', sa.Integer(), nullable=True),
+    sa.Column('view_count', sa.Integer(), nullable=True),
+    sa.Column('active', sa.Boolean(), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True),
+    sa.Column('updated', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True),
+    sa.ForeignKeyConstraint(['author_id'], ['users.id'], ),
+    sa.ForeignKeyConstraint(['category_id'], ['categories.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_posts_id'), 'posts', ['id'], unique=False)
+    op.create_index(op.f('ix_posts_slug'), 'posts', ['slug'], unique=True)
+    op.create_index(op.f('ix_posts_title'), 'posts', ['title'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_posts_title'), table_name='posts')
+    op.drop_index(op.f('ix_posts_slug'), table_name='posts')
+    op.drop_index(op.f('ix_posts_id'), table_name='posts')
+    op.drop_table('posts')
+    op.drop_index(op.f('ix_users_username'), table_name='users')
+    op.drop_index(op.f('ix_users_id'), table_name='users')
+    op.drop_index(op.f('ix_users_email'), table_name='users')
+    op.drop_table('users')
+    op.drop_index(op.f('ix_contacts_id'), table_name='contacts')
+    op.drop_index(op.f('ix_contacts_email'), table_name='contacts')
+    op.drop_table('contacts')
+    op.drop_index(op.f('ix_categories_title'), table_name='categories')
+    op.drop_index(op.f('ix_categories_slug'), table_name='categories')
+    op.drop_index(op.f('ix_categories_id'), table_name='categories')
+    op.drop_table('categories')
+    # ### end Alembic commands ###

migrations/versions/29ab561fd33d_init.py

@@ -0,0 +1,29 @@
+"""Removed Cascade
+
+Revision ID: 40f0ee5383ef
+Revises: 507a013e929a
+Create Date: 2021-10-12 22:17:23.665538
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from core.base import Base
+
+
+# revision identifiers, used by Alembic.
+revision = '40f0ee5383ef'
+down_revision = '507a013e929a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

migrations/versions/40f0ee5383ef_removed_cascade.py

@@ -0,0 +1,29 @@
+"""Add nullable to time fields
+
+Revision ID: 48245b4ab25a
+Revises: 40f0ee5383ef
+Create Date: 2021-10-13 18:55:59.264251
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from core.base import Base
+
+
+# revision identifiers, used by Alembic.
+revision = '48245b4ab25a'
+down_revision = '40f0ee5383ef'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

migrations/versions/48245b4ab25a_add_nullable_to_time_fields.py

@@ -0,0 +1,29 @@
+"""Add Cascade
+
+Revision ID: 507a013e929a
+Revises: 29ab561fd33d
+Create Date: 2021-10-12 22:04:01.806519
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from core.base import Base
+
+
+# revision identifiers, used by Alembic.
+revision = '507a013e929a'
+down_revision = '29ab561fd33d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

migrations/versions/507a013e929a_add_cascade.py

@@ -0,0 +1,29 @@
+"""Removed index from email.
+
+Revision ID: 9150a2b603d9
+Revises: 48245b4ab25a
+Create Date: 2021-10-14 23:08:22.507568
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from core.base import Base
+
+
+# revision identifiers, used by Alembic.
+revision = '9150a2b603d9'
+down_revision = '48245b4ab25a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index('ix_contacts_email', table_name='contacts')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index('ix_contacts_email', 'contacts', ['email'], unique=False)
+    # ### end Alembic commands ###