reusable user ticket addon status constants (#300)

Author: TextC0de

src/datasources/db/userTickets.ts

@@ -31,6 +31,9 @@ export type UserTicketApprovalStatus =
 
 export const userTicketsRedemptionStatusEnum = ["redeemed", "pending"] as const;
 
+export type UserTicketRedemptionStatus =
+  (typeof userTicketsRedemptionStatusEnum)[number];
+
 // USER-TICKETS-TABLE
 export const userTicketsSchema = pgTable(
   "user_tickets",

src/generated/schema.gql

@@ -431,7 +431,7 @@ type Mutation {
   cancelUserTicket(userTicketId: String!): UserTicket!
 
   """
-  Cancel addons for multiple user tickets
+  Cancel multiple user ticket addons
   """
   cancelUserTicketAddons(
     """

src/generated/types.ts

@@ -416,7 +416,7 @@ export type Mutation = {
   approvalUserTicket: UserTicket;
   /** Cancel a ticket */
   cancelUserTicket: UserTicket;
-  /** Cancel addons for multiple user tickets */
+  /** Cancel multiple user ticket addons */
   cancelUserTicketAddons: Array<UserTicketAddon>;
   /** Check the status of a purchase order */
   checkPurchaseOrderStatus: PurchaseOrder;

src/schema/events/eventsFetcher.ts

@@ -26,6 +26,8 @@ import { SortableSchemaFields } from "~/datasources/helpers/sorting";
 import { eventStatus, eventVisibility } from "~/schema/events/types";
 import { sanitizeForLikeSearch } from "~/schema/shared/helpers";
 
+import { ACCESSIBLE_USER_TICKET_APPROVAL_STATUSES } from "../userTickets/constants";
+
 export type UserTicketSearch = {
   userId?: string;
   eventIds?: string[];
@@ -95,7 +97,10 @@ const getSearchEventsQuery = (
         .where(
           and(
             inArray(userTicketsSchema.ticketTemplateId, subquery),
-            eq(userTicketsSchema.approvalStatus, "approved"),
+            inArray(
+              userTicketsSchema.approvalStatus,
+              ACCESSIBLE_USER_TICKET_APPROVAL_STATUSES,
+            ),
             eq(userTicketsSchema.userId, userId),
           ),
         ),

src/schema/ticket/types.ts

@@ -3,6 +3,7 @@ import { EventLoadable } from "~/schema/events/types";
 import { PriceRef, TicketRef } from "~/schema/shared/refs";
 
 import { AllowedCurrencyLoadable } from "../allowedCurrency/types";
+import { RESERVED_USER_TICKET_APPROVAL_STATUSES } from "../userTickets/constants";
 
 export const TicketTemplateStatus = builder.enumType("TicketTemplateStatus", {
   values: ["active", "inactive"] as const,
@@ -84,15 +85,10 @@ export const TicketLoadable = builder.loadableObject(TicketRef, {
           where: (ut, { eq, and, inArray }) =>
             and(
               eq(ut.ticketTemplateId, root.id),
-              inArray(ut.approvalStatus, [
-                "approved",
-                "not_required",
-                "pending",
-                "gifted",
-                "gift_accepted",
-                "transfer_accepted",
-                "transfer_pending",
-              ]),
+              inArray(
+                ut.approvalStatus,
+                RESERVED_USER_TICKET_APPROVAL_STATUSES,
+              ),
             ),
         });
 

src/schema/ticketAddons/constants.ts

@@ -0,0 +1,11 @@
+import { UserTicketAddonApprovalStatus } from "~/datasources/db/userTicketsAddons";
+
+/**
+ * This statuses are taken into account
+ * when counting the number of available stick
+ */
+export const RESERVED_USER_TICKET_ADDON_APPROVAL_STATUSES: UserTicketAddonApprovalStatus[] =
+  [
+    UserTicketAddonApprovalStatus.APPROVED,
+    UserTicketAddonApprovalStatus.PENDING,
+  ];

src/schema/ticketAddons/types.ts

@@ -16,6 +16,7 @@ import {
 } from "~/datasources/db/userTicketsAddons";
 import { TicketRef, UserTicketRef, PriceRef } from "~/schema/shared/refs";
 
+import { RESERVED_USER_TICKET_ADDON_APPROVAL_STATUSES } from "./constants";
 import { PurchaseOrderRef } from "../purchaseOrder/types";
 
 export const AddonConstraintTypeEnum = builder.enumType(AddonConstraintType, {
@@ -87,10 +88,10 @@ builder.objectType(AddonRef, {
             where: (ut, ops) =>
               ops.and(
                 ops.eq(ut.addonId, root.id),
-                ops.inArray(ut.approvalStatus, [
-                  UserTicketAddonApprovalStatus.APPROVED,
-                  UserTicketAddonApprovalStatus.PENDING,
-                ]),
+                ops.inArray(
+                  ut.approvalStatus,
+                  RESERVED_USER_TICKET_ADDON_APPROVAL_STATUSES,
+                ),
               ),
           },
         );

src/schema/user/types.ts

@@ -19,6 +19,8 @@ import { TeamRef } from "~/schema/teams/types";
 import { usersFetcher } from "~/schema/user/userFetcher";
 import { userTicketFetcher } from "~/schema/userTickets/userTicketFetcher";
 
+import { ACCESSIBLE_USER_TICKET_APPROVAL_STATUSES } from "../userTickets/constants";
+
 export const pronounsEnum = builder.enumType(PronounsEnum, {
   name: "PronounsEnum",
 });
@@ -132,14 +134,7 @@ export const UserLoadable = builder.loadableObject(UserRef, {
             userIds: [root.id],
             approvalStatus: ctx.USER?.isSuperAdmin
               ? undefined
-              : [
-                  "approved",
-                  "gifted",
-                  "gift_accepted",
-                  "not_required",
-                  "transfer_accepted",
-                  "transfer_pending",
-                ],
+              : ACCESSIBLE_USER_TICKET_APPROVAL_STATUSES,
           },
         });
 

src/schema/userTickets/mutations.ts

@@ -14,7 +14,9 @@ import {
   canCancelUserTicket,
   canRedeemUserTicket,
 } from "~/validations";
+
 import "./mutations/claimUserTicket";
+import { REDEEMABLE_USER_TICKET_APPROVAL_STATUSES } from "./constants";
 
 builder.mutationField("cancelUserTicket", (t) =>
   t.field({
@@ -159,12 +161,12 @@ builder.mutationField("redeemUserTicket", (t) =>
           throw new GraphQLError("Unauthorized!");
         }
 
-        if (ticket.approvalStatus === "cancelled") {
-          throw new GraphQLError("No es posible redimir un ticket cancelado");
-        }
-
-        if (ticket.approvalStatus === "rejected") {
-          throw new GraphQLError("No es posible redimir un ticket rechazado");
+        if (
+          !REDEEMABLE_USER_TICKET_APPROVAL_STATUSES.includes(
+            ticket.approvalStatus,
+          )
+        ) {
+          throw new GraphQLError("The ticket is not redeemable");
         }
 
         if (ticket.redemptionStatus === "redeemed") {

src/schema/userTickets/mutations/claimUserTicket/index.ts

@@ -11,7 +11,6 @@ import {
   userTicketTransfersSchema,
   userTicketsSchema,
   SelectUserTicketSchema,
-  UserTicketApprovalStatus,
   AddonConstraintType,
   InsertUserTicketAddonClaimSchema,
   UserTicketAddonRedemptionStatus,
@@ -36,6 +35,7 @@ import {
   TicketClaimInput,
   TicketClaimInputType,
 } from "./refs";
+import { RESERVED_USER_TICKET_APPROVAL_STATUSES } from "../../constants";
 import { assertCanStartTicketClaimingForEvent } from "../../helpers";
 
 // Types
@@ -518,16 +518,6 @@ async function verifyFinalUserTicketCounts(
   USER: NonNullable<Context["USER"]>,
   logger: Logger,
 ) {
-  const validApprovalStatuses: UserTicketApprovalStatus[] = [
-    "approved",
-    "pending",
-    "not_required",
-    "gifted",
-    "gift_accepted",
-    "transfer_pending",
-    "transfer_accepted",
-  ];
-
   // Bulk query for existing ticket counts
   const ticketCountsPromise = DB.query.userTicketsSchema
     .findMany({
@@ -537,7 +527,10 @@ async function verifyFinalUserTicketCounts(
             userTicketsSchema.ticketTemplateId,
             ticketInfo.tickets.map((t) => t.id),
           ),
-          ops.inArray(userTicketsSchema.approvalStatus, validApprovalStatuses),
+          ops.inArray(
+            userTicketsSchema.approvalStatus,
+            RESERVED_USER_TICKET_APPROVAL_STATUSES,
+          ),
         );
       },
       columns: {