Merge pull request #123 from traP-jp/fix/search-sort

search sort by date

.gitignore

@@ -11,4 +11,5 @@ build/
 UNKNOWN*/
 !requirements.txt
 *.bleve
-sql/
+sql/
+!stoplist_ja.txt

docs/openapi.yaml

@@ -147,6 +147,7 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/searchRequest'
+      description: sortはcreatedAt_oldest, createdAt_newest
       responses:
         '200':
           description: OK
@@ -660,6 +661,9 @@ components:
         from:
           type: integer
           example: 0
+        sort:
+          type: string
+          example: createdAt_oldest
     lectureWithoutId:
       type: object
       properties:

src/handler/wikiHandler.go

@@ -208,7 +208,7 @@ func (h *Handler) SearchHandler(c echo.Context) error {
 	// query検索
 	var searchResults_Query []int
 	if request.Query != "" {
-		searchResults_Query = search.Search(request.Query, request.ResultCount, request.From)
+		searchResults_Query = search.Search(request.Query, request.ResultCount, request.From, request.Sort)
 		if len(searchResults_Query) == 0 {
 			return echo.NewHTTPError(http.StatusNotFound, "No results were found matching that query.")
 		}

src/model/model.go

@@ -172,6 +172,7 @@ type WikiSearchBody struct {
 	Tags        []string `json:"tags"`
 	From        int      `json:"from"`
 	ResultCount int      `json:"resultCount"`
+	Sort        string   `json:"sort"`
 }
 
 type Tag_Post struct {

src/scraper/newMessages.go

@@ -221,6 +221,7 @@ func (s *Scraper) addMessageIndex(wikiId int) {
 			Title:          wiki.Name,
 			OwnerTraqID:    wiki.OwnerTraqID,
 			MessageContent: wiki.Content,
+			CreatedAt:      wiki.CreatedAt,
 		},
 	}
 
@@ -251,7 +252,7 @@ func (s *Scraper) removeMentionSingle(wikiId int) {
 
 	for _, m := range messages {
 		text := ProcessMention(m.MessageContent)
-		_, err = s.db.Exec("UPDATE messages SET message_content = ? WHERE id = ?", text, m.ID)
+		_, err = s.db.Exec("UPDATE messages SET content = ? WHERE id = ?", text, m.ID)
 		if err != nil {
 			log.Println("failed to update message")
 			log.Println(err)

src/scraper/search.go

@@ -22,6 +22,7 @@ func (s *Scraper) SetIndexing() {
 			Title:          wiki.Name,
 			OwnerTraqID:    wiki.OwnerTraqID,
 			MessageContent: ProcessLink(removeNewLine(removeCodeBlock(removeTeX(wiki.Content)))),
+			CreatedAt:      wiki.CreatedAt,
 		})
 	}
 

src/search/index.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"strconv"
+	"time"
 )
 
 type IndexData struct {
@@ -14,6 +15,7 @@ type IndexData struct {
 	Title          string
 	OwnerTraqID    string
 	MessageContent string
+	CreatedAt      time.Time
 }
 
 func Indexing(data []IndexData) {
@@ -72,6 +74,9 @@ func Indexing(data []IndexData) {
 		return
 	}
 
-	res := Search("windows", 20, 0)
+	res := Search("windows", 20, 0, "createdAt_oldest")
+	log.Println(res)
+
+	res = Search("windows", 20, 0, "createdAt_newest")
 	log.Println(res)
 }

src/search/search.go

@@ -7,9 +7,10 @@ import (
 	"strconv"
 )
 
-// return array of ID
+// Search return array of ID
 // return empty array if no result or error
-func Search(query string, limit int, offset int) []int {
+// sort: "createdAt_oldest", "createdAt_newest", "none"
+func Search(query string, limit int, offset int, sort string) []int {
 	log.Println("[Info from search] Searching by query: ", query)
 	if _, err := os.Stat("index.bleve"); err != nil {
 		log.Println("[Error from search] Index file does not exist. Please create index file first.")
@@ -32,6 +33,16 @@ func Search(query string, limit int, offset int) []int {
 	bleveQuery := bleve.NewMatchQuery(query)
 	bleveQuery.SetField("MessageContent")
 	search := bleve.NewSearchRequestOptions(bleveQuery, limit, offset, false)
+	switch sort {
+	case "createdAt_oldest":
+		search.SortBy([]string{"CreatedAt", "-_score"})
+		break
+	case "createdAt_newest":
+		search.SortBy([]string{"-CreatedAt", "-_score"})
+		break
+	default:
+		search.SortBy([]string{"_score"})
+	}
 	searchResults, err := index.Search(search)
 	if err != nil {
 		log.Printf("[Error from search] failed to search by query\"%s\": %v\n", query, err)

test/blevesearch/main.go

@@ -1,12 +1,10 @@
 package main
 
 import (
-	"github.com/blevesearch/bleve/v2"
 	"github.com/blevesearch/bleve/v2/analysis/analyzer/custom"
 	"github.com/blevesearch/bleve/v2/analysis/analyzer/keyword"
 	"github.com/blevesearch/bleve/v2/analysis/token/lowercase"
 	"github.com/ikawaha/bleveplugin/analysis/lang/ja"
-	"github.com/shogo82148/go-mecab"
 	"log"
 )
 
@@ -40,10 +38,10 @@ func main() {
 	}
 	index.Close()
 
-	settinrMecab()
+	settingMecab()
 }
 
-func settinrMecab() {
+func settingMecab() {
 	tagger, err := mecab.New(map[string]string{"output-format-type": "wakati"})
 	if err != nil {
 		log.Println(err)