Skip to content

Commit

Permalink
feat(openchallenges): enable users to search challenges using EDAM op…
Browse files Browse the repository at this point in the history
…eration ID and preferred label (#2555)
  • Loading branch information
tschaffter authored Mar 11, 2024
1 parent 6aff968 commit 895cead
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ public class ChallengeEntity {

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "operation_id", nullable = true)
@IndexedEmbedded(includePaths = {"class_id", "preferred_label"})
@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
private EdamOperationEntity operation;

@Column(name = "created_at")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;

@Entity
@Table(name = "edam_concept")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Indexed(index = "openchallenges-edam-concept")
public class EdamOperationEntity {

@Id
Expand All @@ -25,8 +28,10 @@ public class EdamOperationEntity {
private Long id;

@Column(name = "class_id", nullable = false)
@FullTextField(name = "class_id")
private String classId;

@Column(name = "preferred_label", nullable = false)
@FullTextField(name = "preferred_label")
private String preferredLabel;
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ public ChallengeService(ChallengeRepository challengeRepository) {
private ChallengeMapper challengeMapper = new ChallengeMapper();

private static final List<String> SEARCHABLE_FIELDS =
Arrays.asList("name", "headline", "description", "input_data_types.name");
Arrays.asList(
"name",
"headline",
"description",
"input_data_types.name",
"operation.class_id",
"operation.preferred_label");

@Transactional(readOnly = true)
public ChallengesPageDto listChallenges(ChallengeSearchQueryDto query) {
Expand Down

0 comments on commit 895cead

Please sign in to comment.