Fix import (#299)

Author: Strehk

schema.graphql

@@ -210,7 +210,7 @@ input ImportData {
   committeeMembers: [ImportDataCommitteeMember!]!
   committees: [ImportDataCommittee!]!
   conferenceMembers: [ImportDataConferenceMember!]!
-  conferenceUsers: [ImportDataConferenceUser!]!
+  conferenceUsers: [ImportDataConferenceUser!]
   id: ID!
   representations: [ImportDataRepresentation!]!
   title: String!

src/api/handlers/import.ts

@@ -80,7 +80,7 @@ const Input = schemaBuilder.inputType('ImportData', {
 					})
 				})
 			],
-			required: true
+			required: false
 		}),
 		agendaItems: t.field({
 			type: [
@@ -150,7 +150,7 @@ schemaBuilder.mutationFields((t) => ({
 
 				if (data.conferenceMembers.length > 0) {
 					await tx.insert(schema.conferenceMember).values(
-						data.conferenceMembers.map((member) => ({
+						data.conferenceMembers!.map((member) => ({
 							id: member.id,
 							conferenceId: data.id,
 							representationId: member.representationId
@@ -160,17 +160,17 @@ schemaBuilder.mutationFields((t) => ({
 
 				if (data.committeeMembers.length > 0) {
 					await tx.insert(schema.committeeMember).values(
-						data.committeeMembers.map((member) => ({
+						data.committeeMembers!.map((member) => ({
 							id: member.id,
 							committeeId: member.committeeId,
 							representationId: member.representationId
 						}))
 					);
 				}
 
-				if (data.conferenceUsers.length > 0) {
+				if ((data.conferenceUsers?.length ?? 0) > 0) {
 					await tx.insert(schema.conferenceUser).values(
-						data.conferenceUsers.map((user) => ({
+						data.conferenceUsers!.map((user) => ({
 							id: user.id ?? undefined,
 							conferenceUserType: user.conferenceUserType,
 							userEmail: user.userEmail,
@@ -182,7 +182,7 @@ schemaBuilder.mutationFields((t) => ({
 				}
 
 				// if the creating user is not found in the dataset, we want to make them an admin anyway!
-				if (!data.conferenceUsers.find((u) => u.userEmail === ctx.oidc!.user.email)) {
+				if (!data.conferenceUsers?.find((u) => u.userEmail === ctx.oidc!.user.email)) {
 					await tx.insert(schema.conferenceUser).values({
 						conferenceId: data.id,
 						conferenceUserType: 'ADMIN',

src/lib/utils/import.ts

@@ -16,8 +16,14 @@ export const importDataSchema = z.object({
 			.object({
 				id: z.string(),
 				representationType: z.enum(['DELEGATION', 'NSA', 'UN']),
-				alpha3Code: z.string().optional(),
-				alpha2Code: z.string().optional(),
+				alpha3Code: z
+					.string()
+					.optional()
+					.refine((data) => data === undefined || data?.length === 3),
+				alpha2Code: z
+					.string()
+					.optional()
+					.refine((data) => data === undefined || data?.length === 2),
 				name: z.string().optional(),
 				faIcon: z.string().optional(),
 				regionalGroup: z
@@ -50,16 +56,18 @@ export const importDataSchema = z.object({
 			committeeId: z.string()
 		})
 	),
-	conferenceUsers: z.array(
-		z.object({
-			id: z.string(),
-			conferenceUserType: z.enum(['ADMIN', 'DELEGATE', 'NON_STATE_ACTOR', 'SPECTATOR', 'TEAM']),
-			userEmail: z.string(),
-			//TODO enforce that one has to be set?
-			conferenceMemberId: z.string().optional(),
-			committeeMemberId: z.string().optional()
-		})
-	),
+	conferenceUsers: z
+		.array(
+			z.object({
+				id: z.string(),
+				conferenceUserType: z.enum(['ADMIN', 'DELEGATE', 'NON_STATE_ACTOR', 'SPECTATOR', 'TEAM']),
+				userEmail: z.string(),
+				//TODO enforce that one has to be set?
+				conferenceMemberId: z.string().optional(),
+				committeeMemberId: z.string().optional()
+			})
+		)
+		.optional(),
 	agendaItems: z.array(
 		z.object({
 			id: z.string().optional(),

src/routes/app/(launcher)/import/+page.svelte

@@ -92,6 +92,7 @@
 
 	async function createFreshData(): Promise<void> {
 		importData = {
+			$schema: `${page.url.origin}/api/schemas/import`,
 			title: '',
 			id: nanoid(),
 			committees: [],
@@ -100,7 +101,7 @@
 				id: nanoid(),
 				representationType: 'DELEGATION',
 				alpha3Code: nation.cca3.toLowerCase(),
-				alpha2Code: nation.cca3.toLowerCase(),
+				alpha2Code: nation.cca2.toLowerCase(),
 				regionalGroup: transformRegionalGroup(nation.unRegionalGroup)
 			})),
 			conferenceMembers: [],
@@ -168,6 +169,9 @@
 			representationType: type,
 			id: repId
 		});
+		if (importData?.conferenceMembers === undefined) {
+			importData!.conferenceMembers = [];
+		}
 		importData?.conferenceMembers.push({
 			id: nanoid(),
 			representationId: repId
@@ -193,6 +197,9 @@
 				id: repId
 			});
 		}
+		if (importData?.committeeMembers === undefined) {
+			importData!.committeeMembers = [];
+		}
 		importData?.committeeMembers.push({
 			id: nanoid(),
 			committeeId: committeeId,
@@ -265,7 +272,7 @@
 				{@const agendaItems = importData.agendaItems.filter(
 					(item) => item.committeeId === committee.id
 				)}
-				{@const committeeMembers = importData.committeeMembers.filter(
+				{@const committeeMembers = importData.committeeMembers?.filter(
 					(member) => member.committeeId === committee.id
 				)}
 
@@ -344,7 +351,7 @@
 										class="btn btn-error btn-sm btn-circle absolute top-1/2 right-1/2 z-40 translate-x-1/2 -translate-y-1/2 opacity-0 transition-all duration-300 group-hover:opacity-100"
 										aria-label="Remove committee member"
 										onclick={() => {
-											importData!.committeeMembers = importData!.committeeMembers.filter(
+											importData!.committeeMembers = importData!.committeeMembers?.filter(
 												(i) => i.id !== member.id
 											);
 										}}
@@ -374,7 +381,7 @@
 							importData!.agendaItems = importData!.agendaItems.filter(
 								(i) => i.committeeId !== committee.id
 							);
-							importData!.committeeMembers = importData!.committeeMembers.filter(
+							importData!.committeeMembers = importData!.committeeMembers?.filter(
 								(i) => i.committeeId !== committee.id
 							);
 						}}
@@ -394,7 +401,7 @@
 			<fieldset class="fieldset bg-base-100 border-base-300 rounded-box border p-4">
 				<legend class="fieldset-legend">{m.nonStateActors()}</legend>
 				{#each importData.representations.filter((x) => x.representationType === 'NSA') as rep}
-					{@const conferenceMembers = importData.conferenceMembers.filter(
+					{@const conferenceMembers = importData.conferenceMembers?.filter(
 						(member) => member.representationId === rep.id
 					)}
 					<div class="join">
@@ -413,9 +420,9 @@
 							bind:value={rep.name}
 							placeholder={m.nonStateActor()}
 						/>
-						<div class="btn join-item {conferenceMembers.length === 0 ? 'btn-error' : ''}">
+						<div class="btn join-item {conferenceMembers?.length === 0 ? 'btn-error' : ''}">
 							<i class="fas fa-users"></i>
-							<span class="ml-2">{conferenceMembers.length}</span>
+							<span class="ml-2">{conferenceMembers?.length}</span>
 						</div>
 						<button
 							class="btn join-item"
@@ -424,7 +431,7 @@
 								importData!.representations = importData!.representations.filter(
 									(i) => i.id !== rep.id
 								);
-								importData!.conferenceMembers = importData!.conferenceMembers.filter(
+								importData!.conferenceMembers = importData!.conferenceMembers?.filter(
 									(i) => i.representationId !== rep.id
 								);
 							}}
@@ -446,7 +453,7 @@
 			<fieldset class="fieldset bg-base-100 border-base-300 rounded-box border p-4">
 				<legend class="fieldset-legend">{m.unActors()}</legend>
 				{#each importData.representations.filter((x) => x.representationType === 'UN') as rep}
-					{@const conferenceMembers = importData.conferenceMembers.filter(
+					{@const conferenceMembers = importData.conferenceMembers?.filter(
 						(member) => member.representationId === rep.id
 					)}
 					<div class="join">
@@ -467,7 +474,7 @@
 								importData!.representations = importData!.representations.filter(
 									(i) => i.id !== rep.id
 								);
-								importData!.conferenceMembers = importData!.conferenceMembers.filter(
+								importData!.conferenceMembers = importData!.conferenceMembers?.filter(
 									(i) => i.representationId !== rep.id
 								);
 							}}