Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/webapp/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def _setup_test_institutions(session: Session) -> None:
name=model["name"],
created_by=LOCAL_USER_UUID,
valid=model.get("valid", True),
archived=model.get("archived", 0),
created_at=DATETIME_TESTING,
updated_at=DATETIME_TESTING,
)
Expand Down
4 changes: 4 additions & 0 deletions src/webapp/routers/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ class ModelInfo(BaseModel):
created_by: str | None = None
valid: bool = True
deleted: bool | None = None
archived: int = 0


def _model_version_as_str(version: Any) -> str | None:
Expand Down Expand Up @@ -297,6 +298,7 @@ def read_inst_models(
"created_by": uuid_to_str(elem[0].created_by),
"deleted": elem[0].deleted,
"valid": elem[0].valid,
"archived": elem[0].archived,
}
)
return res
Expand Down Expand Up @@ -373,6 +375,7 @@ def create_model(
"created_by": uuid_to_str(query_result[0][0].created_by),
"deleted": query_result[0][0].deleted,
"valid": query_result[0][0].valid,
"archived": query_result[0][0].archived,
}


Expand Down Expand Up @@ -420,6 +423,7 @@ def read_inst_model(
"created_by": uuid_to_str(query_result[0][0].created_by),
"deleted": query_result[0][0].deleted,
"valid": query_result[0][0].valid,
"archived": query_result[0][0].archived,
}


Expand Down
3 changes: 3 additions & 0 deletions src/webapp/routers/models_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def same_model_orderless(a_elem: ModelInfo, b_elem: ModelInfo) -> bool:
or a_elem.m_id != b_elem.m_id
or a_elem.valid != b_elem.valid
or a_elem.deleted != b_elem.deleted
or a_elem.archived != b_elem.archived
):
return False
return True
Expand Down Expand Up @@ -247,6 +248,7 @@ def test_read_inst_models(client: TestClient) -> None:
inst_id="1d7c75c33eda42949c6675ea8af97b55",
deleted=None,
valid=True,
archived=0,
),
)

Expand Down Expand Up @@ -279,6 +281,7 @@ def test_read_inst_model(client: TestClient) -> None:
m_id="e4862c62829440d8ab4c9c298f02f619",
name="sample_model_for_school_1",
valid=True,
archived=0,
)
assert same_model_orderless(response_model, expected_model)

Expand Down
Loading