Skip to content

Commit

Permalink
Fix/public ids (#53)
Browse files Browse the repository at this point in the history 
# Summary
- Use the public ID for purchaseOrder instead of the private ID
- Use the public ID for ticket instead of the private ID
  • Loading branch information
@joseglego
joseglego authored Sep 27, 2024
1 parent 5991742 commit 860dcbd
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 9 deletions.
12 changes: 6 additions & 6 deletions app/api/gql/gql.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import type { TypedDocumentNode as DocumentNode } from "@graphql-typed-document-
const documents = {
"query FetchExampleEvents($input: PaginatedInputEventsSearchInput!) {\n searchEvents(input: $input) {\n data {\n id\n description\n community {\n id\n name\n }\n tags {\n id\n name\n description\n }\n }\n }\n}":
types.FetchExampleEventsDocument,
"query myEvent($input: PaginatedInputEventsSearchInput!, $userTicketSearchInput: EventsTicketsSearchInput) {\n searchEvents(input: $input) {\n data {\n id\n name\n description\n startDateTime\n endDateTime\n address\n publicShareURL\n previewImage {\n url\n }\n bannerImage {\n url\n }\n mobileBannerImage {\n url\n }\n community {\n id\n name\n }\n status\n usersTickets(input: $userTicketSearchInput) {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n createdAt\n ticketTemplate {\n id\n name\n description\n }\n }\n }\n pagination {\n currentPage\n pageSize\n totalPages\n totalRecords\n }\n }\n}":
"query myEvent($input: PaginatedInputEventsSearchInput!, $userTicketSearchInput: EventsTicketsSearchInput) {\n searchEvents(input: $input) {\n data {\n id\n name\n description\n startDateTime\n endDateTime\n address\n publicShareURL\n previewImage {\n url\n }\n bannerImage {\n url\n }\n mobileBannerImage {\n url\n }\n community {\n id\n name\n }\n status\n usersTickets(input: $userTicketSearchInput) {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n createdAt\n publicId\n ticketTemplate {\n id\n name\n description\n }\n }\n }\n pagination {\n currentPage\n pageSize\n totalPages\n totalRecords\n }\n }\n}":
types.MyEventDocument,
"query myEvents($input: PaginatedInputEventsSearchInput!, $userTicketSearchInput: EventsTicketsSearchInput) {\n searchEvents(input: $input) {\n data {\n id\n name\n description\n startDateTime\n address\n previewImage {\n url\n }\n community {\n id\n name\n }\n status\n usersTickets(input: $userTicketSearchInput) {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n ticketTemplate {\n description\n id\n }\n }\n }\n pagination {\n currentPage\n pageSize\n totalPages\n totalRecords\n }\n }\n}":
types.MyEventsDocument,
Expand All @@ -25,7 +25,7 @@ const documents = {
types.SearchUsersDocument,
"query myProfile {\n me {\n id\n bio\n lastName\n username\n imageUrl\n isSuperAdmin\n email\n name\n impersonatedUser {\n id\n name\n }\n communities {\n id\n name\n }\n }\n}":
types.MyProfileDocument,
"mutation CheckPurchaseOrderStatus($input: CheckForPurchaseOrderInput!) {\n checkPurchaseOrderStatus(input: $input) {\n id\n paymentLink\n status\n finalPrice\n paymentPlatform\n createdAt\n currency {\n id\n currency\n }\n tickets {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n ticketTemplate {\n id\n name\n description\n event {\n id\n name\n address\n description\n startDateTime\n endDateTime\n status\n publicShareURL\n logoImage {\n url\n }\n community {\n name\n }\n }\n prices {\n id\n amount\n currency {\n currency\n id\n }\n }\n }\n }\n }\n}":
"mutation CheckPurchaseOrderStatus($input: CheckForPurchaseOrderInput!) {\n checkPurchaseOrderStatus(input: $input) {\n id\n paymentLink\n status\n finalPrice\n paymentPlatform\n createdAt\n publicId\n currency {\n id\n currency\n }\n tickets {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n publicId\n ticketTemplate {\n id\n name\n description\n event {\n id\n name\n address\n description\n startDateTime\n endDateTime\n status\n publicShareURL\n logoImage {\n url\n }\n community {\n name\n }\n }\n prices {\n id\n amount\n currency {\n currency\n id\n }\n }\n }\n }\n }\n}":
types.CheckPurchaseOrderStatusDocument,
"fragment EventTicketFragment on Ticket {\n id\n name\n description\n quantity\n isFree\n startDateTime\n status\n isUnlimited\n prices {\n id\n amount\n currency {\n currency\n id\n }\n }\n}":
types.EventTicketFragmentFragmentDoc,
Expand Down Expand Up @@ -59,8 +59,8 @@ export function graphql(
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(
source: "query myEvent($input: PaginatedInputEventsSearchInput!, $userTicketSearchInput: EventsTicketsSearchInput) {\n searchEvents(input: $input) {\n data {\n id\n name\n description\n startDateTime\n endDateTime\n address\n publicShareURL\n previewImage {\n url\n }\n bannerImage {\n url\n }\n mobileBannerImage {\n url\n }\n community {\n id\n name\n }\n status\n usersTickets(input: $userTicketSearchInput) {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n createdAt\n ticketTemplate {\n id\n name\n description\n }\n }\n }\n pagination {\n currentPage\n pageSize\n totalPages\n totalRecords\n }\n }\n}",
): (typeof documents)["query myEvent($input: PaginatedInputEventsSearchInput!, $userTicketSearchInput: EventsTicketsSearchInput) {\n searchEvents(input: $input) {\n data {\n id\n name\n description\n startDateTime\n endDateTime\n address\n publicShareURL\n previewImage {\n url\n }\n bannerImage {\n url\n }\n mobileBannerImage {\n url\n }\n community {\n id\n name\n }\n status\n usersTickets(input: $userTicketSearchInput) {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n createdAt\n ticketTemplate {\n id\n name\n description\n }\n }\n }\n pagination {\n currentPage\n pageSize\n totalPages\n totalRecords\n }\n }\n}"];
source: "query myEvent($input: PaginatedInputEventsSearchInput!, $userTicketSearchInput: EventsTicketsSearchInput) {\n searchEvents(input: $input) {\n data {\n id\n name\n description\n startDateTime\n endDateTime\n address\n publicShareURL\n previewImage {\n url\n }\n bannerImage {\n url\n }\n mobileBannerImage {\n url\n }\n community {\n id\n name\n }\n status\n usersTickets(input: $userTicketSearchInput) {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n createdAt\n publicId\n ticketTemplate {\n id\n name\n description\n }\n }\n }\n pagination {\n currentPage\n pageSize\n totalPages\n totalRecords\n }\n }\n}",
): (typeof documents)["query myEvent($input: PaginatedInputEventsSearchInput!, $userTicketSearchInput: EventsTicketsSearchInput) {\n searchEvents(input: $input) {\n data {\n id\n name\n description\n startDateTime\n endDateTime\n address\n publicShareURL\n previewImage {\n url\n }\n bannerImage {\n url\n }\n mobileBannerImage {\n url\n }\n community {\n id\n name\n }\n status\n usersTickets(input: $userTicketSearchInput) {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n createdAt\n publicId\n ticketTemplate {\n id\n name\n description\n }\n }\n }\n pagination {\n currentPage\n pageSize\n totalPages\n totalRecords\n }\n }\n}"];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
Expand Down Expand Up @@ -89,8 +89,8 @@ export function graphql(
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(
source: "mutation CheckPurchaseOrderStatus($input: CheckForPurchaseOrderInput!) {\n checkPurchaseOrderStatus(input: $input) {\n id\n paymentLink\n status\n finalPrice\n paymentPlatform\n createdAt\n currency {\n id\n currency\n }\n tickets {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n ticketTemplate {\n id\n name\n description\n event {\n id\n name\n address\n description\n startDateTime\n endDateTime\n status\n publicShareURL\n logoImage {\n url\n }\n community {\n name\n }\n }\n prices {\n id\n amount\n currency {\n currency\n id\n }\n }\n }\n }\n }\n}",
): (typeof documents)["mutation CheckPurchaseOrderStatus($input: CheckForPurchaseOrderInput!) {\n checkPurchaseOrderStatus(input: $input) {\n id\n paymentLink\n status\n finalPrice\n paymentPlatform\n createdAt\n currency {\n id\n currency\n }\n tickets {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n ticketTemplate {\n id\n name\n description\n event {\n id\n name\n address\n description\n startDateTime\n endDateTime\n status\n publicShareURL\n logoImage {\n url\n }\n community {\n name\n }\n }\n prices {\n id\n amount\n currency {\n currency\n id\n }\n }\n }\n }\n }\n}"];
source: "mutation CheckPurchaseOrderStatus($input: CheckForPurchaseOrderInput!) {\n checkPurchaseOrderStatus(input: $input) {\n id\n paymentLink\n status\n finalPrice\n paymentPlatform\n createdAt\n publicId\n currency {\n id\n currency\n }\n tickets {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n publicId\n ticketTemplate {\n id\n name\n description\n event {\n id\n name\n address\n description\n startDateTime\n endDateTime\n status\n publicShareURL\n logoImage {\n url\n }\n community {\n name\n }\n }\n prices {\n id\n amount\n currency {\n currency\n id\n }\n }\n }\n }\n }\n}",
): (typeof documents)["mutation CheckPurchaseOrderStatus($input: CheckForPurchaseOrderInput!) {\n checkPurchaseOrderStatus(input: $input) {\n id\n paymentLink\n status\n finalPrice\n paymentPlatform\n createdAt\n publicId\n currency {\n id\n currency\n }\n tickets {\n id\n approvalStatus\n paymentStatus\n redemptionStatus\n publicId\n ticketTemplate {\n id\n name\n description\n event {\n id\n name\n address\n description\n startDateTime\n endDateTime\n status\n publicShareURL\n logoImage {\n url\n }\n community {\n name\n }\n }\n prices {\n id\n amount\n currency {\n currency\n id\n }\n }\n }\n }\n }\n}"];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
Expand Down
13 changes: 13 additions & 0 deletions app/api/gql/graphql.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@ export type PurchaseOrder = {
id: Scalars["ID"]["output"];
paymentLink?: Maybe<Scalars["String"]["output"]>;
paymentPlatform?: Maybe<Scalars["String"]["output"]>;
publicId?: Maybe<Scalars["String"]["output"]>;
purchasePaymentStatus?: Maybe<PurchaseOrderPaymentStatusEnum>;
status?: Maybe<PurchaseOrderStatusEnum>;
tickets: Array<UserTicket>;
Expand Down Expand Up @@ -1376,6 +1377,7 @@ export type MyEventQuery = {
paymentStatus?: PurchaseOrderPaymentStatusEnum | null;
redemptionStatus: TicketRedemptionStatus;
createdAt: string;
publicId: string;
ticketTemplate: {
id: string;
name: string;
Expand Down Expand Up @@ -1501,12 +1503,14 @@ export type CheckPurchaseOrderStatusMutation = {
finalPrice?: number | null;
paymentPlatform?: string | null;
createdAt?: string | null;
publicId?: string | null;
currency?: { id: string; currency: string } | null;
tickets: Array<{
id: string;
approvalStatus: TicketApprovalStatus;
paymentStatus?: PurchaseOrderPaymentStatusEnum | null;
redemptionStatus: TicketRedemptionStatus;
publicId: string;
ticketTemplate: {
id: string;
name: string;
Expand Down Expand Up @@ -1938,6 +1942,10 @@ export const MyEventDocument = {
kind: "Field",
name: { kind: "Name", value: "createdAt" },
},
{
kind: "Field",
name: { kind: "Name", value: "publicId" },
},
{
kind: "Field",
name: { kind: "Name", value: "ticketTemplate" },
Expand Down Expand Up @@ -2551,6 +2559,7 @@ export const CheckPurchaseOrderStatusDocument = {
name: { kind: "Name", value: "paymentPlatform" },
},
{ kind: "Field", name: { kind: "Name", value: "createdAt" } },
{ kind: "Field", name: { kind: "Name", value: "publicId" } },
{
kind: "Field",
name: { kind: "Name", value: "currency" },
Expand Down Expand Up @@ -2584,6 +2593,10 @@ export const CheckPurchaseOrderStatusDocument = {
kind: "Field",
name: { kind: "Name", value: "redemptionStatus" },
},
{
kind: "Field",
name: { kind: "Name", value: "publicId" },
},
{
kind: "Field",
name: { kind: "Name", value: "ticketTemplate" },
Expand Down
1 change: 1 addition & 0 deletions app/api/gql/schema.gql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ type PurchaseOrder {
id: ID!
paymentLink: String
paymentPlatform: String
publicId: String
purchasePaymentStatus: PurchaseOrderPaymentStatusEnum
status: PurchaseOrderStatusEnum
tickets: [UserTicket!]!
Expand Down
2 changes: 1 addition & 1 deletion app/components/MyEvent/MyEvent.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Ticket = ({
}) => {
const [showQR, setShowQR] = useState(false);
const publicUrl = event?.publicShareURL
? urls.public.ticket(ticket.id, event.publicShareURL)
? urls.public.ticket(ticket.publicId, event.publicShareURL)
: undefined;

return (
Expand Down
2 changes: 2 additions & 0 deletions app/components/MyEvent/graphql/myEvent.generated.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export type MyEventQuery = {
paymentStatus?: Types.PurchaseOrderPaymentStatusEnum | null;
redemptionStatus: Types.TicketRedemptionStatus;
createdAt: any;
publicId: string;
ticketTemplate: {
__typename?: "Ticket";
id: string;
Expand Down Expand Up @@ -94,6 +95,7 @@ export const MyEventDocument = gql`
paymentStatus
redemptionStatus
createdAt
publicId
ticketTemplate {
id
name
Expand Down
1 change: 1 addition & 0 deletions app/components/MyEvent/graphql/myEvent.gql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ query myEvent(
paymentStatus
redemptionStatus
createdAt
publicId
ticketTemplate {
id
name
Expand Down
7 changes: 5 additions & 2 deletions app/components/PurchaseOrder/Callback.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,11 @@ export const PurchaseCallback = ({
event?.publicShareURL &&
purchaseOrder.status === PurchaseOrderStatusEnum.Complete
? purchaseOrder.tickets.length > 1
? urls.public.po(purchaseOrderId, event.publicShareURL)
: urls.public.ticket(tickets[0].ticket.id, event.publicShareURL)
? urls.public.po(purchaseOrder.publicId as string, event.publicShareURL)
: urls.public.ticket(
purchaseOrder.tickets[0].publicId,
event.publicShareURL,
)
: null;
const purchaseOrderStatuses = [
PurchaseOrderStatusEnum.Open,
Expand Down
4 changes: 4 additions & 0 deletions app/components/PurchaseOrder/graphql/checkPurchaseOrderStatus.generated.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export type CheckPurchaseOrderStatusMutation = {
finalPrice?: number | null;
paymentPlatform?: string | null;
createdAt?: any | null;
publicId?: string | null;
currency?: {
__typename?: "AllowedCurrency";
id: string;
Expand All @@ -33,6 +34,7 @@ export type CheckPurchaseOrderStatusMutation = {
approvalStatus: Types.TicketApprovalStatus;
paymentStatus?: Types.PurchaseOrderPaymentStatusEnum | null;
redemptionStatus: Types.TicketRedemptionStatus;
publicId: string;
ticketTemplate: {
__typename?: "Ticket";
id: string;
Expand Down Expand Up @@ -75,6 +77,7 @@ export const CheckPurchaseOrderStatusDocument = gql`
finalPrice
paymentPlatform
createdAt
publicId
currency {
id
currency
Expand All @@ -84,6 +87,7 @@ export const CheckPurchaseOrderStatusDocument = gql`
approvalStatus
paymentStatus
redemptionStatus
publicId
ticketTemplate {
id
name
Expand Down
2 changes: 2 additions & 0 deletions app/components/PurchaseOrder/graphql/checkPurchaseOrderStatus.gql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ mutation CheckPurchaseOrderStatus($input: CheckForPurchaseOrderInput!) {
finalPrice
paymentPlatform
createdAt
publicId
currency {
id
currency
Expand All @@ -15,6 +16,7 @@ mutation CheckPurchaseOrderStatus($input: CheckForPurchaseOrderInput!) {
approvalStatus
paymentStatus
redemptionStatus
publicId
ticketTemplate {
id
name
Expand Down

0 comments on commit 860dcbd

Please sign in to comment.