Flaschengeist
/
flaschengeist-schedule
7
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Activity

fix(backend): Fix Job model and using controller functions 

type should be the type id not the object
This commit is contained in:
Ferdinand Thiessen 2021-12-22 01:05:10 +01:00
parent 62599898d0
commit 72cb163a00
3 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/flaschengeist_events/event_controller.py
View File

@ -99,7 +99,6 @@ def get_job_types():
def get_job_type(type_id): def get_job_type(type_id):
job_type = JobType.query.get(type_id) job_type = JobType.query.get(type_id)
print(job_type)
if not job_type: if not job_type:
raise NotFound raise NotFound
return job_type return job_type
@ -250,9 +249,9 @@ def get_jobs(user, start=None, end=None, limit=None, offset=None, descending=Non
if end is not None: if end is not None:
query = query.filter(end >= Job.start) query = query.filter(end >= Job.start)
if descending is not None: if descending is not None:
query = query.order_by(Job.start.desc(), Job.type_id_) query = query.order_by(Job.start.desc(), Job.type)
else: else:
query = query.order_by(Job.start, Job.type_id_) query = query.order_by(Job.start, Job.type)
count = query.count() count = query.count()
if limit is not None: if limit is not None:
query = query.limit(limit) query = query.limit(limit)
@ -264,7 +263,7 @@ def get_jobs(user, start=None, end=None, limit=None, offset=None, descending=Non
def add_job(event, job_type, required_services, start, end=None, comment=None): def add_job(event, job_type, required_services, start, end=None, comment=None):
job = Job( job = Job(
required_services=required_services, required_services=required_services,
type=job_type, type_=job_type,
start=start, start=start,
end=end, end=end,
comment=comment, comment=comment,
@ -386,7 +385,7 @@ def respond_invitation(invite: Invitation, accepted=True):
) )
@scheduled(id='dev.flaschengeist.events.assign_backups', minutes=30) @scheduled(id="dev.flaschengeist.events.assign_backups", minutes=30)
def assign_backups(): def assign_backups():
now = datetime.now(tz=timezone.utc) now = datetime.now(tz=timezone.utc)
# now + backup_time + next cron tick # now + backup_time + next cron tick

5
backend/flaschengeist_events/models.py
View File

@ -62,17 +62,17 @@ class Job(db.Model, ModelSerializeMixin):
id: int = db.Column(Serial, primary_key=True) id: int = db.Column(Serial, primary_key=True)
start: datetime = db.Column(UtcDateTime, nullable=False) start: datetime = db.Column(UtcDateTime, nullable=False)
end: Optional[datetime] = db.Column(UtcDateTime) end: Optional[datetime] = db.Column(UtcDateTime)
type: Union[JobType, int] = db.relationship("JobType")
comment: Optional[str] = db.Column(db.String(256)) comment: Optional[str] = db.Column(db.String(256))
type: int = db.Column("type_id", Serial, db.ForeignKey(f"{_table_prefix_}job_type.id"), nullable=False)
locked: bool = db.Column(db.Boolean(), default=False, nullable=False) locked: bool = db.Column(db.Boolean(), default=False, nullable=False)
services: list[Service] = db.relationship( services: list[Service] = db.relationship(
"Service", back_populates="job_", cascade="save-update, merge, delete, delete-orphan" "Service", back_populates="job_", cascade="save-update, merge, delete, delete-orphan"
) )
required_services: float = db.Column(db.Numeric(precision=4, scale=2, asdecimal=False), nullable=False) required_services: float = db.Column(db.Numeric(precision=4, scale=2, asdecimal=False), nullable=False)
type_: JobType = db.relationship("JobType")
event_ = db.relationship("Event", back_populates="jobs") event_ = db.relationship("Event", back_populates="jobs")
event_id_ = db.Column("event_id", Serial, db.ForeignKey(f"{_table_prefix_}event.id"), nullable=False) event_id_ = db.Column("event_id", Serial, db.ForeignKey(f"{_table_prefix_}event.id"), nullable=False)
type_id_ = db.Column("type_id", Serial, db.ForeignKey(f"{_table_prefix_}job_type.id"), nullable=False)
invitations_ = db.relationship("Invitation", cascade="all,delete,delete-orphan", back_populates="job_") invitations_ = db.relationship("Invitation", cascade="all,delete,delete-orphan", back_populates="job_")
@ -112,6 +112,7 @@ class Invitation(db.Model, ModelSerializeMixin):
__tablename__ = _table_prefix_ + "invitation" __tablename__ = _table_prefix_ + "invitation"
id: int = db.Column(Serial, primary_key=True) id: int = db.Column(Serial, primary_key=True)
time: datetime = db.Column(UtcDateTime, nullable=False, default=UtcDateTime.current_utc)
job_id: int = db.Column(Serial, db.ForeignKey(_table_prefix_ + "job.id"), nullable=False) job_id: int = db.Column(Serial, db.ForeignKey(_table_prefix_ + "job.id"), nullable=False)
# Dummy properties for API export # Dummy properties for API export
invitee_id: str = None # User who was invited to take over invitee_id: str = None # User who was invited to take over

32
backend/flaschengeist_events/routes.py
View File

@ -203,9 +203,7 @@ def _add_job(event, data):
start = from_iso_format(data["start"]) start = from_iso_format(data["start"])
end = dict_get(data, "end", None, type=from_iso_format) end = dict_get(data, "end", None, type=from_iso_format)
required_services = data["required_services"] required_services = data["required_services"]
job_type = data["type"] job_type = int(data["type"])
if isinstance(job_type, dict):
job_type = data["type"]["id"]
except (KeyError, ValueError): except (KeyError, ValueError):
raise BadRequest("Missing or invalid POST parameter") raise BadRequest("Missing or invalid POST parameter")
@ -239,22 +237,15 @@ def create_event(current_session):
try: try:
start = from_iso_format(data["start"]) start = from_iso_format(data["start"])
end = dict_get(data, "end", None, type=from_iso_format) end = dict_get(data, "end", None, type=from_iso_format)
data_type = data["type"] event_type = event_controller.get_event_type(int(data["type"]))
if isinstance(data_type, dict):
data_type = data["type"]["id"]
event_type = event_controller.get_event_type(data_type)
except KeyError:
raise BadRequest("Missing POST parameter")
except (NotFound, ValueError):
raise BadRequest("Invalid parameter")
event = event_controller.create_event( event = event_controller.create_event(
start=start, start=start,
end=end, end=end,
name=dict_get(data, "name", None), name=dict_get(data, "name", None, type=str),
is_template=dict_get(data, "is_template", None), is_template=dict_get(data, "is_template", None, type=bool),
event_type=event_type, event_type=event_type,
description=dict_get(data, "description", None), description=dict_get(data, "description", None, type=str),
) )
if "jobs" in data: if "jobs" in data:
for job in data["jobs"]: for job in data["jobs"]:
@ -262,6 +253,11 @@ def create_event(current_session):
return jsonify(event) return jsonify(event)
except KeyError:
raise BadRequest("Missing POST parameter")
except (NotFound, ValueError):
raise BadRequest("Invalid parameter")
@EventPlugin.blueprint.route("/events/<int:event_id>", methods=["PUT"]) @EventPlugin.blueprint.route("/events/<int:event_id>", methods=["PUT"])
@login_required(permission=permissions.EDIT) @login_required(permission=permissions.EDIT)
@ -378,8 +374,8 @@ def update_job(event_id, job_id, current_session: Session):
job = event_controller.get_job(job_id, event_id) job = event_controller.get_job(job_id, event_id)
try: try:
if "type" in data: if "type" in data or "type_id" in data:
job.type = event_controller.get_job_type(data["type"]) job.type_ = event_controller.get_job_type(data.get("type", None) or data["type_id"])
job.start = from_iso_format(data.get("start", job.start)) job.start = from_iso_format(data.get("start", job.start))
job.end = from_iso_format(data.get("end", job.end)) job.end = from_iso_format(data.get("end", job.end))
job.comment = str(data.get("comment", job.comment)) job.comment = str(data.get("comment", job.comment))
@ -492,7 +488,9 @@ def invite(current_session: Session):
raise BadRequest raise BadRequest
return jsonify( return jsonify(
[ [
event_controller.invite(job, invitee, current_session.user_, userController.get_user(transferee) if transferee else None) event_controller.invite(
job, invitee, current_session.user_, userController.get_user(transferee) if transferee else None
)
for invitee in [userController.get_user(uid) for uid in data["invitees"]] for invitee in [userController.get_user(uid) for uid in data["invitees"]]
] ]
) )