From 2adf62caf7b08672be55d146d72d4a482b280988 Mon Sep 17 00:00:00 2001
From: Eng3lFT <angel.perez@ft.com>
Date: Tue, 17 Jan 2023 12:03:14 +0200
Subject: [PATCH] Removing unnecessary check statement. Simplifying filtering
 and sorting.

---
 pkg/mapper/mapper.go | 46 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkg/mapper/mapper.go b/pkg/mapper/mapper.go
index 2481174..9227da4 100644
--- a/pkg/mapper/mapper.go
+++ b/pkg/mapper/mapper.go
@@ -95,36 +95,39 @@ func (h *Handler) ToIndexModel(enrichedContent schema.EnrichedContent, contentTy
 
 func (h *Handler) populatePrimaryTheme(model *schema.IndexModel, annotations []schema.Thing, ids map[string][]string, predicateKey string) {
 	predicate := h.Config.Predicates.Get(predicateKey)
-	sorted := filterSortAnnotations(annotations, ids, predicate)
-	if len(sorted) == 0 {
+	annotations = filterAnnotations(annotations, ids, predicate)
+	if len(annotations) == 0 {
 		return
 	}
-	annotation := sorted[0]
+
+	sort.Slice(annotations, func(i, j int) bool {
+		return annotations[i].PrefLabel < annotations[j].PrefLabel
+	})
+
+	annotation := annotations[0]
 	annIDs := ids[annotation.ID]
 	conceptTypes := h.Config.ConceptTypes
 
 	for _, taxonomy := range annotation.Types {
-		if annotation.Predicate == predicate {
-			tme := ""
-			switch taxonomy {
-			case conceptTypes.Get("organisation"):
-				tme = tmeOrganisations
-			case conceptTypes.Get("person"):
-				tme = tmePeople
-			case conceptTypes.Get("topic"):
-				tme = tmeTopics
-			case conceptTypes.Get("location"):
-				tme = tmeRegions
-			}
-			if tme != "" {
-				setPrimaryTheme(model, annotation.PrefLabel, getCmrIDWithFallback(tme, annIDs))
-				break
-			}
+		tme := ""
+		switch taxonomy {
+		case conceptTypes.Get("organisation"):
+			tme = tmeOrganisations
+		case conceptTypes.Get("person"):
+			tme = tmePeople
+		case conceptTypes.Get("topic"):
+			tme = tmeTopics
+		case conceptTypes.Get("location"):
+			tme = tmeRegions
+		}
+		if tme != "" {
+			setPrimaryTheme(model, annotation.PrefLabel, getCmrIDWithFallback(tme, annIDs))
+			break
 		}
 	}
 }
 
-func filterSortAnnotations(annotations []schema.Thing, ids map[string][]string, predicate string) []schema.Thing {
+func filterAnnotations(annotations []schema.Thing, ids map[string][]string, predicate string) []schema.Thing {
 	var matchedAnnotations []schema.Thing
 
 	for _, annotation := range annotations {
@@ -132,9 +135,6 @@ func filterSortAnnotations(annotations []schema.Thing, ids map[string][]string,
 			matchedAnnotations = append(matchedAnnotations, annotation)
 		}
 	}
-	sort.Slice(matchedAnnotations, func(i, j int) bool {
-		return matchedAnnotations[i].PrefLabel < matchedAnnotations[j].PrefLabel
-	})
 	return matchedAnnotations
 }