generated from DiscordBotPortalJP/repository-template
-
Notifications
You must be signed in to change notification settings - Fork 1
[WIP] Heroku Postgres を扱えるように #23
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.
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
Draft
1ntegrale9
wants to merge
1
commit into
main
Choose a base branch
from
feature/postgres
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| from sqlalchemy.orm import Session | ||
| from . import models, schemas | ||
|
|
||
|
|
||
| def get_bot(db: Session, user_id: int): | ||
| return db.query(models.DiscordBot).filter(models.DiscordBot.user_id == user_id).first() | ||
|
|
||
|
|
||
| def get_bots(db: Session, skip: int = 0, limit: int = 5): | ||
| return db.query(models.DiscordBot).offset(skip).limit(limit).all() | ||
|
|
||
|
|
||
| def create_user(db: Session, user: schemas.DiscordBotCreate): | ||
| fake_hashed_password = user.password + "notreallyhashed" | ||
| db_user = models.User(email=user.email, hashed_password=fake_hashed_password) | ||
| db.add(db_user) | ||
| db.commit() | ||
| db.refresh(db_user) | ||
| return db_user | ||
|
|
||
| def create_user(db: Session, user: schemas.UserCreate): | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. E302: expected 2 blank lines, found 1 |
||
| fake_hashed_password = user.password + "notreallyhashed" | ||
| db_user = models.DiscordBot(email=user.email, hashed_password=fake_hashed_password) | ||
| db.add(db_user) | ||
| db.commit() | ||
| db.refresh(db_user) | ||
| return db_user | ||
|
|
||
|
|
||
| def get_items(db: Session, skip: int = 0, limit: int = 100): | ||
| return db.query(models.Item).offset(skip).limit(limit).all() | ||
|
|
||
|
|
||
| def create_user_item(db: Session, item: schemas.ItemCreate, user_id: int): | ||
| db_item = models.Item(**item.dict(), owner_id=user_id) | ||
| db.add(db_item) | ||
| db.commit() | ||
| db.refresh(db_item) | ||
| return db_item | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| from sqlalchemy import create_engine | ||
| from sqlalchemy.ext.declarative import declarative_base | ||
| from sqlalchemy.orm import sessionmaker | ||
| import os | ||
|
|
||
| DATABASE_URL = os.environ.get('DATABASE_URL') | ||
|
|
||
| engine = create_engine(DATABASE_URL, connect_args={'check_same_thread': False}) | ||
| SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) | ||
|
|
||
| Base = declarative_base() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| from sqlalchemy import Column, Integer, String | ||
| from .database import Base | ||
|
|
||
|
|
||
| class DiscordBot(Base): | ||
| __tablename__ = 'discord_bots' | ||
|
|
||
| user_id = Column( | ||
| Integer, primary_key=True, autoincrement=False, unique=True, index=True | ||
| ) | ||
| name = Column(String) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| from pydantic import BaseModel | ||
|
|
||
|
|
||
| class DiscordBotBase(BaseModel): | ||
| user_id: int | ||
| name: str | ||
|
|
||
|
|
||
| class DiscordBotCreate(DiscordBotBase): | ||
| pass | ||
|
|
||
|
|
||
| class DiscordBot(DiscordBotBase): | ||
| class Config: | ||
| orm_mode = True |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
F811: redefinition of unused 'create_user' from line 13