#135 Added startercard query option

DecentralCardGame · Sep 28, 2023 · 2594a4e · 2594a4e
1 parent 9be7893
commit 2594a4e
Show file tree

Hide file tree

Showing 6 changed files with 316 additions and 169 deletions.
diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
@@ -33136,6 +33136,8 @@ paths:
                 type: boolean
               hash:
                 type: string
+              starterCard:
+                type: boolean
         default:
           description: An unexpected error response.
           schema:
@@ -33330,6 +33332,10 @@ paths:
           in: query
           required: false
           type: string
+        - name: onlyStarterCard
+          in: query
+          required: false
+          type: boolean
       tags:
         - Query
   /DecentralCardGame/cardchain/cardchain/q_collection/{collectionId}:
@@ -68858,6 +68864,8 @@ definitions:
         type: boolean
       hash:
         type: string
+      starterCard:
+        type: boolean
   DecentralCardGame.cardchain.cardchain.OutpCollection:
     type: object
     properties:

diff --git a/proto/cardchain/cardchain/card.proto b/proto/cardchain/cardchain/card.proto
@@ -22,6 +22,7 @@ message Card {
   uint64 inappropriateVotes = 12;
   int64 nerflevel = 13;
   bool balanceAnchor = 15;
+  bool starterCard = 16;
 }
 
 message OutpCard {
@@ -42,6 +43,7 @@ message OutpCard {
   int64 nerflevel = 13;
   bool balanceAnchor = 15;
   string hash = 16;
+  bool starterCard = 17;
 }
 
 enum Status {

diff --git a/proto/cardchain/cardchain/query.proto b/proto/cardchain/cardchain/query.proto
@@ -186,6 +186,7 @@ message QueryQCardsRequest {
   string nameContains = 6;
   string keywordsContains = 7;
   string notesContains = 8;
+  bool onlyStarterCard = 9;
 }
 
 message QueryQCardsResponse {

diff --git a/x/cardchain/keeper/grpc_query_q_cards.go b/x/cardchain/keeper/grpc_query_q_cards.go
@@ -109,10 +109,16 @@ func (k Keeper) QCards(goCtx context.Context, req *types.QueryQCardsRequest) (*t
 	for ; iterator.Valid(); iterator.Next() {
 		idx, gottenCard := iterator.Value()
 
+		// filter for starterCards
+		if req.OnlyStarterCard && !gottenCard.StarterCard {
+			continue
+		}
+
 		// first skip all cards with irrelevant status
 		if gottenCard.Status == types.Status_none || gottenCard.Status == types.Status_scheme {
 			continue
 		}
+
 		// then check if a status constrain was given and skip the card if it has the wrong status
 		if req.Status != types.QueryQCardsRequest_none {
 			if !slices.Contains(states, gottenCard.Status) {

diff --git a/x/cardchain/types/card.pb.go b/x/cardchain/types/card.pb.go