Merge pull request #1 from Jahn16/feature/url-model

feature/url model

Author: Jahn16

Dockerfile

@@ -9,18 +9,17 @@ RUN pip install -r requirements.txt
 
 FROM python:3.10-slim@sha256:134b8763131e8a6800c1393108ec60efc3ed6d793243787bddd1b972ed10b722
 
-RUN groupadd -g 999 user && useradd -r -u 999 -g user user
+RUN groupadd -g 999 fastmock && useradd -r -u 999 -g fastmock fastmock
 
-RUN mkdir /usr/app && chown user:user /usr/app
+RUN mkdir /usr/app && chown fastmock:fastmock /usr/app
 WORKDIR /usr/app
 
-COPY --chown=user:user --from=build /usr/app/venv ./venv
-COPY --chown=user:user . .
+COPY --chown=fastmock:fastmock --from=build /usr/app/venv ./venv
+COPY --chown=fastmock:fastmock . .
 USER 999
 
 ENV PATH="/usr/app/venv/bin:$PATH"
-ENV FLASK_APP="app/app.py"
+EXPOSE 8000
 
 
-EXPOSE 5000
 ENTRYPOINT ["./boot.sh"]

alembic/versions/0255b9c8dc8c_fixed_typo_in_relationship_in_url.py

@@ -0,0 +1,28 @@
+"""fixed typo in relationship in  url
+
+Revision ID: 0255b9c8dc8c
+Revises: 040d471bdf71
+Create Date: 2023-11-20 17:45:11.099114
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0255b9c8dc8c'
+down_revision = '040d471bdf71'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

alembic/versions/040d471bdf71_added_url_and_user_relationship.py

@@ -0,0 +1,30 @@
+"""added url and user relationship
+
+Revision ID: 040d471bdf71
+Revises: cb19dfca774e
+Create Date: 2023-11-20 17:41:56.456822
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '040d471bdf71'
+down_revision = 'cb19dfca774e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('urls', sa.Column('owner_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'urls', 'users', ['owner_id'], ['id'])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'urls', type_='foreignkey')
+    op.drop_column('urls', 'owner_id')
+    # ### end Alembic commands ###

alembic/versions/388d699c0bd4_renamed_url_netloc_to_hostname.py

@@ -0,0 +1,34 @@
+"""renamed url netloc to hostname
+
+Revision ID: 388d699c0bd4
+Revises: 968a097da660
+Create Date: 2023-11-18 15:25:59.199354
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '388d699c0bd4'
+down_revision = '968a097da660'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('urls', sa.Column('hostname', sa.String(), nullable=True))
+    op.drop_index('ix_urls_netloc', table_name='urls')
+    op.create_index(op.f('ix_urls_hostname'), 'urls', ['hostname'], unique=False)
+    op.drop_column('urls', 'netloc')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('urls', sa.Column('netloc', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.drop_index(op.f('ix_urls_hostname'), table_name='urls')
+    op.create_index('ix_urls_netloc', 'urls', ['netloc'], unique=False)
+    op.drop_column('urls', 'hostname')
+    # ### end Alembic commands ###

alembic/versions/968a097da660_create_urls_table.py

@@ -0,0 +1,38 @@
+"""create urls table
+
+Revision ID: 968a097da660
+Revises: 2259f20dedb2
+Create Date: 2023-11-18 15:17:37.496932
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '968a097da660'
+down_revision = '2259f20dedb2'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('urls',
+    sa.Column('id', sa.UUID(), nullable=False),
+    sa.Column('netloc', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_urls_netloc'), 'urls', ['netloc'], unique=False)
+    op.add_column('requests', sa.Column('url_id', sa.UUID(), nullable=True))
+    op.create_foreign_key(None, 'requests', 'urls', ['url_id'], ['id'])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'requests', type_='foreignkey')
+    op.drop_column('requests', 'url_id')
+    op.drop_index(op.f('ix_urls_netloc'), table_name='urls')
+    op.drop_table('urls')
+    # ### end Alembic commands ###

alembic/versions/cb19dfca774e_added_missing_url_field_to_request.py

@@ -0,0 +1,28 @@
+"""added missing url field to request
+
+Revision ID: cb19dfca774e
+Revises: 388d699c0bd4
+Create Date: 2023-11-18 16:20:31.306135
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'cb19dfca774e'
+down_revision = '388d699c0bd4'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

app/api/api_v1/endpoints/login.py

@@ -1,3 +1,4 @@
+import structlog
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.orm import Session
@@ -8,21 +9,25 @@
 from app.security import create_access_token
 
 router = APIRouter()
+logger = structlog.get_logger()
 
 
 @router.post("", response_model=Token)
 async def login_for_access_token(
     db: Session = Depends(get_db),
     form_data: OAuth2PasswordRequestForm = Depends(),
 ):
-    user = authenticate_user(
-        db, form_data.username, form_data.password
-    )
+    user = authenticate_user(db, form_data.username, form_data.password)
     if not user:
+        logger.warning(
+            "Authentication error for user",
+            user_email=form_data.username,
+        )
         raise HTTPException(
             status_code=401,
             detail="Incorrect username or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
     access_token = create_access_token(subject=str(user.id))
+    logger.info("User logged in successfully", user_id=user.id)
     return {"access_token": access_token, "token_type": "bearer"}

app/api/api_v1/endpoints/mock_response.py

@@ -1,23 +1,33 @@
 from typing import Any
 
+import structlog
 from fastapi import APIRouter, Depends, HTTPException
+from fastapi import Request as StarletteRequest
 from sqlalchemy.orm import Session
 
-from app.api.deps import get_db, get_current_user
-from app.schemas.user import User
+from app.api.deps import get_db
 from app.crud.request import get_request
 
 router = APIRouter()
+logger = structlog.get_logger()
 
 
 @router.get("/{mock_endpoint:path}")
 @router.post("/{mock_endpoint:path}")
 def read_request_response(
     mock_endpoint: str,
-    user: User = Depends(get_current_user),
+    starlette_request: StarletteRequest,
     db: Session = Depends(get_db),
 ) -> dict | Any:
-    request = get_request(db, user.id, endpoint=mock_endpoint)
+    hostname = starlette_request.url.hostname or ""
+    url_id = hostname.split(".")[0]
+    request = get_request(db, url_id=url_id, endpoint=f"/{mock_endpoint}")
     if not request:
+        logger.info("Request not found", url_id=url_id)
         raise HTTPException(status_code=404, detail="Request not found")
+    logger.info(
+        "Sending mocked response for request",
+        request_id=request.id,
+        url_id=url_id,
+    )
     return request.response

app/api/api_v1/endpoints/requests.py

@@ -1,12 +1,15 @@
+import structlog
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 
 from app.api.deps import get_db, get_current_user
 from app.schemas.request import Request, RequestCreate, RequestUpdate
 from app.schemas.user import User
 from app.crud import request as crud_request
+from app.crud import url as crud_url
 
 router = APIRouter()
+logger = structlog.get_logger()
 
 
 @router.get("/read", response_model=Request)
@@ -17,7 +20,9 @@ def read_request(
 ):
     request = crud_request.get_request_by_id(db, request_id, user.id)
     if not request:
+        logger.info("Request not found", request_id=request_id)
         raise HTTPException(status_code=404, detail="Request Not Found")
+    logger.info("Retrieved request", request_id=request_id, user_id=user.id)
     return request
 
 
@@ -27,14 +32,20 @@ def create_request(
     user: User = Depends(get_current_user),
     db: Session = Depends(get_db),
 ):
-    db_request = crud_request.get_request(
-        db=db, user_id=user.id, endpoint=request.endpoint
+    db_url = crud_url.get_url(db, request.url, user.id)
+    if not db_url:
+        db_url = crud_url.create_url(db, request.url, user.id)
+        logger.info(f"Created url for {request.url}", url_id=db_url.id)
+    request = crud_request.create_request(
+        db=db, request=request, user_id=user.id, url_id=str(db_url.id)
     )
-    if db_request:
-        raise HTTPException(
-            status_code=400, detail="Endpoint already registered"
-        )
-    return crud_request.create_request(db=db, request=request, user_id=user.id)
+    logger.info(
+        "Created request",
+        request_id=request.id,
+        url_id=db_url.id,
+        user_id=user.id,
+    )
+    return request
 
 
 @router.put("/update", response_model=Request)
@@ -47,7 +58,13 @@ def update_request(
     crud_request.update_request(db, request_in, request_id, user.id)
     updated_request = crud_request.get_request_by_id(db, request_id, user.id)
     if not updated_request:
+        logger.warning(
+            "Request not found for updating",
+            request_id=request_id,
+            user_id=user.id,
+        )
         raise HTTPException(status_code=404, detail="Request Not Found")
+    logger.info("Updated request", request_id=request_id, user_id=user.id)
     return updated_request
 
 
@@ -59,6 +76,12 @@ def delete_request(
 ):
     request = crud_request.get_request_by_id(db, request_id, user.id)
     if not request:
+        logger.warning(
+            "Request not found for deleting",
+            request_id=request_id,
+            user_id=user.id,
+        )
         raise HTTPException(status_code=404, detail="Request Not Found")
     crud_request.delete_request(db, request)
+    logger.info("Deleted request", request_id=request_id, user_id=user.id)
     return request

app/api/api_v1/endpoints/user.py

@@ -1,12 +1,14 @@
 from fastapi import APIRouter, HTTPException, Depends
 from sqlalchemy.orm import Session
+import structlog
 
 from app.api.deps import get_db, get_current_user
 from app.schemas.user import User, UserCreate, UserUpdate
 from app.crud import user as crud_user
 
 
 router = APIRouter()
+logger = structlog.get_logger()
 
 
 @router.get("/read", response_model=User)
@@ -15,16 +17,24 @@ def read_user(
 ):
     db_user = crud_user.get_user(db, user_id=user.id)
     if not db_user:
+        logger.warning("User not found", user_id=user.id)
         raise HTTPException(status_code=404, detail="User not found")
+    logger.info("Retrieved user", user_id=db_user.id)
     return db_user
 
 
 @router.post("/create", response_model=User)
 def create_user(user: UserCreate, db: Session = Depends(get_db)):
     db_user = crud_user.get_user_by_email(db, email=user.email)
     if db_user:
+        logger.warning(
+            "Email already registered by another user",
+            user_email=user.email,
+        )
         raise HTTPException(status_code=400, detail="Email already registered")
-    return crud_user.create_user(db=db, user=user)
+    db_user = crud_user.create_user(db=db, user=user)
+    logger.info("Created user", user_id=db_user.id)
+    return db_user
 
 
 @router.put("/update", response_model=User)
@@ -36,7 +46,9 @@ def update_user(
     crud_user.update_user(db, user_in, user.id)
     db_user = crud_user.get_user(db, user.id)
     if not db_user:
+        logger.warning("User not found while updating", user_id=user.id)
         raise HTTPException(status_code=404, detail="User not found")
+    logger.info("Updated user", user_id=user.id)
     return db_user
 
 
@@ -45,4 +57,5 @@ def delete_user(
     user: User = Depends(get_current_user), db: Session = Depends(get_db)
 ):
     crud_user.delete_user(db, user)
+    logger.info("Deleted user", user_id=user.id)
     return user