Accepted, expired proposals (#37)

Author: dantudor

go.mod

@@ -5,7 +5,7 @@ go 1.14
 replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v0.0.0-20190204201341-e444a5086c43
 
 require (
-	github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.5
+	github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.6
 	github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef // indirect
 	github.com/getsentry/raven-go v0.2.0 // indirect
 	github.com/gin-contrib/cors v1.3.1

go.sum

@@ -121,6 +121,10 @@ github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.5-0.20210614203907-9611703
 github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.5-0.20210614203907-9611703eaacd/go.mod h1:faeFJ5mIQHw19ielkx46x/JaXr3zlMHB9bZH9ntGXXE=
 github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.5 h1:qSMt1qK7NhqChu0Roj0QZb1tAyoPwk/xuEr2tJrzYN8=
 github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.5/go.mod h1:faeFJ5mIQHw19ielkx46x/JaXr3zlMHB9bZH9ntGXXE=
+github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.6-0.20210629085159-48b7279255f1 h1:uqSe2RZxteVdCHW7S/FOZZTfvsEF7qFduOwhyJ12M9o=
+github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.6-0.20210629085159-48b7279255f1/go.mod h1:faeFJ5mIQHw19ielkx46x/JaXr3zlMHB9bZH9ntGXXE=
+github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.6 h1:5npV87e149TKsuccyVkVTnSnYzahLd64u1FopYF6H5g=
+github.com/NavExplorer/navexplorer-indexer-go/v2 v2.1.6/go.mod h1:faeFJ5mIQHw19ielkx46x/JaXr3zlMHB9bZH9ntGXXE=
 github.com/NavExplorer/subscriber v0.0.0-20200601205031-4135a91491af h1:KWrfS1eDXRPSpY6pyBMGYiqLSIJ08TargSgbFeUTaMA=
 github.com/NavExplorer/subscriber v0.0.0-20200601205031-4135a91491af/go.mod h1:b9UVwdUV1OVGDsOMqOJeu5Rk5SPyOgfHfvM0HH4fvdU=
 github.com/NavExplorer/subscriber v0.0.0-20200601212953-3a6c48dd3d5d h1:4tlsQCkBbil7rexH6A0CGyRh5I7z1QP/ftiFLWP7ADo=

internal/repository/dao_proposal_repository.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"github.com/NavExplorer/navexplorer-api-go/v2/internal/elastic_cache"
 	"github.com/NavExplorer/navexplorer-api-go/v2/internal/service/dao/entity"
 	"github.com/NavExplorer/navexplorer-api-go/v2/internal/service/network"
@@ -34,16 +33,17 @@ func NewDaoProposalRepository(elastic *elastic_cache.Index) DaoProposalRepositor
 
 func (r *daoProposalRepository) GetProposals(n network.Network, status *explorer.ProposalStatus, dir bool, size int, page int) ([]*explorer.Proposal, int64, error) {
 	query := elastic.NewBoolQuery()
-	if status != nil {
-		statusQuery := status.Status
-		if *status == explorer.ProposalAccepted {
-			statusQuery = fmt.Sprintf("%s %s", statusQuery, explorer.ProposalPendingVotingPreq.Status)
-		}
-		query = query.Must(elastic.NewTermQuery("status.keyword", statusQuery))
+	if *status == explorer.ProposalAccepted {
+		query = query.Should(elastic.NewTermQuery("status.keyword", status.Status))
+		query = query.Should(elastic.NewTermQuery("status.keyword", explorer.ProposalPendingVotingPreq.Status))
+		query = query.Should(elastic.NewTermQuery("status.keyword", explorer.ProposalAcceptedExpired.Status))
+	} else {
+		query = query.Must(elastic.NewTermQuery("status.keyword", status.Status))
 	}
 
 	results, err := r.elastic.Client.Search(elastic_cache.ProposalIndex.Get(n)).
 		Query(query).
+		Sort("state.keyword", !dir).
 		Sort("height", dir).
 		From((page * size) - size).
 		Size(size).