Merge pull request 'dean/add-challenge-feature' (#212) from dean/add-challenge-feature into master

Reviewed-on: #212
2025-12-10 19:11:18 +00:00
parent 2b48ec48d5 9f735b61bb
commit 09267529cd
8 changed files with 7755 additions and 49 deletions
--- a/src/index.tsx
+++ b/src/index.tsx
--- a/src/operations/challenges.gql
+++ b/src/operations/challenges.gql
@@ -0,0 +1,282 @@
+query GetChallenges {
+  challenges {
+    id
+    name
+    description
+    minimumShots
+    startDate
+    endDate
+    createdAt
+    updatedAt
+    requiredTableSize
+    requiredPocketSize
+    isPublic
+    maxAttempts
+    ruleSet {
+      id
+      name
+      description
+    }
+    createdBy {
+      id
+      username
+      profileImageUri
+    }
+  }
+}
+
+query GetMyDismissedChallenges {
+  myDismissedChallenges {
+    id
+    name
+    description
+    minimumShots
+    startDate
+    endDate
+    createdAt
+    updatedAt
+    requiredTableSize
+    requiredPocketSize
+    isPublic
+    maxAttempts
+    ruleSet {
+      id
+      name
+      description
+    }
+    createdBy {
+      id
+      username
+      profileImageUri
+    }
+  }
+}
+
+query GetChallenge($id: ID!) {
+  challenge(id: $id) {
+    id
+    name
+    description
+    minimumShots
+    startDate
+    endDate
+    createdAt
+    updatedAt
+    requiredTableSize
+    requiredPocketSize
+    isPublic
+    maxAttempts
+    participantCount
+    ruleSet {
+      id
+      name
+      description
+    }
+    createdBy {
+      id
+      username
+      profileImageUri
+    }
+    invitations {
+      id
+      status
+      createdAt
+      invitee {
+        id
+        username
+        profileImageUri
+      }
+      inviter {
+        id
+        username
+        profileImageUri
+      }
+    }
+  }
+}
+
+query GetRuleSets {
+  ruleSets {
+    id
+    name
+    description
+  }
+}
+
+query GetChallengeLeaderboard($challengeId: ID!, $limit: Int) {
+  challengeLeaderboard(challengeId: $challengeId, limit: $limit) {
+    id
+    status
+    shotsCount
+    makesCount
+    makeRate
+    qualified
+    createdAt
+    attemptCount
+    user {
+      id
+      username
+      profileImageUri
+    }
+    video {
+      id
+      createdAt
+    }
+  }
+}
+
+query GetMyChallengeInvitations {
+  myChallengeInvitations {
+    id
+    status
+    createdAt
+    challenge {
+      id
+      name
+      description
+      startDate
+      endDate
+      createdBy {
+        id
+        username
+        profileImageUri
+      }
+    }
+    inviter {
+      id
+      username
+      profileImageUri
+    }
+  }
+}
+
+query GetMyChallengeEntries {
+  myChallengeEntries {
+    id
+    status
+    shotsCount
+    makesCount
+    makeRate
+    qualified
+    createdAt
+    challenge {
+      id
+      name
+    }
+    video {
+      id
+    }
+  }
+}
+
+mutation CreateRuleSet($name: String!, $description: String) {
+  createRuleSet(name: $name, description: $description) {
+    id
+    name
+    description
+  }
+}
+
+mutation CreateChallenge(
+  $name: String!
+  $ruleSetId: ID!
+  $minimumShots: Int!
+  $startDate: DateTime!
+  $endDate: DateTime!
+  $description: String
+  $requiredTableSize: Float
+  $requiredPocketSize: Float
+  $isPublic: Boolean! = false
+  $maxAttempts: Int
+) {
+  createChallenge(
+    name: $name
+    ruleSetId: $ruleSetId
+    minimumShots: $minimumShots
+    startDate: $startDate
+    endDate: $endDate
+    description: $description
+    requiredTableSize: $requiredTableSize
+    requiredPocketSize: $requiredPocketSize
+    isPublic: $isPublic
+    maxAttempts: $maxAttempts
+  ) {
+    id
+    name
+    description
+    requiredTableSize
+    requiredPocketSize
+    isPublic
+    maxAttempts
+  }
+}
+
+mutation InviteUsersToChallenge($challengeId: ID!, $userIds: [ID!]!) {
+  inviteUsersToChallenge(challengeId: $challengeId, userIds: $userIds) {
+    id
+    status
+    inviter {
+      id
+      username
+    }
+  }
+}
+
+mutation RespondToChallengeInvitation($invitationId: ID!, $accept: Boolean!) {
+  respondToChallengeInvitation(invitationId: $invitationId, accept: $accept) {
+    id
+    status
+    challenge {
+      id
+    }
+  }
+}
+
+mutation StartChallenge($challengeId: ID!) {
+  startChallenge(challengeId: $challengeId) {
+    id
+    status
+    createdAt
+    challenge {
+      id
+      name
+    }
+  }
+}
+
+mutation SubmitChallengeEntry($entryId: ID!, $videoId: ID!) {
+  submitChallengeEntry(entryId: $entryId, videoId: $videoId) {
+    id
+    status
+    qualified
+    makeRate
+    shotsCount
+    makesCount
+    video {
+      id
+    }
+  }
+}
+
+mutation RecalculateChallengeEntry($entryId: ID!) {
+  recalculateChallengeEntry(entryId: $entryId) {
+    id
+    status
+    qualified
+    makeRate
+    shotsCount
+    makesCount
+  }
+}
+
+query IsChallengeDismissed($challengeId: ID!) {
+  isChallengeDismissed(challengeId: $challengeId)
+}
+
+mutation DismissChallenge($challengeId: ID!) {
+  dismissChallenge(challengeId: $challengeId)
+}
+
+mutation UndismissChallenge($challengeId: ID!) {
+  undismissChallenge(challengeId: $challengeId)
+}
--- a/src/operations/notifications.gql
+++ b/src/operations/notifications.gql
@@ -42,6 +42,11 @@ fragment Notification on NotificationGQL {
    profileImageUri
  }
  videoId
+  challengeId
+  challenge {
+    id
+    name
+  }
  comment {
    id
    message
--- a/src/operations/user.gql
+++ b/src/operations/user.gql
@@ -163,3 +163,13 @@ fragment UserFragment on UserGQL {
  videosPrivateByDefault
  agreesToMarketing
 }
+
+query GetUsersMatching(
+  $matchString: String = null
+  $limit: Int = null
+  $after: String = null
+) {
+  getUsersMatching(matchString: $matchString, limit: $limit, after: $after) {
+    ...UserFragment
+  }
+}
--- a/src/schema.gql
+++ b/src/schema.gql
@@ -3,6 +3,14 @@ type Query {
    aggregateInput: AggregateInputGQL!
  ): [AggregateResultGQL!]!
  getBucketSet(keyName: String!): BucketSetGQL
+  challenges(includeDismissed: Boolean! = false): [Challenge!]!
+  myDismissedChallenges: [Challenge!]!
+  isChallengeDismissed(challengeId: ID!): Boolean!
+  challenge(id: ID!): Challenge
+  challengeLeaderboard(challengeId: ID!, limit: Int! = 50): [ChallengeEntry!]!
+  myChallengeInvitations: [ChallengeInvitation!]!
+  ruleSets: [RuleSet!]!
+  myChallengeEntries: [ChallengeEntry!]!
  getDeployedConfig: DeployedConfigGQL!
  waitFor(duration: Float!): Float!
  getFeedVideos(
@@ -298,35 +306,72 @@ type BucketGQL {
  lowerBound: Float!
 }

-type DeployedConfigGQL {
-  allowNewUsers: Boolean!
-  firebase: Boolean!
-  devMode: Boolean!
-  environment: String!
-  minimumAllowedAppVersion: String!
-  subscriptionGatingEnabled: Boolean!
-  bannerMessages: [BannerGQL!]!
+type Challenge {
+  id: ID!
+  name: String!
+  description: String
+  minimumShots: Int!
+  requiredTableSize: Float
+  requiredPocketSize: Float
+  isPublic: Boolean!
+  maxAttempts: Int
+  startDate: DateTime!
+  endDate: DateTime!
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  ruleSet: RuleSet!
+  createdBy: UserGQL!
+  invitations: [ChallengeInvitation!]!
+  participantCount: Int!
 }

-type BannerGQL {
+type RuleSet {
+  id: ID!
+  name: String!
+  description: String
+  createdAt: DateTime!
+  updatedAt: DateTime!
+}
+
+type UserGQL {
  id: Int!
-  message: String!
-  color: String!
-  kind: BannerKindEnum!
-  dismissible: Boolean!
-  priority: Int!
+  firebaseUid: String
+  username: String!
+  isAdmin: Boolean
+  fargoRating: Int
+  activeVideoId: Int
+  stripeCustomerId: String
+  profileImageUri: String
+  createdAt: DateTime
+  updatedAt: DateTime
+  videosPrivateByDefault: Boolean
+  agreesToMarketing: Boolean
+  following: [UserGQL!]
+  followers: [UserGQL!]
+  isFollowedByCurrentUser: Boolean
 }

-enum BannerKindEnum {
-  INFO
-  WARNING
-  ERROR
+type ChallengeInvitation {
+  id: ID!
+  status: String!
+  createdAt: DateTime!
+  challenge: Challenge!
+  inviter: UserGQL!
+  invitee: UserGQL!
 }

-type VideoHistoryGQL {
-  videos: [VideoGQL!]!
-  pageInfo: PageInfoGQL!
-  hasFollowing: Boolean!
+type ChallengeEntry {
+  id: ID!
+  status: String!
+  shotsCount: Int
+  makesCount: Int
+  makeRate: Float
+  qualified: Boolean
+  createdAt: DateTime!
+  attemptCount: Int
+  challenge: Challenge!
+  video: VideoGQL
+  user: UserGQL!
 }

 type VideoGQL {
@@ -360,24 +405,6 @@ type VideoGQL {
  comments: [CommentGQL!]!
 }

-type UserGQL {
-  id: Int!
-  firebaseUid: String
-  username: String!
-  isAdmin: Boolean
-  fargoRating: Int
-  activeVideoId: Int
-  stripeCustomerId: String
-  profileImageUri: String
-  createdAt: DateTime
-  updatedAt: DateTime
-  videosPrivateByDefault: Boolean
-  agreesToMarketing: Boolean
-  following: [UserGQL!]
-  followers: [UserGQL!]
-  isFollowedByCurrentUser: Boolean
-}
-
 type ShotGQL {
  id: Int!
  videoId: Int!
@@ -633,6 +660,37 @@ type CommentGQL {
  replies: [CommentGQL!]!
 }

+type DeployedConfigGQL {
+  allowNewUsers: Boolean!
+  firebase: Boolean!
+  devMode: Boolean!
+  environment: String!
+  minimumAllowedAppVersion: String!
+  subscriptionGatingEnabled: Boolean!
+  bannerMessages: [BannerGQL!]!
+}
+
+type BannerGQL {
+  id: Int!
+  message: String!
+  color: String!
+  kind: BannerKindEnum!
+  dismissible: Boolean!
+  priority: Int!
+}
+
+enum BannerKindEnum {
+  INFO
+  WARNING
+  ERROR
+}
+
+type VideoHistoryGQL {
+  videos: [VideoGQL!]!
+  pageInfo: PageInfoGQL!
+  hasFollowing: Boolean!
+}
+
 type PageInfoGQL {
  hasNextPage: Boolean!
  endCursor: String
@@ -736,6 +794,8 @@ type NotificationGQL {
  notificationType: NotificationTypeEnum!
  actor: UserGQL!
  videoId: Int
+  challengeId: Int
+  challenge: Challenge
  comment: CommentGQL
  reactionType: String
  isRead: Boolean!
@@ -748,6 +808,7 @@ enum NotificationTypeEnum {
  COMMENT_REPLY
  REACTION
  FOLLOW
+  CHALLENGE_INVITE
 }

 input NotificationFilters {
@@ -940,6 +1001,32 @@ scalar JSON

 type Mutation {
  createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
+  createRuleSet(name: String!, description: String = null): RuleSet!
+  createChallenge(
+    name: String!
+    ruleSetId: ID!
+    minimumShots: Int!
+    startDate: DateTime!
+    endDate: DateTime!
+    description: String = null
+    requiredTableSize: Float = null
+    requiredPocketSize: Float = null
+    isPublic: Boolean! = false
+    maxAttempts: Int = null
+  ): Challenge!
+  inviteUsersToChallenge(
+    challengeId: ID!
+    userIds: [ID!]!
+  ): [ChallengeInvitation!]!
+  respondToChallengeInvitation(
+    invitationId: ID!
+    accept: Boolean!
+  ): ChallengeInvitation!
+  startChallenge(challengeId: ID!): ChallengeEntry!
+  recalculateChallengeEntry(entryId: ID!): ChallengeEntry!
+  submitChallengeEntry(entryId: ID!, videoId: ID!): ChallengeEntry!
+  dismissChallenge(challengeId: ID!): Boolean!
+  undismissChallenge(challengeId: ID!): Boolean!
  setLoggerLevel(path: String!, level: String!): Boolean!
  reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
  commentOnVideo(