Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Chaos Parcel Service
backend
Commits
87b95479
Verified
Commit
87b95479
authored
Sep 20, 2023
by
hanfi
Browse files
Options
Downloads
Patches
Plain Diff
improved error handling
parent
96976c47
Branches
Branches containing commit
Tags
v5.89
Tags containing commit
1 merge request
!8
backend api v2
This commit is part of merge request
!8
. Comments created here will be created in the context of that merge request.
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
backend/utils.py
+29
-25
29 additions, 25 deletions
backend/utils.py
with
29 additions
and
25 deletions
backend/utils.py
+
29
−
25
Edit
View file @
87b95479
...
@@ -41,10 +41,11 @@ def get_item_by_uuid(db: Session, item_uuid: UUID4):
...
@@ -41,10 +41,11 @@ def get_item_by_uuid(db: Session, item_uuid: UUID4):
def
get_storage_by_name
(
db
:
Session
,
storage_name
:
str
):
def
get_storage_by_name
(
db
:
Session
,
storage_name
:
str
):
storage
=
db
.
get
(
models
.
Storage
,
storage_name
)
storage
=
db
.
get
(
models
.
Storage
,
storage_name
)
if
storage
:
storage
.
items
=
[
storage
.
items
=
[
item
for
item
in
storage
.
items
if
item
.
deployed_at
==
None
# noqa: E711
item
for
item
in
storage
.
items
if
item
.
deployed_at
==
None
# noqa: E711
]
]
return
db
.
get
(
models
.
Storage
,
storage
_name
)
return
storage
def
get_storages
(
db
:
Session
):
def
get_storages
(
db
:
Session
):
...
@@ -58,22 +59,24 @@ def get_storages(db: Session):
...
@@ -58,22 +59,24 @@ def get_storages(db: Session):
def
get_delivery_by_uuid
(
db
:
Session
,
delivery_uuid
:
UUID4
):
def
get_delivery_by_uuid
(
db
:
Session
,
delivery_uuid
:
UUID4
):
delivery
=
db
.
get
(
models
.
Delivery
,
delivery_uuid
)
delivery
=
db
.
get
(
models
.
Delivery
,
delivery_uuid
)
if
delivery
:
delivery
.
amount
=
len
(
delivery
.
items
)
delivery
.
amount
=
len
(
delivery
.
items
)
delivery
.
items
=
[
delivery
.
items
=
[
item
for
item
in
delivery
.
items
if
item
.
deployed_at
==
None
# noqa: E711
item
for
item
in
delivery
.
items
if
item
.
deployed_at
==
None
# noqa: E711
]
]
return
d
b
.
get
(
models
.
Delivery
,
delivery_uuid
)
return
d
elivery
def
get_delivery_by_tag
(
db
:
Session
,
delivery_tag
:
str
):
def
get_delivery_by_tag
(
db
:
Session
,
delivery_tag
:
str
):
delivery
=
(
delivery
=
(
db
.
query
(
models
.
Delivery
).
filter
(
models
.
Delivery
.
tag
==
delivery_tag
).
first
()
db
.
query
(
models
.
Delivery
).
filter
(
models
.
Delivery
.
tag
==
delivery_tag
).
first
()
)
)
if
delivery
:
delivery
.
amount
=
len
(
delivery
.
items
)
delivery
.
amount
=
len
(
delivery
.
items
)
delivery
.
items
=
[
delivery
.
items
=
[
item
for
item
in
delivery
.
items
if
item
.
deployed_at
==
None
# noqa: E711
item
for
item
in
delivery
.
items
if
item
.
deployed_at
==
None
# noqa: E711
]
]
return
d
b
.
query
(
models
.
Delivery
).
filter
(
models
.
Delivery
.
tag
==
delivery_tag
).
first
()
return
d
elivery
def
prepare_delivery
(
db
:
Session
,
verification
:
str
):
def
prepare_delivery
(
db
:
Session
,
verification
:
str
):
...
@@ -91,6 +94,7 @@ def update_delivery_data(
...
@@ -91,6 +94,7 @@ def update_delivery_data(
db
:
Session
,
delivery_uuid
:
UUID4
,
update_data
:
schemas
.
DeliveryUpdate
db
:
Session
,
delivery_uuid
:
UUID4
,
update_data
:
schemas
.
DeliveryUpdate
):
):
delivery
=
db
.
get
(
models
.
Delivery
,
delivery_uuid
)
delivery
=
db
.
get
(
models
.
Delivery
,
delivery_uuid
)
if
delivery
:
if
update_data
.
addressee
:
if
update_data
.
addressee
:
delivery
.
addressee
=
escape
(
update_data
.
addressee
)
delivery
.
addressee
=
escape
(
update_data
.
addressee
)
if
update_data
.
team
:
if
update_data
.
team
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment