From cf18fdb16bb8e85cba9cf2501d1c0cfe5138a21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Salazar?= <73718835+joshrs23@users.noreply.github.com> Date: Thu, 4 Dec 2025 17:05:27 -0500 Subject: [PATCH] chaging schemas for front --- .../connector/activityLog/mutations.gql | 4 ++-- dataconnect/connector/activityLog/queries.gql | 2 +- dataconnect/connector/event/mutations.gql | 24 +++++++++---------- dataconnect/connector/event/queries.gql | 12 +++++++--- dataconnect/connector/team/mutations.gql | 4 ++-- dataconnect/connector/team/queries.gql | 12 +++++++--- dataconnect/schema/activityLog.gql | 2 +- dataconnect/schema/event.gql | 12 +++++----- dataconnect/schema/team.gql | 2 +- 9 files changed, 43 insertions(+), 31 deletions(-) diff --git a/dataconnect/connector/activityLog/mutations.gql b/dataconnect/connector/activityLog/mutations.gql index 7bf01863..c4e03c3c 100644 --- a/dataconnect/connector/activityLog/mutations.gql +++ b/dataconnect/connector/activityLog/mutations.gql @@ -2,7 +2,7 @@ mutation CreateActivityLog( $title: String!, $description: String!, $activityType: ActivityType!, - $userId: UUID!, + $userId: String!, $isRead: Boolean ) @auth(level: USER) { activityLog_insert( @@ -21,7 +21,7 @@ mutation UpdateActivityLog( $title: String, $description: String, $activityType: ActivityType, - $userId: UUID, + $userId: String, $isRead: Boolean ) @auth(level: USER) { activityLog_update( diff --git a/dataconnect/connector/activityLog/queries.gql b/dataconnect/connector/activityLog/queries.gql index c3391d0d..24ed5458 100644 --- a/dataconnect/connector/activityLog/queries.gql +++ b/dataconnect/connector/activityLog/queries.gql @@ -23,7 +23,7 @@ query getActivityLogById( } query filterActivityLog( - $userId: UUID, + $userId: String, $activityType: ActivityType, $isRead: Boolean ) @auth(level: USER) { diff --git a/dataconnect/connector/event/mutations.gql b/dataconnect/connector/event/mutations.gql index 8f1e048f..9d003504 100644 --- a/dataconnect/connector/event/mutations.gql +++ b/dataconnect/connector/event/mutations.gql @@ -6,16 +6,16 @@ mutation CreateEvent( $recurrenceType: RecurrenceType, $recurrenceStartDate: Timestamp, $recurrenceEndDate: Timestamp, - $scatterDates: String, + $scatterDates: Any, $multiDayStartDate: Timestamp, $multiDayEndDate: Timestamp, $bufferTimeBefore: Float, $bufferTimeAfter: Float, $conflictDetectionEnabled: Boolean, - $detectedConflicts: String, + $detectedConflicts: Any, $businessId: UUID!, $businessName: String, - $vendorId: UUID, + $vendorId: String, $vendorName: String, $hub: String, $eventLocation: String, @@ -23,8 +23,8 @@ mutation CreateEvent( $poReference: String, $status: EventStatus!, $date: Timestamp!, - $shifts: String, - $addons: String, + $shifts: Any, + $addons: Any, $total: Float, $clientName: String, $clientEmail: String, @@ -32,7 +32,7 @@ mutation CreateEvent( $invoiceId: UUID, $notes: String, $requested: Int, - $assignedStaff: String + $assignedStaff: Any ) @auth(level: USER) { event_insert( data: { @@ -84,16 +84,16 @@ mutation UpdateEvent( $recurrenceType: RecurrenceType, $recurrenceStartDate: Timestamp, $recurrenceEndDate: Timestamp, - $scatterDates: String, + $scatterDates: Any, $multiDayStartDate: Timestamp, $multiDayEndDate: Timestamp, $bufferTimeBefore: Float, $bufferTimeAfter: Float, $conflictDetectionEnabled: Boolean, - $detectedConflicts: String, + $detectedConflicts: Any, $businessId: UUID, $businessName: String, - $vendorId: UUID, + $vendorId: String, $vendorName: String, $hub: String, $eventLocation: String, @@ -101,8 +101,8 @@ mutation UpdateEvent( $poReference: String, $status: EventStatus, $date: Timestamp, - $shifts: String, - $addons: String, + $shifts: Any, + $addons: Any, $total: Float, $clientName: String, $clientEmail: String, @@ -110,7 +110,7 @@ mutation UpdateEvent( $invoiceId: UUID, $notes: String, $requested: Int, - $assignedStaff: String + $assignedStaff: Any ) @auth(level: USER) { event_update( id: $id, diff --git a/dataconnect/connector/event/queries.gql b/dataconnect/connector/event/queries.gql index 3fe4233e..0ff1c579 100644 --- a/dataconnect/connector/event/queries.gql +++ b/dataconnect/connector/event/queries.gql @@ -1,5 +1,11 @@ -query listEvents @auth(level: USER) { - events { +query listEvents ( + $orderByDate: OrderDirection + $limit: Int +) @auth(level: USER) { + events( + orderBy: { date: $orderByDate } + limit: $limit + ) { id eventName status @@ -84,7 +90,7 @@ query getEventById( query filterEvents( $status: EventStatus, $businessId: UUID, - $vendorId: UUID, + $vendorId: String, $isRecurring: Boolean, $isRapid: Boolean, $isMultiDay: Boolean, diff --git a/dataconnect/connector/team/mutations.gql b/dataconnect/connector/team/mutations.gql index 239b90d1..2fab4bd8 100644 --- a/dataconnect/connector/team/mutations.gql +++ b/dataconnect/connector/team/mutations.gql @@ -1,6 +1,6 @@ mutation CreateTeam( $teamName: String!, - $ownerId: UUID!, + $ownerId: String!, $ownerName: String!, $ownerRole: TeamOwnerRole!, $favoriteStaff: String, @@ -21,7 +21,7 @@ mutation CreateTeam( mutation UpdateTeam( $id: UUID!, $teamName: String, - $ownerId: UUID, + $ownerId: String, $ownerName: String, $ownerRole: TeamOwnerRole, $favoriteStaff: String, diff --git a/dataconnect/connector/team/queries.gql b/dataconnect/connector/team/queries.gql index 430b98c5..c5a96d3a 100644 --- a/dataconnect/connector/team/queries.gql +++ b/dataconnect/connector/team/queries.gql @@ -1,5 +1,11 @@ -query listTeam @auth(level: USER) { - teams { +query listTeam ( + $orderByCreatedDate: OrderDirection + $limit: Int + ) @auth(level: USER) { + teams( + orderBy: { createdDate: $orderByCreatedDate } + limit: $limit + ) { id teamName ownerId @@ -26,7 +32,7 @@ query getTeamById( query filterTeam( $teamName: String, - $ownerId: UUID, + $ownerId: String, $ownerRole: TeamOwnerRole ) @auth(level: USER) { teams( diff --git a/dataconnect/schema/activityLog.gql b/dataconnect/schema/activityLog.gql index 735fef46..db3564e6 100644 --- a/dataconnect/schema/activityLog.gql +++ b/dataconnect/schema/activityLog.gql @@ -13,7 +13,7 @@ type ActivityLog @table(name: "activity_logs") { title: String! description: String! activityType: ActivityType! - userId: UUID! # user_id (FK lógica a User.id) + userId: String! # user_id (FK lógica a User.id) isRead: Boolean @default(expr: "false") createdDate: Timestamp @default(expr: "request.time") updatedDate: Timestamp @default(expr: "request.time") diff --git a/dataconnect/schema/event.gql b/dataconnect/schema/event.gql index 48485ecb..3e874d8d 100644 --- a/dataconnect/schema/event.gql +++ b/dataconnect/schema/event.gql @@ -33,16 +33,16 @@ type Event @table(name: "events") { recurrenceType: RecurrenceType recurrenceStartDate: Timestamp recurrenceEndDate: Timestamp - scatterDates: String + scatterDates: Any multiDayStartDate: Timestamp multiDayEndDate: Timestamp bufferTimeBefore: Float @default(expr: "0") bufferTimeAfter: Float @default(expr: "0") conflictDetectionEnabled: Boolean @default(expr: "true") - detectedConflicts: String + detectedConflicts: Any businessId: UUID! businessName: String - vendorId: UUID + vendorId: String vendorName: String hub: String eventLocation: String @@ -50,8 +50,8 @@ type Event @table(name: "events") { poReference: String status: EventStatus! date: Timestamp! - shifts: String - addons: String + shifts: Any + addons: Any total: Float clientName: String clientEmail: String @@ -59,7 +59,7 @@ type Event @table(name: "events") { invoiceId: UUID notes: String requested: Int @default(expr: "0") - assignedStaff: String + assignedStaff: Any createdDate: Timestamp @default(expr: "request.time") updatedDate: Timestamp @default(expr: "request.time") createdBy: String @default(expr: "auth.uid") diff --git a/dataconnect/schema/team.gql b/dataconnect/schema/team.gql index 92b214ec..73cc76c7 100644 --- a/dataconnect/schema/team.gql +++ b/dataconnect/schema/team.gql @@ -11,7 +11,7 @@ enum TeamOwnerRole { type Team @table(name: "team") { id: UUID! @default(expr: "uuidV4()") teamName: String! - ownerId: UUID! + ownerId: String! ownerName: String! ownerRole: TeamOwnerRole! favoriteStaff: String