Update userdata validation logic and create a place to trigger bulk-tickets approvals (#243)

Author: fforres

src/authz/index.ts

@@ -182,8 +182,8 @@ export class canApproveTicket extends PreExecutionRule {
 export class CanSeePersonalData extends PostExecutionRule {
   public async execute(
     ctx: GraphqlContext,
-    fieldArgs: any,
-    _: any,
+    fieldArgs: unknown,
+    _: unknown,
     parent: {
       id: string;
     },

src/datasources/db/userTickets.ts

@@ -65,3 +65,7 @@ export const userTicketsRelations = relations(userTicketsSchema, ({ one }) => ({
 export const selectUserTicketsSchema = createSelectSchema(userTicketsSchema);
 
 export const insertUserTicketsSchema = createInsertSchema(userTicketsSchema);
+
+export const approveUserTicketsSchema = selectUserTicketsSchema.pick({
+  approvalStatus: true,
+});

src/errors.ts

@@ -6,6 +6,7 @@ import { Logger } from "~/logging";
 export enum ServiceErrors {
   UNAUTHENTICATED = "UNAUTHENTICATED",
   FAILED_PRECONDITION = "FAILED_PRECONDITION",
+  UNAUTHORIZED = "UNAUTHORIZED",
   FORBIDDEN = "FORBIDDEN",
   CONFLICT = "CONFLICT",
   NOT_FOUND = "NOT_FOUND",
@@ -21,6 +22,7 @@ builder.enumType(ServiceErrors, {
 const error_codes: Record<string, number> = {
   [ServiceErrors.INVALID_ARGUMENT]: 400,
   [ServiceErrors.UNAUTHENTICATED]: 401,
+  [ServiceErrors.UNAUTHORIZED]: 403,
   [ServiceErrors.FORBIDDEN]: 403,
   [ServiceErrors.NOT_FOUND]: 404,
   [ServiceErrors.FAILED_PRECONDITION]: 412,

src/generated/schema.gql

@@ -403,6 +403,10 @@ type Mutation {
   Kickoff the email validation flow. This flow will links an email to a user, create a company if it does not exist, and allows filling data for that email's position
   """
   startWorkEmailValidation(email: String!): WorkEmail!
+  triggerUserTicketApprovalReview(
+    eventId: String!
+    userId: String!
+  ): [UserTicket!]!
 
   """
   Update a company
@@ -832,6 +836,7 @@ enum ServiceErrors {
   INVALID_ARGUMENT
   NOT_FOUND
   UNAUTHENTICATED
+  UNAUTHORIZED
 }
 
 """
@@ -1117,8 +1122,11 @@ Representation of a user's data
 type UserData {
   city: String!
   countryOfResidence: String!
+  emergencyPhoneNumber: String
+  foodAllergies: String
   organizationName: String
   roleInOrganization: String
+  rut: String
   worksInOrganization: Boolean!
 }
 
@@ -1238,8 +1246,12 @@ input placeHolderUsersInput {
 input updateUserDataInput {
   city: String!
   countryOfResidence: String!
+  emergencyPhoneNumber: String
+  eventId: String!
+  foodAllergies: String
   organizationName: String
   roleInOrganization: String
+  rut: String
   worksInOrganization: Boolean!
 }
 

src/generated/types.ts

@@ -350,6 +350,7 @@ export type Mutation = {
   rejectTeamInvitation: TeamRef;
   /** Kickoff the email validation flow. This flow will links an email to a user, create a company if it does not exist, and allows filling data for that email's position */
   startWorkEmailValidation: WorkEmail;
+  triggerUserTicketApprovalReview: Array<UserTicket>;
   /** Update a company */
   updateCompany: Company;
   updateMyUserData: User;
@@ -465,6 +466,11 @@ export type MutationStartWorkEmailValidationArgs = {
   email: Scalars["String"]["input"];
 };
 
+export type MutationTriggerUserTicketApprovalReviewArgs = {
+  eventId: Scalars["String"]["input"];
+  userId: Scalars["String"]["input"];
+};
+
 export type MutationUpdateCompanyArgs = {
   input: UpdateCompanyInput;
 };
@@ -882,6 +888,7 @@ export enum ServiceErrors {
   InvalidArgument = "INVALID_ARGUMENT",
   NotFound = "NOT_FOUND",
   Unauthenticated = "UNAUTHENTICATED",
+  Unauthorized = "UNAUTHORIZED",
 }
 
 /** Representation of a Session */
@@ -1142,8 +1149,11 @@ export type UserData = {
   __typename?: "UserData";
   city: Scalars["String"]["output"];
   countryOfResidence: Scalars["String"]["output"];
+  emergencyPhoneNumber?: Maybe<Scalars["String"]["output"]>;
+  foodAllergies?: Maybe<Scalars["String"]["output"]>;
   organizationName?: Maybe<Scalars["String"]["output"]>;
   roleInOrganization?: Maybe<Scalars["String"]["output"]>;
+  rut?: Maybe<Scalars["String"]["output"]>;
   worksInOrganization: Scalars["Boolean"]["output"];
 };
 
@@ -1254,8 +1264,12 @@ export type PlaceHolderUsersInput = {
 export type UpdateUserDataInput = {
   city: Scalars["String"]["input"];
   countryOfResidence: Scalars["String"]["input"];
+  emergencyPhoneNumber?: InputMaybe<Scalars["String"]["input"]>;
+  eventId: Scalars["String"]["input"];
+  foodAllergies?: InputMaybe<Scalars["String"]["input"]>;
   organizationName?: InputMaybe<Scalars["String"]["input"]>;
   roleInOrganization?: InputMaybe<Scalars["String"]["input"]>;
+  rut?: InputMaybe<Scalars["String"]["input"]>;
   worksInOrganization: Scalars["Boolean"]["input"];
 };
 

src/notifications/tickets.ts

@@ -115,7 +115,7 @@ export const sendTicketInvitationEmails = async ({
     );
   }
 
-  await RPC_SERVICE_EMAIL.sendEventTicketInvitationsBatch({
+  await RPC_SERVICE_EMAIL.bulkSendEventTicketInvitations({
     eventName: ticketInformation.event.name,
     ticketId: ticketInformation.id,
     eventId: ticketInformation.event.id,

src/schema/user/mutations.ts

@@ -1,7 +1,6 @@
 import { eq } from "drizzle-orm";
 import { GraphQLError } from "graphql";
 import slugify from "slugify";
-import { z } from "zod";
 
 import { builder } from "~/builder";
 import {
@@ -19,6 +18,7 @@ import { applicationError, ServiceErrors } from "~/errors";
 import { UserRef } from "~/schema/shared/refs";
 import { pronounsEnum } from "~/schema/user/types";
 import { usersFetcher } from "~/schema/user/userFetcher";
+import { validateUserDataAndApproveUserTickets } from "~/schema/userTickets/helpers";
 import {
   UserRoleCommunity,
   canUpdateUserRoleInCommunity,
@@ -167,6 +167,7 @@ builder.mutationField("updateUserRoleInCommunity", (t) =>
 
 const updateUserDataInput = builder.inputType("updateUserDataInput", {
   fields: (t) => ({
+    eventId: t.string({ required: true }),
     countryOfResidence: t.string({ required: true }),
     city: t.string({ required: true }),
     worksInOrganization: t.boolean({ required: true }),
@@ -206,7 +207,7 @@ builder.mutationField("updateMyUserData", (t) =>
         throw new Error("User not found");
       }
 
-      const valuesToParse: Partial<z.infer<typeof insertUserDataSchema>> = {
+      const valuesToParse: Partial<typeof insertUserDataSchema._type> = {
         userId: USER.id,
         countryOfResidence,
         city,
@@ -237,6 +238,13 @@ builder.mutationField("updateMyUserData", (t) =>
         );
       }
 
+      await validateUserDataAndApproveUserTickets({
+        DB: ctx.DB,
+        userId: USER.id,
+        eventId: input.eventId,
+        logger: ctx.logger,
+      });
+
       const user = await usersFetcher.searchUsers({
         DB: ctx.DB,
         search: {

src/schema/user/tests/updateMyUserData/updateMyUserData.test.ts

@@ -1,7 +1,11 @@
 import { faker } from "@faker-js/faker";
 import { it, describe, assert } from "vitest";
 
-import { executeGraphqlOperationAsUser, insertUser } from "~/tests/fixtures";
+import {
+  executeGraphqlOperationAsUser,
+  insertEvent,
+  insertUser,
+} from "~/tests/fixtures";
 
 import {
   UpdateMyUserDataMutationVariables,
@@ -12,12 +16,16 @@ import {
 describe("UpdateMyUserData", () => {
   it("I Should be able to update my data", async () => {
     const user = await insertUser();
+    const event = await insertEvent();
 
     const city = faker.location.city();
     const countryOfResidence = faker.location.country();
     const worksInOrganization = true;
     const organizationName = faker.company.name();
     const roleInOrganization = faker.name.jobTitle();
+    const rut = faker.lorem.text();
+    const foodAllergies = faker.lorem.words(3);
+    const emergencyPhoneNumber = faker.phone.number();
 
     const response = await executeGraphqlOperationAsUser<
       UpdateMyUserDataMutation,
@@ -27,11 +35,15 @@ describe("UpdateMyUserData", () => {
         document: UpdateMyUserData,
         variables: {
           input: {
+            eventId: event.id,
             city,
             countryOfResidence,
             worksInOrganization,
             organizationName,
             roleInOrganization,
+            rut,
+            foodAllergies,
+            emergencyPhoneNumber,
           },
         },
       },
@@ -67,6 +79,7 @@ describe("UpdateMyUserData", () => {
 
   it("I Should be able to edit my data", async () => {
     const user = await insertUser();
+    const event = await insertEvent();
 
     await executeGraphqlOperationAsUser<
       UpdateMyUserDataMutation,
@@ -81,6 +94,10 @@ describe("UpdateMyUserData", () => {
             worksInOrganization: true,
             organizationName: faker.company.name(),
             roleInOrganization: faker.name.jobTitle(),
+            eventId: event.id,
+            rut: faker.lorem.text(),
+            foodAllergies: faker.lorem.words(3),
+            emergencyPhoneNumber: faker.phone.number(),
           },
         },
       },
@@ -92,6 +109,9 @@ describe("UpdateMyUserData", () => {
     const worksInOrganization = true;
     const organizationName = faker.company.name();
     const roleInOrganization = faker.name.jobTitle();
+    const rut = faker.lorem.text();
+    const foodAllergies = faker.lorem.words(3);
+    const emergencyPhoneNumber = faker.phone.number();
 
     const response = await executeGraphqlOperationAsUser<
       UpdateMyUserDataMutation,
@@ -101,11 +121,15 @@ describe("UpdateMyUserData", () => {
         document: UpdateMyUserData,
         variables: {
           input: {
+            eventId: event.id,
             city,
             countryOfResidence,
             worksInOrganization,
             organizationName,
             roleInOrganization,
+            rut,
+            foodAllergies,
+            emergencyPhoneNumber,
           },
         },
       },