Skip to content

Commit 743d766

Browse files
committed
Typescript enums update
1 parent 9b087e4 commit 743d766

File tree

13 files changed

+162
-108
lines changed

13 files changed

+162
-108
lines changed

src/datasources/db/userTickets.ts

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@ import { pgTable, text, uuid } from "drizzle-orm/pg-core";
33
import { createInsertSchema, createSelectSchema } from "drizzle-zod";
44

55
import { purchaseOrdersSchema, ticketsSchema, usersSchema } from "./schema";
6-
import { createdAndUpdatedAtFields } from "./shared";
6+
import {
7+
createdAndUpdatedAtFields,
8+
TypescriptEnumAsDBEnumOptions,
9+
} from "./shared";
710

8-
export const userTicketsApprovalStatusEnum = [
9-
"approved",
10-
"pending",
11-
"gifted",
12-
"not_required",
13-
"rejected",
14-
"cancelled",
15-
] as const;
11+
export enum UserTicketsApprovalStatusEnum {
12+
Approved = "approved",
13+
GiftAccepted = "gift_accepted",
14+
NotRequired = "not_required",
15+
Pending = "pending",
16+
Gifted = "gifted",
17+
Rejected = "rejected",
18+
Cancelled = "cancelled",
19+
}
1620
export const userTicketsRedemptionStatusEnum = ["redeemed", "pending"] as const;
1721
// USER-TICKETS-TABLE
1822
export const userTicketsSchema = pgTable("user_tickets", {
@@ -25,9 +29,9 @@ export const userTicketsSchema = pgTable("user_tickets", {
2529
.references(() => purchaseOrdersSchema.id)
2630
.notNull(),
2731
approvalStatus: text("approval_status", {
28-
enum: userTicketsApprovalStatusEnum,
32+
enum: TypescriptEnumAsDBEnumOptions(UserTicketsApprovalStatusEnum),
2933
})
30-
.default("pending")
34+
.default(UserTicketsApprovalStatusEnum.Pending)
3135
.notNull(),
3236
redemptionStatus: text("redemption_status", {
3337
enum: userTicketsRedemptionStatusEnum,

src/generated/schema.gql

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -814,19 +814,21 @@ type Ticket {
814814
The number of tickets available for this ticket type
815815
"""
816816
quantity: Int
817+
quantityLeft: Int
817818
requiresApproval: Boolean!
818819
startDateTime: DateTime!
819820
status: TicketTemplateStatus!
820821
visibility: TicketTemplateVisibility!
821822
}
822823

823824
enum TicketApprovalStatus {
824-
approved
825-
cancelled
826-
gifted
827-
not_required
828-
pending
829-
rejected
825+
Approved
826+
Cancelled
827+
GiftAccepted
828+
Gifted
829+
NotRequired
830+
Pending
831+
Rejected
830832
}
831833

832834
input TicketClaimInput {

src/generated/types.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -840,19 +840,21 @@ export type Ticket = {
840840
prices?: Maybe<Array<Price>>;
841841
/** The number of tickets available for this ticket type */
842842
quantity?: Maybe<Scalars["Int"]["output"]>;
843+
quantityLeft?: Maybe<Scalars["Int"]["output"]>;
843844
requiresApproval: Scalars["Boolean"]["output"];
844845
startDateTime: Scalars["DateTime"]["output"];
845846
status: TicketTemplateStatus;
846847
visibility: TicketTemplateVisibility;
847848
};
848849

849850
export enum TicketApprovalStatus {
850-
Approved = "approved",
851-
Cancelled = "cancelled",
852-
Gifted = "gifted",
853-
NotRequired = "not_required",
854-
Pending = "pending",
855-
Rejected = "rejected",
851+
Approved = "Approved",
852+
Cancelled = "Cancelled",
853+
GiftAccepted = "GiftAccepted",
854+
Gifted = "Gifted",
855+
NotRequired = "NotRequired",
856+
Pending = "Pending",
857+
Rejected = "Rejected",
856858
}
857859

858860
export type TicketClaimInput = {

src/schema/events/tests/event.generated.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export type EventQueryVariables = Types.Exact<{
1212
}>;
1313

1414

15-
export type EventQuery = { __typename?: 'Query', event: { __typename?: 'Event', id: string, name: string, description: string | null, visibility: Types.EventVisibility, status: Types.EventStatus, startDateTime: string, endDateTime: string | null, tags: Array<{ __typename?: 'Tag', id: string }>, teams: Array<{ __typename?: 'TeamRef', id: string, users: Array<{ __typename?: 'UserWithStatusRef', status: Types.ParticipationStatus, role: Types.UserTeamRole, user: { __typename?: 'User', id: string } }> }>, community: { __typename?: 'Community', id: string } | null, users: Array<{ __typename?: 'User', id: string }>, usersTickets: Array<{ __typename?: 'UserTicket', id: string, approvalStatus: Types.TicketApprovalStatus, paymentStatus: Types.PurchaseOrderPaymentStatusEnum | null, redemptionStatus: Types.TicketRedemptionStatus, createdAt: string }> } | null };
15+
export type EventQuery = { __typename?: 'Query', event: { __typename?: 'Event', id: string, name: string, description: string | null, visibility: Types.EventVisibility, status: Types.EventStatus, startDateTime: string, endDateTime: string | null, tags: Array<{ __typename?: 'Tag', id: string }>, teams: Array<{ __typename?: 'TeamRef', id: string, users: Array<{ __typename?: 'UserWithStatusRef', id: string, status: Types.ParticipationStatus, role: Types.UserTeamRole, user: { __typename?: 'User', id: string } }> }>, community: { __typename?: 'Community', id: string } | null, users: Array<{ __typename?: 'User', id: string }>, usersTickets: Array<{ __typename?: 'UserTicket', id: string, approvalStatus: Types.TicketApprovalStatus, paymentStatus: Types.PurchaseOrderPaymentStatusEnum | null, redemptionStatus: Types.TicketRedemptionStatus, createdAt: string }> } | null };
1616

1717

1818
export const Event = gql`
@@ -31,6 +31,7 @@ export const Event = gql`
3131
teams {
3232
id
3333
users {
34+
id
3435
status
3536
role
3637
user {

0 commit comments

Comments
 (0)