package.json

@@ -15,7 +15,7 @@
     "@apollo/client": "^3.11.10",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
-    "@graphql-codegen/typescript-operations": "^4.0.1",
+    "@graphql-codegen/typescript-operations": "^5.0.4",
     "@graphql-codegen/typescript-react-apollo": "^4.2.0",
     "graphql": "^16.8.1",
     "pbjs": "^0.0.14",

src/operations/challenges.gql

@@ -0,0 +1,207 @@
+query GetChallenges {
+  challenges {
+    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
+    ruleSet {
+      id
+      name
+      description
+    }
+    createdBy {
+      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
+    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
+    }
+  }
+}
+
+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
+  }
+}

src/operations/notifications.gql

@@ -42,6 +42,11 @@ fragment Notification on NotificationGQL {
     profileImageUri
   }
   videoId
+  challengeId
+  challenge {
+    id
+    name
+  }
   comment {
     id
     message

src/operations/user.gql

@@ -177,3 +177,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
+  }
+}

src/schema.gql

@@ -3,6 +3,12 @@ type Query {
     aggregateInput: AggregateInputGQL!
   ): [AggregateResultGQL!]!
   getBucketSet(keyName: String!): BucketSetGQL
+  challenges: [Challenge!]!
+  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 +304,60 @@ type BucketGQL {
   lowerBound: Float!
 }
 
-type DeployedConfigGQL {
+type Challenge {
-  allowNewUsers: Boolean!
+  id: ID!
-  firebase: Boolean!
+  name: String!
-  devMode: Boolean!
+  description: String
-  environment: String!
+  minimumShots: Int!
-  minimumAllowedAppVersion: String!
+  requiredTableSize: Float
-  subscriptionGatingEnabled: Boolean!
+  requiredPocketSize: Float
-  bannerMessages: [BannerGQL!]!
+  isPublic: Boolean!
+  maxAttempts: Int
+  startDate: DateTime!
+  endDate: DateTime!
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  ruleSet: RuleSet!
+  createdBy: UserGQL!
 }
 
-type BannerGQL {
+type RuleSet {
+  id: ID!
+  name: String!
+  description: String
+  createdAt: DateTime!
+  updatedAt: DateTime!
+}
+
+type UserGQL {
   id: Int!
-  message: String!
+  firebaseUid: String
-  color: String!
+  username: String!
-  kind: BannerKindEnum!
+  isAdmin: Boolean
-  dismissible: Boolean!
+  fargoRating: Int
-  priority: Int!
+  activeVideoId: Int
+  stripeCustomerId: String
+  profileImageUri: String
+  createdAt: DateTime
+  updatedAt: DateTime
+  videosPrivateByDefault: Boolean
+  agreesToMarketing: Boolean
+  following: [UserGQL!]
+  followers: [UserGQL!]
+  isFollowedByCurrentUser: Boolean
 }
 
-enum BannerKindEnum {
+type ChallengeEntry {
-  INFO
+  id: ID!
-  WARNING
+  status: String!
-  ERROR
+  shotsCount: Int
-}
+  makesCount: Int
-
+  makeRate: Float
-type VideoHistoryGQL {
+  qualified: Boolean
-  videos: [VideoGQL!]!
+  createdAt: DateTime!
-  pageInfo: PageInfoGQL!
+  challenge: Challenge!
-  hasFollowing: Boolean!
+  video: VideoGQL
+  user: UserGQL!
 }
 
 type VideoGQL {
@@ -360,23 +391,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!]
-}
-
 type ShotGQL {
   id: Int!
   videoId: Int!
@@ -632,6 +646,45 @@ type CommentGQL {
   replies: [CommentGQL!]!
 }
 
+type ChallengeInvitation {
+  id: ID!
+  status: String!
+  createdAt: DateTime!
+  challenge: Challenge!
+  inviter: UserGQL!
+}
+
+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
@@ -654,6 +707,7 @@ input VideoFeedInputGQL @oneOf {
   followedByUserId: Int
   userId: Int
   allUsers: Boolean
+  home: Boolean
 }
 
 type MakePercentageIntervalGQL {
@@ -734,6 +788,8 @@ type NotificationGQL {
   notificationType: NotificationTypeEnum!
   actor: UserGQL!
   videoId: Int
+  challengeId: Int
+  challenge: Challenge
   comment: CommentGQL
   reactionType: String
   isRead: Boolean!
@@ -746,6 +802,7 @@ enum NotificationTypeEnum {
   COMMENT_REPLY
   REACTION
   FOLLOW
+  CHALLENGE_INVITE
 }
 
 input NotificationFilters {
@@ -938,6 +995,30 @@ 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!
   setLoggerLevel(path: String!, level: String!): Boolean!
   reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
   commentOnVideo(

yarn.lock

@@ -603,6 +603,18 @@
     lodash "~4.17.0"
     tslib "~2.5.0"
 
+"@graphql-codegen/plugin-helpers@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-6.0.0.tgz#8a913c82a95b9ff36b2180f7c56611cc56268625"
+  integrity sha512-Z7P89vViJvQakRyMbq/JF2iPLruRFOwOB6IXsuSvV/BptuuEd7fsGPuEf8bdjjDxUY0pJZnFN8oC7jIQ8p9GKA==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.0"
+    change-case-all "1.0.15"
+    common-tags "1.8.2"
+    import-from "4.0.0"
+    lodash "~4.17.0"
+    tslib "~2.6.0"
+
 "@graphql-codegen/schema-ast@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-4.0.0.tgz#5d60996c87b64f81847da8fcb2d8ef50ede89755"
@@ -612,16 +624,25 @@
     "@graphql-tools/utils" "^10.0.0"
     tslib "~2.5.0"
 
-"@graphql-codegen/typescript-operations@^4.0.1":
+"@graphql-codegen/schema-ast@^5.0.0":
-  version "4.0.1"
+  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-4.0.1.tgz#930af3e2d2ae8ff06de696291be28fe7046a2fef"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-5.0.0.tgz#9708d7484a01bb3a502685126708d7b139fd0721"
-  integrity sha512-GpUWWdBVUec/Zqo23aFLBMrXYxN2irypHqDcKjN78JclDPdreasAEPcIpMfqf4MClvpmvDLy4ql+djVAwmkjbw==
+  integrity sha512-jn7Q3PKQc0FxXjbpo9trxzlz/GSFQWxL042l0iC8iSbM/Ar+M7uyBwMtXPsev/3Razk+osQyreghIz0d2+6F7Q==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.0"
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
-    "@graphql-codegen/typescript" "^4.0.1"
+    "@graphql-tools/utils" "^10.0.0"
-    "@graphql-codegen/visitor-plugin-common" "4.0.1"
+    tslib "~2.6.0"
+
+"@graphql-codegen/typescript-operations@^5.0.4":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-5.0.4.tgz#052680d41f4bab3bb85af8e906c43bde29239e7b"
+  integrity sha512-5Bu/BTmyNjdSfSLLBKjC0+4XWcY01uotVcnVIWIxxRdIHoRxnTW6PUkT5CoPHP5r/Uoo3OvIJxh+0LYSH5suwA==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
+    "@graphql-codegen/typescript" "^5.0.4"
+    "@graphql-codegen/visitor-plugin-common" "6.1.2"
     auto-bind "~4.0.0"
-    tslib "~2.5.0"
+    tslib "~2.6.0"
 
 "@graphql-codegen/typescript-react-apollo@^4.2.0":
   version "4.2.0"
@@ -645,6 +666,17 @@
     auto-bind "~4.0.0"
     tslib "~2.5.0"
 
+"@graphql-codegen/typescript@^5.0.4":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-5.0.4.tgz#a7f51505445568fd737b01ce7fad515c2b89897f"
+  integrity sha512-q6S8hX+aR4BzeGgolac4gp22rBnXbLhedmOwT1UBT9e3lGNmNpYC7WJUEzAPjWf6z1lRSNmojLlwEjTnffhKNA==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
+    "@graphql-codegen/schema-ast" "^5.0.0"
+    "@graphql-codegen/visitor-plugin-common" "6.1.2"
+    auto-bind "~4.0.0"
+    tslib "~2.6.0"
+
 "@graphql-codegen/visitor-plugin-common@2.13.1":
   version "2.13.1"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.1.tgz#2228660f6692bcdb96b1f6d91a0661624266b76b"
@@ -677,6 +709,22 @@
     parse-filepath "^1.0.2"
     tslib "~2.5.0"
 
+"@graphql-codegen/visitor-plugin-common@6.1.2":
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-6.1.2.tgz#e614d6606402a152686d6f90e6363150a7a55bde"
+  integrity sha512-zYdrhJKgk8kqE1Xz5/m/Ua42zk+rIvYB/FHh3dE1AhZ6b1IDqgKjF3LnkT+K2qenf9EfT4yNjXd5CEKMeXfHyg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
+    "@graphql-tools/optimize" "^2.0.0"
+    "@graphql-tools/relay-operation-optimizer" "^7.0.0"
+    "@graphql-tools/utils" "^10.0.0"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.15"
+    dependency-graph "^1.0.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "~2.6.0"
+
 "@graphql-tools/apollo-engine-loader@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.0.tgz#ac1f351cbe41508411784f25757f5557b0f27489"
@@ -1649,6 +1697,11 @@ dependency-graph@^0.11.0:
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
   integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
 
+dependency-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-1.0.0.tgz#bb5e85aec1310bc13b22dbd76e3196c4ee4c10d2"
+  integrity sha512-cW3gggJ28HZ/LExwxP2B++aiKxhJXMSIt9K48FOXQkm+vuG5gyatXnLsONRJdzO/7VfjDIiaOOa/bs4l464Lwg==
+
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"