Skip to content

Commit 391a4ae

Browse files
feat(db): save aruco flag in db
1 parent d8bc17e commit 391a4ae

File tree

9 files changed

+88951
-3
lines changed

9 files changed

+88951
-3
lines changed

sketch_map_tool/database/client_celery.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def insert_map_frame(
3939
format_: PaperFormat,
4040
orientation: str,
4141
layer: Layer,
42+
aruco: bool,
4243
):
4344
"""Insert map frame alongside map generation parameters into the database.
4445
@@ -56,6 +57,7 @@ def insert_map_frame(
5657
orientation VARCHAR,
5758
layer VARCHAR,
5859
version VARCHAR,
60+
aruco BOOLEAN DEFAULT FALSE,
5961
ts TIMESTAMP WITH TIME ZONE DEFAULT now()
6062
)
6163
"""
@@ -69,6 +71,7 @@ def insert_map_frame(
6971
format,
7072
orientation,
7173
layer,
74+
aruco,
7275
version
7376
)
7477
VALUES (
@@ -80,6 +83,7 @@ def insert_map_frame(
8083
%s,
8184
%s,
8285
%s,
86+
%s,
8387
%s)
8488
"""
8589
with db_conn.cursor() as curs:
@@ -95,6 +99,7 @@ def insert_map_frame(
9599
str(format_),
96100
orientation,
97101
layer,
102+
aruco,
98103
__version__,
99104
),
100105
)

sketch_map_tool/tasks.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,15 @@ def generate_sketch_map(
120120
layer,
121121
aruco,
122122
)
123-
db_client_celery.insert_map_frame(map_img, uuid, bbox, format_, orientation, layer)
123+
db_client_celery.insert_map_frame(
124+
map_img,
125+
uuid,
126+
bbox,
127+
format_,
128+
orientation,
129+
layer,
130+
aruco,
131+
)
124132
return map_pdf
125133

126134

tests/fixtures/cassette/test_as_image

Lines changed: 18345 additions & 0 deletions
Large diffs are not rendered by default.

tests/fixtures/cassette/test_generate_sketch_map

Lines changed: 18345 additions & 0 deletions
Large diffs are not rendered by default.

tests/fixtures/cassette/test_get_map

Lines changed: 18345 additions & 0 deletions
Large diffs are not rendered by default.

tests/fixtures/cassette/test_get_map_image

Lines changed: 18345 additions & 0 deletions
Large diffs are not rendered by default.

tests/fixtures/cassette/uuid_create

Lines changed: 15545 additions & 0 deletions
Large diffs are not rendered by default.

tests/integration/test_celery_tasks.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ def test_generate_sketch_map(bbox, format_, size, scale, layer):
2020
size,
2121
scale,
2222
layer,
23+
False,
2324
)
2425
)
2526
result = task.get(timeout=180)

tests/integration/test_database_client_celery.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,18 @@ def test_close_open_connection():
8181
client_celery.open_connection()
8282

8383

84-
def test_write_map_frame(flask_app, map_frame, bbox, format_, orientation, layer):
84+
def test_write_map_frame(
85+
flask_app,
86+
map_frame,
87+
bbox,
88+
format_,
89+
orientation,
90+
layer,
91+
):
8592
uuid = uuid4()
86-
client_celery.insert_map_frame(map_frame, uuid, bbox, format_, orientation, layer)
93+
client_celery.insert_map_frame(
94+
map_frame, uuid, bbox, format_, orientation, layer, aruco=False
95+
)
8796
with flask_app.app_context():
8897
file = client_flask.select_map_frame(uuid)
8998
assert isinstance(file, bytes)

0 commit comments

Comments
 (0)