parseResultBodyで構造体使うように

traPtitech · Aug 7, 2023 · 73c5fce · 73c5fce
1 parent fcc98b9
commit 73c5fce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/service/search/es.go b/service/search/es.go
@@ -411,13 +411,13 @@ func (e *esEngine) Do(q *Query) (Result, error) {
 	if err != nil {
 		return nil, err
 	}
-	var res m
+	var res esSearchResponse
 	err = json.Unmarshal(searchResultBody, &res)
 	if err != nil {
 		return nil, err
 	}
 
-	e.l.Debug("search result", zap.Reflect("hits", res["hits"]))
+	e.l.Debug("search result", zap.Reflect("hits", res.Hits))
 	return e.parseResultBody(res)
 }
 

diff --git a/service/search/es_result.go b/service/search/es_result.go
@@ -24,15 +24,8 @@ type esSearchResponse struct {
 		Total      int64 `json:"total"`
 	} `json:"_shards"`
 	Hits struct {
-		Hits []struct {
-			ID     string       `json:"_id"`
-			Index  string       `json:"_index"`
-			Score  interface{}  `json:"_score"`
-			Source esMessageDoc `json:"_source"`
-			Type   string       `json:"_type"`
-			Sort   []int64      `json:"sort"`
-		} `json:"hits"`
-		MaxScore interface{} `json:"max_score"`
+		Hits     []esSearchHit `json:"hits"`
+		MaxScore interface{}   `json:"max_score"`
 		Total    struct {
 			Relation string `json:"relation"`
 			Value    int64  `json:"value"`
@@ -42,17 +35,26 @@ type esSearchResponse struct {
 	Took     int64 `json:"took"`
 }
 
-func (e *esEngine) parseResultBody(resBody m) (Result, error) {
-	totalHits := resBody["hits"].(map[string]interface{})["total"].(map[string]interface{})["value"].(float64)
-	hits := resBody["hits"].(map[string]interface{})["hits"].([]any)
+type esSearchHit struct {
+	ID     string       `json:"_id"`
+	Index  string       `json:"_index"`
+	Score  interface{}  `json:"_score"`
+	Source esMessageDoc `json:"_source"`
+	Type   string       `json:"_type"`
+	Sort   []int64      `json:"sort"`
+}
+
+func (e *esEngine) parseResultBody(resBody esSearchResponse) (Result, error) {
+	totalHits := resBody.Hits.Total.Value
+	hits := resBody.Hits.Hits
 
 	r := &esResult{
 		totalHits: int64(totalHits),
 		messages:  make([]message.Message, 0, len(hits)),
 	}
 
-	messageIDs := utils.Map(hits, func(hit any) uuid.UUID {
-		return uuid.Must(uuid.FromString(hit.(map[string]any)["_id"].(string)))
+	messageIDs := utils.Map(hits, func(hit esSearchHit) uuid.UUID {
+		return uuid.Must(uuid.FromString(hit.ID))
 	})
 
 	messages, err := e.mm.GetIn(messageIDs)