Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shenanigans with database model and postgresql

Browse source
This commit is contained in:
Théophile Diot 2024-08-08 19:55:42 +01:00
parent ab56589e3c
commit 3d81e4f262
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/assets/img/bunkerweb_db.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 950 KiB

After

Width:  |  Height:  |  Size: 950 KiB

34
src/common/db/Database.py
View file

@ -914,7 +914,7 @@ class Database:
# ? Check if the step already exists and if it has changed
step_found = False
for i, old_step in enumerate(old_data.get("bw_template_steps", [])):
if old_step.template_id == template_id and old_step.id == step_id:
if old_step.template_id == template_id and old_step.step == step_id:
step_found = True
if old_step.title != step["title"] or old_step.subtitle != step["subtitle"]:
self.logger.warning(
@ -928,7 +928,7 @@ class Database:
f'{plugin.get("type", "core").title()} Plugin "{plugin["id"]}"\'s Template "{template_id}"\'s Step "{step["name"]}" does not exist, creating it'
)
to_put.append(Template_steps(id=step_id, template_id=template_id, title=step["title"], subtitle=step["subtitle"]))
to_put.append(Template_steps(step=step_id, template_id=template_id, title=step["title"], subtitle=step["subtitle"]))
# ? Add step settings and configs for later
for setting in step.get("settings", []):
@ -945,15 +945,15 @@ class Database:
for i, old_step in enumerate(old_data.get("bw_template_steps", [])):
if old_step.template_id == template_id:
self.logger.warning(
f'{plugin.get("type", "core").title()} Plugin "{plugin["id"]}"\'s Template "{template_id}"\'s Step "{old_step.id}" has been removed, deleting it'
f'{plugin.get("type", "core").title()} Plugin "{plugin["id"]}"\'s Template "{template_id}"\'s Step "{old_step.step}" has been removed, deleting it'
)
for j, old_setting in enumerate(old_data.get("bw_template_settings", [])):
if old_setting.step_id == old_step.id:
if old_setting.step_id == old_step.step:
old_data["bw_template_settings"][j]["step_id"] = None
for j, old_config in enumerate(old_data.get("bw_template_configs", [])):
if old_config.step_id == old_step.id:
if old_config.step_id == old_step.step:
old_data["bw_template_configs"][j]["step_id"] = None
del old_data["bw_template_steps"][i]
@ -2433,7 +2433,7 @@ class Database:
saved_templates.add(template_id)
db_ids = [step.id for step in session.query(Template_steps).with_entities(Template_steps.id).filter_by(template_id=template_id)]
db_ids = [step.step for step in session.query(Template_steps).with_entities(Template_steps.step).filter_by(template_id=template_id)]
missing_ids = [x for x in range(1, len(template.get("steps", [])) + 1) if x not in db_ids]
if missing_ids:
@ -2442,17 +2442,15 @@ class Database:
session.query(Template_custom_configs).filter(Template_custom_configs.step_id.in_(missing_ids)).update(
{Template_custom_configs.step_id: None}
)
session.query(Template_steps).filter(Template_steps.id.in_(missing_ids)).delete()
session.query(Template_steps).filter(Template_steps.step.in_(missing_ids)).delete()
steps_settings = {}
steps_configs = {}
for step_id, step in enumerate(template.get("steps", []), start=1):
db_step = session.query(Template_steps).with_entities(Template_steps.id).filter_by(template_id=template_id, id=step_id).first()
db_step = session.query(Template_steps).with_entities(Template_steps.step).filter_by(step=step_id, template_id=template_id).first()
if not db_step:
changes = True
to_put.append(
Template_steps(template_id=template_id, id=step_id, name=step["name"], title=step["title"], subtitle=step["subtitle"])
)
to_put.append(Template_steps(step=step_id, template_id=template_id, title=step["title"], subtitle=step["subtitle"]))
else:
updates = {}
@ -2464,7 +2462,7 @@ class Database:
if updates:
changes = True
session.query(Template_steps).filter(Template_steps.id == db_step.id).update(updates)
session.query(Template_steps).filter(Template_steps.step == db_step.step).update(updates)
for setting in step.get("settings", []):
if step_id not in steps_settings:
@ -2737,7 +2735,7 @@ class Database:
steps_settings = {}
steps_configs = {}
for step_id, step in enumerate(template_data.get("steps", []), start=1):
to_put.append(Template_steps(template_id=template_id, id=step_id, title=step["title"], subtitle=step["subtitle"]))
to_put.append(Template_steps(step=step_id, template_id=template_id, title=step["title"], subtitle=step["subtitle"]))
for setting in step.get("settings", []):
if step_id not in steps_settings:
@ -3235,15 +3233,15 @@ class Database:
for step in (
session.query(Template_steps)
.with_entities(Template_steps.id, Template_steps.title, Template_steps.subtitle)
.with_entities(Template_steps.step, Template_steps.title, Template_steps.subtitle)
.filter_by(template_id=template.id)
):
templates[template.id]["steps"].append({"title": step.title, "subtitle": step.subtitle})
if step.id in steps_settings:
templates[template.id]["steps"][step.id - 1]["settings"] = steps_settings[step.id]
if step.id in steps_configs:
templates[template.id]["steps"][step.id - 1]["configs"] = steps_configs[step.id]
if step.step in steps_settings:
templates[template.id]["steps"][step.step - 1]["settings"] = steps_settings[step.step]
if step.step in steps_configs:
templates[template.id]["steps"][step.step - 1]["configs"] = steps_configs[step.step]
return templates

10
src/common/db/model.py
View file

@ -238,9 +238,11 @@ class Templates(Base):
class Template_steps(Base):
__tablename__ = "bw_template_steps"
__table_args__ = (UniqueConstraint("step", "template_id"),)
id = Column(Integer, primary_key=True)
template_id = Column(String(256), ForeignKey("bw_templates.id", onupdate="cascade", ondelete="cascade"), primary_key=True)
id = Column(Integer, Identity(start=1, increment=1), primary_key=True)
step = Column(Integer, nullable=False)
template_id = Column(String(256), ForeignKey("bw_templates.id", onupdate="cascade", ondelete="cascade"), nullable=False)
title = Column(TEXT, nullable=False)
subtitle = Column(TEXT, nullable=True)
@ -256,7 +258,7 @@ class Template_settings(Base):
id = Column(Integer, Identity(start=1, increment=1), primary_key=True)
template_id = Column(String(256), ForeignKey("bw_templates.id", onupdate="cascade", ondelete="cascade"), nullable=False)
setting_id = Column(String(256), ForeignKey("bw_settings.id", onupdate="cascade", ondelete="cascade"), nullable=False)
step_id = Column(Integer, ForeignKey("bw_template_steps.id", onupdate="cascade", ondelete="cascade"), nullable=True)
step_id = Column(Integer, ForeignKey("bw_template_steps.step", onupdate="cascade", ondelete="cascade"), nullable=True)
default = Column(TEXT, nullable=False)
suffix = Column(Integer, nullable=True, default=0)
@ -271,7 +273,7 @@ class Template_custom_configs(Base):
id = Column(Integer, Identity(start=1, increment=1), primary_key=True)
template_id = Column(String(256), ForeignKey("bw_templates.id", onupdate="cascade", ondelete="cascade"), nullable=False)
step_id = Column(Integer, ForeignKey("bw_template_steps.id", onupdate="cascade", ondelete="cascade"), nullable=True)
step_id = Column(Integer, ForeignKey("bw_template_steps.step", onupdate="cascade", ondelete="cascade"), nullable=True)
type = Column(CUSTOM_CONFIGS_TYPES_ENUM, nullable=False)
name = Column(String(256), nullable=False)
data = Column(LargeBinary(length=(2**32) - 1), nullable=False)