Implemented faculty filter #1703

ugent-library · Sep 26, 2024 · d973e96 · d973e96
1 parent 81d5a15
commit d973e96
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/handlers/candidaterecords/candidate_records.go b/handlers/candidaterecords/candidate_records.go
@@ -46,15 +46,22 @@ func CandidateRecords(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	facultyFacet, err := c.Repo.GetCandidateRecordsFacultyFacet(r.Context(), searchArgs)
+	if err != nil {
+		c.HandleError(w, r, err)
+		return
+	}
+
 	publicationYearFacet, err := c.Repo.GetCandidateRecordsPublicationYearFacet(r.Context(), searchArgs)
 	if err != nil {
 		c.HandleError(w, r, err)
 		return
 	}
 
 	facets := map[string]models.FacetValues{
-		"status": statusFacet,
-		"year":   publicationYearFacet,
+		"status":     statusFacet,
+		"faculty_id": facultyFacet,
+		"year":       publicationYearFacet,
 	}
 
 	searchHits := &models.SearchHits{

diff --git a/repositories/candidate_records.go b/repositories/candidate_records.go
@@ -234,6 +234,21 @@ func (r *Repo) GetCandidateRecordsStatusFacet(ctx context.Context, searchArgs *m
 	return result, nil
 }
 
+func (r *Repo) GetCandidateRecordsFacultyFacet(ctx context.Context, searchArgs *models.SearchArgs) (models.FacetValues, error) {
+	query := getBaseQuery("jsonb_path_query(metadata, '$.related_organizations.organization_id')->>0 AS Value", "COUNT(*) AS Count").
+		OrderBy("Value").
+		GroupBy("Value")
+
+	query = addQueryFilters(query, searchArgs, "faculty_id")
+
+	result, err := queryRows[models.Facet](r, ctx, query)
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
 func (r *Repo) GetCandidateRecordsPublicationYearFacet(ctx context.Context, searchArgs *models.SearchArgs) (models.FacetValues, error) {
 	query := getBaseQuery("metadata->>'year' AS Value", "COUNT(*) AS Count").
 		OrderBy("Value DESC").
@@ -310,6 +325,12 @@ func addQueryFilters(query sq.SelectBuilder, searchArgs *models.SearchArgs, omit
 		case "status":
 			query = query.Where(sq.Eq{"status": filterValue})
 
+		case "faculty_id":
+			conditions := lo.Map(filterValue, func(facultyID string, _ int) sq.Sqlizer {
+				return sq.Expr("metadata->'related_organizations' @> ?::jsonb", getFacultyFilter(facultyID))
+			})
+			query = query.Where(sq.Or(conditions))
+
 		case "year":
 			query = query.Where(sq.Eq{"metadata->>'year'": filterValue})
 
@@ -330,6 +351,12 @@ func getPersonFilter(personID string) []byte {
 	return personFilter
 }
 
+func getFacultyFilter(facultyID string) []byte {
+	facultyFilter, _ := json.Marshal([]models.RelatedOrganization{{OrganizationID: facultyID}})
+
+	return facultyFilter
+}
+
 func (r *Repo) mapRows(rows []candidateRecordRow, iteratee func(candidateRecordRow) *models.CandidateRecord) (int, []*models.CandidateRecord, error) {
 	if len(rows) == 0 {
 		return 0, make([]*models.CandidateRecord, 0), nil