Extend DAO object with active proposals ids

CHANGELOG.md

@@ -7,6 +7,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Added
+- Extend DAO object with active proposals ids
+
 ## [0.2.7] - 2024-10-07
 
 ### Fixed

internal/dao/models.go

@@ -107,8 +107,11 @@ type Dao struct {
 	ActivitySince   int
 	VotersCount     int
 	PopularityIndex float64
-	ActiveVotes     int
-	Verified        bool
+	// ActiveVotes the number of active proposals
+	ActiveVotes int
+	// ActiveProposalsIDs the list of active proposals identifiers
+	ActiveProposalsIDs []string `gorm:"serializer:json"`
+	Verified           bool
 }
 
 func convertToCoreEvent(dao Dao) events.DaoPayload {

internal/dao/repo.go

@@ -62,7 +62,6 @@ type DaoList struct {
 	TotalCount int64
 }
 
-// todo: add order by
 func (r *Repo) GetByFilters(filters []Filter, count bool) (DaoList, error) {
 	db := r.db.Model(&Dao{})
 	for _, f := range filters {
@@ -141,11 +140,17 @@ where daos.id = ?
 }
 
 func (r *Repo) UpdateActiveVotes(id uuid.UUID) error {
+	var (
+		dummy = Dao{}
+		_     = dummy.ActiveVotes
+		_     = dummy.ActiveProposalsIDs
+	)
+
 	return r.db.Exec(`
 update daos
-set active_votes = cnt.active_votes
+set active_votes = cnt.active_votes, active_proposals_ids = cnt.list
 from (
-	select count(*) as active_votes
+	select count(*) as active_votes, coalesce(json_agg(id), '[]') list
 	from proposals
 	where dao_id = ? and state = 'active' and spam is not true
 ) cnt
@@ -156,9 +161,12 @@ where daos.id = ?
 func (r *Repo) UpdateActiveVotesAll() error {
 	return r.db.Exec(`
 update daos
-set active_votes = cnt.active_votes
+set active_votes = cnt.active_votes, active_proposals_ids = cnt.list
 from (
-	select dao_id, count(id) filter (where state = 'active' and spam is not true) as active_votes
+	select
+          dao_id,
+          count(id) filter (where state = 'active' and spam is not true) as active_votes,
+          coalesce(json_agg(id) filter (where state = 'active' and spam is not true), '[]')  as list
 	from proposals
 	group by dao_id
 ) cnt

internal/dao/server.go

@@ -148,38 +148,39 @@ func (s *Server) GetTopByCategories(ctx context.Context, req *storagepb.TopByCat
 
 func convertDaoToAPI(dao *Dao) *storagepb.DaoInfo {
 	return &storagepb.DaoInfo{
-		Id:              dao.ID.String(),
-		Alias:           dao.OriginalID,
-		CreatedAt:       timestamppb.New(dao.CreatedAt),
-		UpdatedAt:       timestamppb.New(dao.UpdatedAt),
-		Name:            dao.Name,
-		Private:         dao.Private,
-		About:           dao.About,
-		Avatar:          dao.Avatar,
-		Terms:           dao.Terms,
-		Location:        dao.Location,
-		Website:         dao.Website,
-		Twitter:         dao.Twitter,
-		Github:          dao.Github,
-		Coingeko:        dao.Coingecko,
-		Email:           dao.Email,
-		Network:         dao.Network,
-		Symbol:          dao.Symbol,
-		Skin:            dao.Skin,
-		Domain:          dao.Domain,
-		Strategies:      convertStrategiesToAPI(dao.Strategies),
-		Voting:          convertVotingToAPI(dao.Voting),
-		Categories:      dao.Categories,
-		Treasuries:      convertTreasuriesToAPI(dao.Treasures),
-		FollowersCount:  uint64(dao.VotersCount),
-		ProposalsCount:  uint64(dao.ProposalsCount),
-		Guidelines:      dao.Guidelines,
-		Template:        dao.Template,
-		ActivitySince:   uint64(dao.ActivitySince),
-		VotersCount:     uint64(dao.VotersCount),
-		ActiveVotes:     uint64(dao.ActiveVotes),
-		Verified:        dao.Verified,
-		PopularityIndex: dao.PopularityIndex,
+		Id:                 dao.ID.String(),
+		Alias:              dao.OriginalID,
+		CreatedAt:          timestamppb.New(dao.CreatedAt),
+		UpdatedAt:          timestamppb.New(dao.UpdatedAt),
+		Name:               dao.Name,
+		Private:            dao.Private,
+		About:              dao.About,
+		Avatar:             dao.Avatar,
+		Terms:              dao.Terms,
+		Location:           dao.Location,
+		Website:            dao.Website,
+		Twitter:            dao.Twitter,
+		Github:             dao.Github,
+		Coingeko:           dao.Coingecko,
+		Email:              dao.Email,
+		Network:            dao.Network,
+		Symbol:             dao.Symbol,
+		Skin:               dao.Skin,
+		Domain:             dao.Domain,
+		Strategies:         convertStrategiesToAPI(dao.Strategies),
+		Voting:             convertVotingToAPI(dao.Voting),
+		Categories:         dao.Categories,
+		Treasuries:         convertTreasuriesToAPI(dao.Treasures),
+		FollowersCount:     uint64(dao.VotersCount),
+		ProposalsCount:     uint64(dao.ProposalsCount),
+		Guidelines:         dao.Guidelines,
+		Template:           dao.Template,
+		ActivitySince:      uint64(dao.ActivitySince),
+		VotersCount:        uint64(dao.VotersCount),
+		ActiveVotes:        uint64(dao.ActiveVotes),
+		Verified:           dao.Verified,
+		PopularityIndex:    dao.PopularityIndex,
+		ActiveProposalsIds: dao.ActiveProposalsIDs,
 		// TODO: parentID
 	}
 }

internal/ensresolver/repo.go

@@ -8,10 +8,6 @@ import (
 	"gorm.io/gorm/clause"
 )
 
-const (
-	defaultBatchSize = 100
-)
-
 type Repo struct {
 	db *gorm.DB
 }