Skip to content

Commit b4b6da3

Browse files
committed
Rename value to label of Controlled keyword in search and statistics.
1 parent 379b56d commit b4b6da3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/mavedb/lib/experiments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def search_experiments(
100100
query = query.filter(
101101
Experiment.keyword_objs.any(
102102
ExperimentControlledKeywordAssociation.controlled_keyword.has(
103-
ControlledKeyword.value.in_(search.keywords)
103+
ControlledKeyword.label.in_(search.keywords)
104104
)
105105
)
106106
)

src/mavedb/lib/score_sets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ def search_score_sets(db: Session, owner_or_contributor: Optional[User], search:
210210
ScoreSet.experiment.has(
211211
Experiment.keyword_objs.any(
212212
ExperimentControlledKeywordAssociation.controlled_keyword.has(
213-
ControlledKeyword.value.in_(search.keywords)
213+
ControlledKeyword.label.in_(search.keywords)
214214
)
215215
)
216216
)

src/mavedb/routers/statistics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ def experiment_keyword_statistics(
150150
raise HTTPException(500, "No association table associated with the keywords field when one was expected.")
151151

152152
query = _join_model_and_filter_unpublished(
153-
select(ControlledKeyword.value, func.count(ControlledKeyword.value)).join(queried_assc), queried_model
154-
).group_by(ControlledKeyword.value)
153+
select(ControlledKeyword.label, func.count(ControlledKeyword.label)).join(queried_assc), queried_model
154+
).group_by(ControlledKeyword.label)
155155

156156
return _count_for_identifier_in_query(db, query)
157157

0 commit comments

Comments
 (0)