Card catalogue loading fixes

Author: doombubbles

spellsource-client/src/unity

@@ -55,7 +55,6 @@ new JsonSlurper().parseText(file('package.json').text).scripts.each { String scr
 
 tasks.named("yarnRunCodegen").configure {
   inputs.file("schema.graphql")
-  inputs.dir("graphql/web")
   inputs.dir("graphql/shared")
 
   mustRunAfter ":spellsource-server:generateSchema"

spellsource-graphql/build.gradle

@@ -0,0 +1,55 @@
+fragment art on Art {
+    body {
+        vertex {
+            r
+            g
+            b
+            a
+        }
+    }
+    highlight {
+        r
+        g
+        b
+        a
+    }
+    loop {
+        named
+    }
+    missile {
+        named
+    }
+    onCast {
+        named
+    }
+    onHit {
+        named
+    }
+    primary {
+        r
+        g
+        b
+        a
+    }
+    secondary {
+        r
+        g
+        b
+        a
+    }
+    shadow {
+        r
+        g
+        b
+        a
+    }
+    spell {
+        named
+    }
+    sprite {
+        named
+    }
+    spriteShadow {
+        named
+    }
+}

spellsource-graphql/graphql/shared/fragments/art.graphql

@@ -1,80 +1,11 @@
 fragment entity on Entity {
-  id
-  name
-  description
-  cardId
-  cardType
-  entityType
-  rarity
+  ...entitySummary
   location {
-    index
-    zone
-    player
+    ...entityLocation
   }
-  art {
-    body {
-      vertex {
-        r
-        g
-        b
-        a
-      }
-    }
-    highlight {
-      r
-      g
-      b
-      a
-    }
-    loop {
-      named
-    }
-    missile {
-      named
-    }
-    onCast {
-      named
-    }
-    onHit {
-      named
-    }
-    primary {
-      r
-      g
-      b
-      a
-    }
-    secondary {
-      r
-      g
-      b
-      a
-    }
-    shadow {
-      r
-      g
-      b
-      a
-    }
-    spell {
-      named
-    }
-    sprite {
-      named
-    }
-    spriteShadow {
-      named
-    }
-  }
-  owner
   boardPosition
-  attack
   baseAttack
-  hp
   baseHp
-  maxHp
-  armor
-  manaCost
   baseManaCost
   durability
   spellDamage
@@ -83,48 +14,34 @@ fragment entity on Entity {
   mana
   maxMana
   lockedMana
-  battlecry
   cannotAttack
-  charge
   chooseOne
-  collectible
   combo
   conditionMet
-  deathrattles
   deflect
   destroyed
   discarded
-  divineShield
   enraged
   frozen
   gameStarted
   gold
   hostsTrigger
   immune
   isStartingTurn
-  lifesteal
   permanent
-  playable
-  poisonous
   roasted
-  rush
   silenced
-  stealth
   summoningSickness
-  taunt
   uncensored
   underAura
   untargetableBySpells
-  windfury
   charges
   countUntilCast
   fires
   host
-  heroClasses
   cardSet
   cardSets
   enchantmentType
-  tribes
   tooltips {
     text
     keywords

spellsource-graphql/graphql/shared/fragments/entity.graphql

@@ -1,29 +1,32 @@
 fragment entitySummary on Entity {
-  id
-  name
-  description
-  cardId
-  cardType
-  entityType
-  rarity
-  owner
-  manaCost
-  attack
-  hp
-  maxHp
-  armor
-  playable
-  taunt
-  charge
-  rush
-  divineShield
-  stealth
-  lifesteal
-  poisonous
-  deathrattles
-  battlecry
-  windfury
-  collectible
-  heroClasses
-  tribes
+    id
+    name
+    description
+    cardId
+    cardType
+    entityType
+    rarity
+    owner
+    manaCost
+    attack
+    hp
+    maxHp
+    armor
+    playable
+    taunt
+    charge
+    rush
+    divineShield
+    stealth
+    lifesteal
+    poisonous
+    deathrattles
+    battlecry
+    windfury
+    collectible
+    heroClasses
+    tribes
+    art {
+        ...art
+    }
 }

spellsource-graphql/graphql/shared/fragments/entitySummary.graphql

@@ -0,0 +1,5 @@
+fragment entityLocation on EntityLocation {
+    index
+    player
+    zone
+}

spellsource-graphql/graphql/shared/fragments/location.graphql

@@ -1,6 +1,9 @@
 import { ApolloServer } from "@apollo/server";
 import { expressMiddleware } from "@apollo/server/express4";
-import { ApolloServerPluginLandingPageDisabled } from "@apollo/server/plugin/disabled";
+import {
+  ApolloServerPluginLandingPageLocalDefault,
+  ApolloServerPluginLandingPageProductionDefault,
+} from "@apollo/server/plugin/landingPage/default";
 import express, { Application, NextFunction, Request, Response } from "express";
 import { createFullSchema } from "./schema/stitching";
 import { AuthRequest } from "./auth";
@@ -54,7 +57,9 @@ export const setupApolloServer = async (app: Application, httpServer: Server): P
   const apolloServer = new ApolloServer({
     schema,
     plugins: [
-      ApolloServerPluginLandingPageDisabled(),
+      process.env.NODE_ENV === "production"
+        ? ApolloServerPluginLandingPageProductionDefault()
+        : ApolloServerPluginLandingPageLocalDefault({ embed: true }),
       ApolloServerPluginDrainHttpServer({ httpServer }),
       {
         async serverWillStart() {
@@ -75,7 +80,7 @@ export const setupApolloServer = async (app: Application, httpServer: Server): P
   }
   app.use(
     "/graphql",
-    express.json(),
+    express.json({ limit: "10mb" }),
     expressMiddleware(apolloServer, {
       context: async ({ req }) => req as AuthRequest,
     }),

spellsource-graphql/src/apollo-server.ts

@@ -99,7 +99,7 @@ public Long parseLiteral(Object input) throws CoercingParseLiteralException {
 		var handler = GraphQLHandler.create(gql);
 
 		router.post("/graphql")
-				.handler(BodyHandler.create())
+				.handler(BodyHandler.create().setBodyLimit(10 * 1024 * 1024))
 				.handler(JWTAuthHandler.create(jwtAuth, realm.toRepresentation().getRealm()))
 				.handler(VirtualThreadRoutingContextHandler.create(ctx -> handler.handle(RoutingContext.newInstance(ctx))))
 				.failureHandler(ctx -> {

spellsource-private/src/secrets

@@ -211,14 +211,14 @@ public Future<DecksGetResponse> updateDeck(DecksUpdateInput input) throws Except
 			var updateCommand = protoRequest.getUpdateCommand();
 			var futs = new java.util.ArrayList<Future<?>>();
 
-			return queryExecutor.execute(dsl -> dsl
+			return queryExecutor.findOneRow(dsl -> dsl
 							.select(com.hiddenswitch.framework.schema.spellsource.tables.Decks.DECKS.ID)
 							.from(com.hiddenswitch.framework.schema.spellsource.tables.Decks.DECKS)
 							.where(com.hiddenswitch.framework.schema.spellsource.tables.Decks.DECKS.ID.eq(deckId)
 									.and(com.hiddenswitch.framework.schema.spellsource.tables.Decks.DECKS.CREATED_BY.eq(userId)))
 							.limit(1))
-					.compose(authedCount -> {
-						if (authedCount < 1) {
+					.compose(row -> {
+						if (row == null) {
 							return Future.failedFuture("not authorized to edit this deck");
 						}
 
@@ -328,9 +328,27 @@ public Future<DecksGetResponse> duplicateDeck(String deckId) throws Exception {
 		if (cardCatalogue == null) {
 			return Future.failedFuture("card catalogue not initialized");
 		}
-		// Delegate to Legacy's static duplicate logic via the proto-based path
-		// This is complex enough that reusing the existing impl is the safest approach
-		return Future.failedFuture("not yet implemented — requires transaction refactoring");
+
+		// Fetch the source deck, then create a copy owned by the current user
+		return Legacy.getDeck(cardCatalogue, deckId, userId)
+				.compose(sourceDeck -> {
+					var coll = sourceDeck.getCollection();
+					var cardIds = coll.getInventoryList().stream()
+							.map(Spellsource.CardRecord::getEntity)
+							.map(Spellsource.Entity::getCardId)
+							.collect(Collectors.toList());
+
+					var createRequest = new DeckCreateRequest()
+							.withName(coll.getName() + " Copy")
+							.withHeroClass(coll.getHeroClass())
+							.withFormat(coll.getFormat())
+							.withCardIds(cardIds);
+
+					return Legacy.createDeck(cardCatalogue, userId, createRequest);
+				})
+				.map(putResponse -> new DecksGetResponse.Builder()
+						.setCollection(protoToGraphqlCollection(putResponse.getCollection()))
+						.build());
 	}
 
 	// ── drafts ───────────────────────────────────────────────