feat(phase): return block range on graphql phase

okp4 · Dec 14, 2022 · 35260fd · 35260fd
1 parent 99880d9
commit 35260fd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/app/nemeton/phase.go b/app/nemeton/phase.go
@@ -1,14 +1,17 @@
 package nemeton
 
-import "time"
+import (
+ "time"
+)
 
 type Phase struct {
- Number int `bson:"_id"`
- Name string `bson:"name"`
- Description string `bson:"description"`
- StartDate time.Time `bson:"startDate"`
- EndDate time.Time `bson:"endDate"`
- Tasks []Task `bson:"tasks"`
+ Number int `bson:"_id"`
+ Name string `bson:"name"`
+ Description string `bson:"description"`
+ StartDate time.Time `bson:"startDate"`
+ EndDate time.Time `bson:"endDate"`
+ Tasks []Task `bson:"tasks"`
+ Blocks BlockRange `bson:"blocks"`
 }
 
 func (p Phase) Started() bool {

diff --git a/app/nemeton/range.go b/app/nemeton/range.go
@@ -0,0 +1,9 @@
+package nemeton
+
+// BlockRange Represents a blockchain block range.
+type BlockRange struct {
+ // The block height the range begin, inclusive.
+ From int `bson:"from"`
+ // The block height the range end, inclusive.
+ To int `bson:"to"`
+}
diff --git a/app/nemeton/store.go b/app/nemeton/store.go
@@ -9,7 +9,6 @@ import (
  "okp4/nemeton-leaderboard/app/util"
 
  "github.com/cosmos/cosmos-sdk/types"
- "github.com/rs/zerolog/log"
  "go.mongodb.org/mongo-driver/bson"
  "go.mongodb.org/mongo-driver/mongo"
  "go.mongodb.org/mongo-driver/mongo/options"
@@ -390,7 +389,7 @@ func (s *Store) completeTask(ctx context.Context, when time.Time, filter bson.M,
 }
 
 func (s *Store) UpdatePhaseBlocks(ctx context.Context, blockTime time.Time, height int64) error {
- r, err := s.db.Collection(phasesCollectionName).UpdateOne(ctx, bson.M{
+ _, err := s.db.Collection(phasesCollectionName).UpdateOne(ctx, bson.M{
  "startDate": bson.M{"$lte": blockTime},
  "endDate": bson.M{"$gt": blockTime},
  }, bson.A{
@@ -407,6 +406,5 @@ func (s *Store) UpdatePhaseBlocks(ctx context.Context, blockTime time.Time, heig
  },
  bson.M{"$set": bson.M{"blocks.to": height}},
  })
- log.Info().Interface("r", r)
  return err
 }
diff --git a/graphql/schema.resolvers.go b/graphql/schema.resolvers.go
@@ -57,7 +57,11 @@ func (r *mutationResolver) SubmitValidatorGenTx(ctx context.Context, twitter *st
 
 // Blocks is the resolver for the blocks field.
 func (r *phaseResolver) Blocks(ctx context.Context, obj *nemeton.Phase) (*model.BlockRange, error) {
- panic(fmt.Errorf("not implemented: Blocks - blocks"))
+ return &model.BlockRange{
+ From: obj.Blocks.From,
+ To: obj.Blocks.To,
+ Count: obj.Blocks.To - obj.Blocks.From,
+ }, nil
 }
 
 // All is the resolver for the all field.