#207 Added multiclass query

DecentralCardGame · Feb 27, 2024 · a374214 · a374214
1 parent 98a4f2f
commit a374214
Show file tree

Hide file tree

Showing 4 changed files with 195 additions and 132 deletions.
diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
@@ -33324,6 +33324,10 @@ paths:
               - exceptional
               - unique
           collectionFormat: multi
+        - name: multiClassOnly
+          in: query
+          required: false
+          type: boolean
       tags:
         - Query
   /DecentralCardGame/Cardchain/cardchain/q_council/{councilId}:

diff --git a/proto/cardchain/cardchain/query.proto b/proto/cardchain/cardchain/query.proto
@@ -184,6 +184,7 @@ message QueryQCardsRequest {
   bool   onlyStarterCard    =  9;
   bool   onlyBalanceAnchors = 10;
   repeated CardRarity rarities = 11;
+  bool multiClassOnly = 12;
 }
 
 message QueryQCardsResponse {

diff --git a/x/cardchain/keeper/grpc_query_q_cards.go b/x/cardchain/keeper/grpc_query_q_cards.go
@@ -52,19 +52,35 @@ func (k Keeper) QCards(goCtx context.Context, req *types.QueryQCardsRequest) (*t
 		if len(req.Classes) == 0 {
 			return true
 		}
-		if bool(cardobjClass.Mysticism) && slices.Contains(req.Classes, types.CardClass_mysticism) {
-			return true
-		}
-		if bool(cardobjClass.Nature) && slices.Contains(req.Classes, types.CardClass_nature) {
-			return true
-		}
-		if bool(cardobjClass.Technology) && slices.Contains(req.Classes, types.CardClass_technology) {
-			return true
-		}
-		if bool(cardobjClass.Culture) && slices.Contains(req.Classes, types.CardClass_culture) {
+		if !req.MultiClassOnly {
+			if bool(cardobjClass.Mysticism) && slices.Contains(req.Classes, types.CardClass_mysticism) {
+				return true
+			}
+			if bool(cardobjClass.Nature) && slices.Contains(req.Classes, types.CardClass_nature) {
+				return true
+			}
+			if bool(cardobjClass.Technology) && slices.Contains(req.Classes, types.CardClass_technology) {
+				return true
+			}
+			if bool(cardobjClass.Culture) && slices.Contains(req.Classes, types.CardClass_culture) {
+				return true
+			}
+			return false
+		} else {
+			if bool(cardobjClass.Mysticism) != slices.Contains(req.Classes, types.CardClass_mysticism) {
+				return false
+			}
+			if bool(cardobjClass.Nature) != slices.Contains(req.Classes, types.CardClass_nature) {
+				return false
+			}
+			if bool(cardobjClass.Technology) != slices.Contains(req.Classes, types.CardClass_technology) {
+				return false
+			}
+			if bool(cardobjClass.Culture) != slices.Contains(req.Classes, types.CardClass_culture) {
+				return false
+			}
 			return true
 		}
-		return false
 	}
 
 	iterator := k.Cards.GetItemIterator(ctx)