Format with Black

This commit is contained in:
Michał Gdula 2023-04-12 15:18:13 +00:00
parent d36699bd1f
commit 02d99a1671
5 changed files with 35 additions and 27 deletions

View file

@ -47,7 +47,7 @@ def create_app(): # pylint: disable=R0914
register_user = User(
username=app.config["ADMIN_CONF"]["username"],
email=app.config["ADMIN_CONF"]["email"],
password=generate_password_hash('changeme!', method="sha256"),
password=generate_password_hash("changeme!", method="sha256"),
)
db.session.add(register_user)
db.session.commit()

View file

@ -170,7 +170,12 @@ def modify_group():
if group.author_id != current_user.id:
abort(403)
if action == "add" and not GroupJunction.query.filter_by(group_id=group_id, post_id=image_id).first():
if (
action == "add"
and not GroupJunction.query.filter_by(
group_id=group_id, post_id=image_id
).first()
):
db.session.add(GroupJunction(group_id=group_id, post_id=image_id))
elif request.form["action"] == "remove":
GroupJunction.query.filter_by(group_id=group_id, post_id=image_id).delete()

View file

@ -11,6 +11,7 @@ class GroupJunction(db.Model): # pylint: disable=too-few-public-methods, C0103
Junction table for posts and groups
Joins with posts and groups
"""
__tablename__ = "group_junction"
id = db.Column(db.Integer, primary_key=True)
@ -29,6 +30,7 @@ class Post(db.Model): # pylint: disable=too-few-public-methods, C0103
"""
Post table
"""
__tablename__ = "post"
id = db.Column(db.Integer, primary_key=True)
@ -51,10 +53,12 @@ class Post(db.Model): # pylint: disable=too-few-public-methods, C0103
junction = db.relationship("GroupJunction", backref="posts")
class Group(db.Model): # pylint: disable=too-few-public-methods, C0103
"""
Group table
"""
__tablename__ = "group"
id = db.Column(db.Integer, primary_key=True)
@ -76,6 +80,7 @@ class User(db.Model, UserMixin): # pylint: disable=too-few-public-methods, C010
"""
User table
"""
__tablename__ = "user"
# Gallery used information
@ -93,8 +98,8 @@ class User(db.Model, UserMixin): # pylint: disable=too-few-public-methods, C010
server_default=db.func.now(), # pylint: disable=E1102
)
posts = db.relationship('Post', backref='author')
groups = db.relationship('Group', backref='author')
posts = db.relationship("Post", backref="author")
groups = db.relationship("Group", backref="author")
def get_id(self):
return str(self.alt_id)

View file

@ -30,8 +30,7 @@ def groups():
# Get the 3 most recent images
images = (
GroupJunction.query
.with_entities(GroupJunction.post_id)
GroupJunction.query.with_entities(GroupJunction.post_id)
.filter(GroupJunction.group_id == group.id)
.order_by(GroupJunction.date_added.desc())
.limit(3)
@ -41,8 +40,7 @@ def groups():
group.images = []
for image in images:
group.images.append(
Post.query
.with_entities(Post.filename, Post.alt, Post.colours, Post.id)
Post.query.with_entities(Post.filename, Post.alt, Post.colours, Post.id)
.filter(Post.id == image[0])
.first()
)
@ -60,8 +58,7 @@ def group(group_id):
# Get all images in the group from the junction table
junction = (
GroupJunction.query
.with_entities(GroupJunction.post_id)
GroupJunction.query.with_entities(GroupJunction.post_id)
.filter(GroupJunction.group_id == group_id)
.order_by(GroupJunction.date_added.desc())
.all()

View file

@ -38,8 +38,9 @@ def index():
# get the images for the current page
images = (
Post.query
.with_entities( Post.filename, Post.alt, Post.colours, Post.created_at, Post.id)
Post.query.with_entities(
Post.filename, Post.alt, Post.colours, Post.created_at, Post.id
)
.order_by(Post.id.desc())
.offset((page - 1) * limit)
.limit(limit)