feat(team-calc) : add second artifact selection

lib/guides/mutations.ts

@@ -150,7 +150,7 @@ export async function saveTeams(guideId: string, input: unknown) {
   const members = data.teams.flatMap((team) => team.members);
   const characterKeys = [...new Set(members.map((member) => member.characterKey))];
   const weaponKeys = [...new Set(members.map((member) => member.weaponKey).filter((key): key is string => Boolean(key)))];
-  const artifactKeys = [...new Set(members.map((member) => member.artifactKey).filter((key): key is string => Boolean(key)))];
+  const artifactKeys = [...new Set(members.flatMap((member) => [member.artifactKey, member.secondArtifactKey]).filter((key): key is string => Boolean(key)))];
   const [characters, weapons, artifacts] = await Promise.all([
     characterKeys.length ? getDb().select().from(catalogCharacters).where(inArray(catalogCharacters.key, characterKeys)) : [],
     weaponKeys.length ? getDb().select().from(catalogWeapons).where(inArray(catalogWeapons.key, weaponKeys)) : [],

lib/guides/queries.ts

@@ -99,7 +99,7 @@ export async function getPublicGuide(slug: string) {
   const secondArtifacts = secondKeys.length ? await getDb().select().from(catalogArtifacts).where(inArray(catalogArtifacts.key, secondKeys)) : [];
   const members = teams.length ? await getDb().select({ member: teamMembers, character: catalogCharacters }).from(teamMembers).innerJoin(catalogCharacters, eq(catalogCharacters.key, teamMembers.characterKey)).where(inArray(teamMembers.teamId, teams.map((team) => team.id))).orderBy(asc(teamMembers.position)) : [];
   const memberWeaponKeys = members.map(({ member }) => member.weaponKey).filter((key): key is string => Boolean(key));
-  const memberArtifactKeys = members.map(({ member }) => member.artifactKey).filter((key): key is string => Boolean(key));
+  const memberArtifactKeys = members.flatMap(({ member }) => [member.artifactKey, member.secondArtifactKey]).filter((key): key is string => Boolean(key));
   const [memberWeapons, memberArtifacts] = await Promise.all([
     memberWeaponKeys.length ? getDb().select().from(catalogWeapons).where(inArray(catalogWeapons.key, memberWeaponKeys)) : [],
     memberArtifactKeys.length ? getDb().select().from(catalogArtifacts).where(inArray(catalogArtifacts.key, memberArtifactKeys)) : [],
@@ -124,7 +124,7 @@ export async function getPublicGuide(slug: string) {
         iconUrl: catalog?.iconKey ? publicMediaUrl(catalog.iconKey) : null,
       };
     }),
-    teams: teams.map((team) => ({ ...team, members: members.filter(({ member }) => member.teamId === team.id).map(({ member, character }) => { const weapon = memberWeapons.find((item) => item.key === member.weaponKey); const artifact = memberArtifacts.find((item) => item.key === member.artifactKey); return { ...member, character: catalogCharacterWithUrls(character), weapon: weapon ? { ...weapon, imageUrl: publicMediaUrl(weapon.imageKey) } : null, artifact: artifact ? { ...artifact, imageUrl: publicMediaUrl(artifact.imageKey) } : null }; }) })),
+    teams: teams.map((team) => ({ ...team, members: members.filter(({ member }) => member.teamId === team.id).map(({ member, character }) => { const weapon = memberWeapons.find((item) => item.key === member.weaponKey); const artifact = memberArtifacts.find((item) => item.key === member.artifactKey); const secondArtifact = memberArtifacts.find((item) => item.key === member.secondArtifactKey); return { ...member, character: catalogCharacterWithUrls(character), weapon: weapon ? { ...weapon, imageUrl: publicMediaUrl(weapon.imageKey) } : null, artifact: artifact ? { ...artifact, imageUrl: publicMediaUrl(artifact.imageKey) } : null, secondArtifact: secondArtifact ? { ...secondArtifact, imageUrl: publicMediaUrl(secondArtifact.imageKey) } : null }; }) })),
     extras: sections.filter((section) => section.kind === "extra").map((section) => ({ ...section, rows: extraRows.filter(({ row: extraRow }) => extraRow.sectionId === section.id).map(({ row: extraRow, asset }) => ({ ...extraRow, imageUrl: asset ? publicMediaUrl(asset.objectKey) : null })) })),
   };
 }
@@ -157,7 +157,7 @@ export async function getPublicTeamExport(teamId: string) {
     .orderBy(asc(teamMembers.position));
 
   const weaponKeys = members.map(({ member }) => member.weaponKey).filter((key): key is string => Boolean(key));
-  const artifactKeys = members.map(({ member }) => member.artifactKey).filter((key): key is string => Boolean(key));
+  const artifactKeys = members.flatMap(({ member }) => [member.artifactKey, member.secondArtifactKey]).filter((key): key is string => Boolean(key));
   const [weapons, artifacts] = await Promise.all([
     weaponKeys.length ? getDb().select().from(catalogWeapons).where(inArray(catalogWeapons.key, weaponKeys)) : [],
     artifactKeys.length ? getDb().select().from(catalogArtifacts).where(inArray(catalogArtifacts.key, artifactKeys)) : [],
@@ -170,11 +170,13 @@ export async function getPublicTeamExport(teamId: string) {
     members: members.map(({ member, character }) => {
       const weapon = weapons.find((item) => item.key === member.weaponKey);
       const artifact = artifacts.find((item) => item.key === member.artifactKey);
+      const secondArtifact = artifacts.find((item) => item.key === member.secondArtifactKey);
       return {
         ...member,
         character: catalogCharacterWithUrls(character),
         weapon: weapon ? { ...weapon, imageUrl: publicMediaUrl(weapon.imageKey) } : null,
         artifact: artifact ? { ...artifact, imageUrl: publicMediaUrl(artifact.imageKey) } : null,
+        secondArtifact: secondArtifact ? { ...secondArtifact, imageUrl: publicMediaUrl(secondArtifact.imageKey) } : null,
       };
     }),
   };

lib/guides/schemas.test.ts

@@ -93,11 +93,17 @@ describe("structured guide validation", () => {
   });
 
   it("requires four unique team members and non-zero damage", () => {
-    const member = (characterKey: string) => ({ characterKey, weaponKey: null, artifactKey: null, constellation: 0, refinement: 1, damage: 100 });
+    const member = (characterKey: string) => ({ characterKey, weaponKey: null, artifactKey: null, secondArtifactKey: null, constellation: 0, refinement: 1, damage: 100 });
     const base = { expectedVersion: 1, teams: [{ title: "Test", rotationSeconds: 20, combo: "E > Q", members: ["1", "2", "3", "4"].map(member) }] };
     expect(teamSectionSchema.safeParse(base).success).toBe(true);
     expect(teamSectionSchema.safeParse({ ...base, teams: [{ ...base.teams[0], members: ["1", "1", "3", "4"].map(member) }] }).success).toBe(false);
   });
+
+  it("accepts a second artifact set for a team member", () => {
+    const member = (characterKey: string) => ({ characterKey, weaponKey: null, artifactKey: "artifact-1", secondArtifactKey: characterKey === "1" ? "artifact-2" : null, constellation: 0, refinement: 1, damage: 100 });
+    const input = { expectedVersion: 1, teams: [{ title: "Test", rotationSeconds: 20, combo: "E > Q", members: ["1", "2", "3", "4"].map(member) }] };
+    expect(teamSectionSchema.safeParse(input).success).toBe(true);
+  });
 });
 
 describe("Team Calc", () => {

lib/guides/schemas.ts

@@ -98,6 +98,7 @@ export const teamSectionSchema = z.strictObject({
       characterKey: catalogKey,
       weaponKey: catalogKey.nullable(),
       artifactKey: catalogKey.nullable(),
+      secondArtifactKey: catalogKey.nullable(),
       constellation: z.number().int().min(0).max(6),
       refinement: z.number().int().min(1).max(5),
       damage: z.coerce.number().finite().nonnegative().max(999_999_999_999),