Merge pull request #6456 from artsy/staging

Deploy
artsy · Feb 20, 2025 · d203156 · d203156
2 parents 863c491 + f3e729d
commit d203156
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 68 deletions.
diff --git a/_schemaV2.graphql b/_schemaV2.graphql
@@ -2343,6 +2343,41 @@ type ArtistsWithAlertCountsEdge {
   totalAlertCount: Int
 }
 
+type ArtsyShippingOptInMutationFailure {
+  mutationError: GravityMutationError
+}
+
+input ArtsyShippingOptInMutationInput {
+  # Whether Artsy domestic shipping should be enabled
+  artsyShippingDomestic: Boolean
+
+  # Whether Artsy international shipping should be enabled
+  artsyShippingInternational: Boolean
+  clientMutationId: String
+
+  # ID of the partner
+  id: String!
+}
+
+type ArtsyShippingOptInMutationPayload {
+  ArtsyShippingOptInOrError: ArtsyShippingOptInMutationType
+  clientMutationId: String
+}
+
+type ArtsyShippingOptInMutationSuccess {
+  skippedPartnerArtworks: ArtsyShippingOptInResponse
+  updatedPartnerArtworks: ArtsyShippingOptInResponse
+}
+
+union ArtsyShippingOptInMutationType =
+    ArtsyShippingOptInMutationFailure
+  | ArtsyShippingOptInMutationSuccess
+
+type ArtsyShippingOptInResponse {
+  count: Int
+  ids: [String]
+}
+
 type Artwork implements Node & Searchable & Sellable {
   additionalInformation(format: Format): String
   artaShippingEnabled: Boolean
@@ -4190,41 +4225,6 @@ type BulkUpdateArtworksMetadataResponse {
   ids: [String]
 }
 
-type BulkUpdatePartnerArtworksMutationFailure {
-  mutationError: GravityMutationError
-}
-
-input BulkUpdatePartnerArtworksMutationInput {
-  # Whether Artsy domestic shipping should be enabled
-  artsyShippingDomestic: Boolean
-
-  # Whether Artsy international shipping should be enabled
-  artsyShippingInternational: Boolean
-  clientMutationId: String
-
-  # ID of the partner
-  id: String!
-}
-
-type BulkUpdatePartnerArtworksMutationPayload {
-  bulkUpdatePartnerArtworksOrError: BulkUpdatePartnerArtworksMutationType
-  clientMutationId: String
-}
-
-type BulkUpdatePartnerArtworksMutationSuccess {
-  skippedPartnerArtworks: BulkUpdatePartnerArtworksResponse
-  updatedPartnerArtworks: BulkUpdatePartnerArtworksResponse
-}
-
-union BulkUpdatePartnerArtworksMutationType =
-    BulkUpdatePartnerArtworksMutationFailure
-  | BulkUpdatePartnerArtworksMutationSuccess
-
-type BulkUpdatePartnerArtworksResponse {
-  count: Int
-  ids: [String]
-}
-
 type BuyersPremium {
   # A formatted price with various currency formatting options.
   amount(
@@ -13923,6 +13923,11 @@ type Mutation {
     input: AdminUpdateFeatureFlagInput!
   ): AdminUpdateFeatureFlagPayload
 
+  # Update all artworks that belong to the partner
+  artsyShippingOptIn(
+    input: ArtsyShippingOptInMutationInput!
+  ): ArtsyShippingOptInMutationPayload
+
   # Add / remove artworks to / from collections
   artworksCollectionsBatchUpdate(
     input: ArtworksCollectionsBatchUpdateInput!
@@ -13935,11 +13940,6 @@ type Mutation {
   bulkUpdateArtworksMetadata(
     input: BulkUpdateArtworksMetadataMutationInput!
   ): BulkUpdateArtworksMetadataMutationPayload
-
-  # Update all artworks that belong to the partner
-  bulkUpdatePartnerArtworks(
-    input: BulkUpdatePartnerArtworksMutationInput!
-  ): BulkUpdatePartnerArtworksMutationPayload
   captureHold(
     # Parameters for CaptureHold
     input: CaptureHoldInput!

diff --git a/src/lib/loaders/loaders_with_authentication/gravity.ts b/src/lib/loaders/loaders_with_authentication/gravity.ts
@@ -675,7 +675,7 @@ export default (accessToken, userID, opts) => {
     ),
     matchPagesLoader: gravityLoader("match/pages", {}, { headers: true }),
     optInArtworksIntoCommerceLoader: gravityLoader(
-      (id) => `partner/${id}/opt_in_artworks_into_commerce`,
+      (id) => `partner/${id}/bulk_operations/commerce_opt_in`,
       {},
       { method: "PUT" }
     ),
@@ -990,8 +990,8 @@ export default (accessToken, userID, opts) => {
       {},
       { method: "PUT" }
     ),
-    updatePartnerArtworksLoader: gravityLoader(
-      (id) => `partner/${id}/artworks`,
+    artsyShippingOptInLoader: gravityLoader(
+      (id) => `partner/${id}/bulk_operations/artsy_shipping_opt_in`,
       {},
       { method: "PUT" }
     ),

diff --git a/...a/v2/bulkUpdatePartnerArtworksMutation.ts → ...ippingOptIn/artsyShippingOptInMutation.ts b/...a/v2/bulkUpdatePartnerArtworksMutation.ts → ...ippingOptIn/artsyShippingOptInMutation.ts
@@ -16,39 +16,37 @@ import { GraphQLUnionType } from "graphql"
 
 interface Input {
   id: string
-  // these to be migrated out soon by Jackie
   artsyShippingDomestic: boolean | null
   artsyShippingInternational: boolean | null
-  // ---------------------
 }
 
-const BulkUpdatePartnerArtworksResponseType = new GraphQLObjectType<
+const ArtsyShippingOptInResponseType = new GraphQLObjectType<
   any,
   ResolverContext
 >({
-  name: "BulkUpdatePartnerArtworksResponse",
+  name: "ArtsyShippingOptInResponse",
   fields: () => ({
     count: { type: GraphQLInt },
     ids: { type: GraphQLList(GraphQLString) },
   }),
 })
 
-const BulkUpdatePartnerArtworksMutationSuccessType = new GraphQLObjectType<
+const ArtsyShippingOptInMutationSuccessType = new GraphQLObjectType<
   any,
   ResolverContext
 >({
-  name: "BulkUpdatePartnerArtworksMutationSuccess",
+  name: "ArtsyShippingOptInMutationSuccess",
   fields: () => ({
-    updatedPartnerArtworks: { type: BulkUpdatePartnerArtworksResponseType },
-    skippedPartnerArtworks: { type: BulkUpdatePartnerArtworksResponseType },
+    updatedPartnerArtworks: { type: ArtsyShippingOptInResponseType },
+    skippedPartnerArtworks: { type: ArtsyShippingOptInResponseType },
   }),
 })
 
-const BulkUpdatePartnerArtworksMutationFailureType = new GraphQLObjectType<
+const ArtsyShippingOptInMutationFailureType = new GraphQLObjectType<
   any,
   ResolverContext
 >({
-  name: "BulkUpdatePartnerArtworksMutationFailure",
+  name: "ArtsyShippingOptInMutationFailure",
   isTypeOf: (data) => {
     return data._type === "GravityMutationError"
   },
@@ -60,26 +58,26 @@ const BulkUpdatePartnerArtworksMutationFailureType = new GraphQLObjectType<
   }),
 })
 
-const BulkUpdatePartnerArtworksMutationType = new GraphQLUnionType({
-  name: "BulkUpdatePartnerArtworksMutationType",
+const ArtsyShippingOptInMutationType = new GraphQLUnionType({
+  name: "ArtsyShippingOptInMutationType",
   types: [
-    BulkUpdatePartnerArtworksMutationSuccessType,
-    BulkUpdatePartnerArtworksMutationFailureType,
+    ArtsyShippingOptInMutationSuccessType,
+    ArtsyShippingOptInMutationFailureType,
   ],
   resolveType: (object) => {
     if (object.mutationError) {
-      return BulkUpdatePartnerArtworksMutationFailureType
+      return ArtsyShippingOptInMutationFailureType
     }
-    return BulkUpdatePartnerArtworksMutationSuccessType
+    return ArtsyShippingOptInMutationSuccessType
   },
 })
 
-export const bulkUpdatePartnerArtworksMutation = mutationWithClientMutationId<
+export const artsyShippingOptInMutation = mutationWithClientMutationId<
   Input,
   any,
   ResolverContext
 >({
-  name: "BulkUpdatePartnerArtworksMutation",
+  name: "ArtsyShippingOptInMutation",
   description: "Update all artworks that belong to the partner",
   inputFields: {
     id: {
@@ -96,8 +94,8 @@ export const bulkUpdatePartnerArtworksMutation = mutationWithClientMutationId<
     },
   },
   outputFields: {
-    bulkUpdatePartnerArtworksOrError: {
-      type: BulkUpdatePartnerArtworksMutationType,
+    ArtsyShippingOptInOrError: {
+      type: ArtsyShippingOptInMutationType,
       resolve: (result) => {
         // In the future it could be helpful to have a list of successfully opted in ids, can add this to gravity at a later date
         return {
@@ -112,19 +110,19 @@ export const bulkUpdatePartnerArtworksMutation = mutationWithClientMutationId<
   },
   mutateAndGetPayload: async (
     { id, artsyShippingDomestic, artsyShippingInternational },
-    { updatePartnerArtworksLoader }
+    { artsyShippingOptInLoader }
   ) => {
     const gravityOptions = {
       artsy_shipping_domestic: artsyShippingDomestic,
       artsy_shipping_international: artsyShippingInternational,
     }
 
-    if (!updatePartnerArtworksLoader) {
+    if (!artsyShippingOptInLoader) {
       throw new Error("You need to be signed in to perform this action")
     }
 
     try {
-      return await updatePartnerArtworksLoader(id, gravityOptions)
+      return await artsyShippingOptInLoader(id, gravityOptions)
     } catch (error) {
       const formattedErr = formatGravityError(error)
       if (formattedErr) {

diff --git a/src/schema/v2/schema.ts b/src/schema/v2/schema.ts
@@ -145,7 +145,7 @@ import { artworksForUser } from "./artworksForUser"
 import { authenticationStatus } from "./authenticationStatus"
 import { BankAccount } from "./bank_account"
 import { bulkUpdateArtworksMetadataMutation } from "./partner/BulkOperation/bulkUpdateArtworksMetadataMutation"
-import { bulkUpdatePartnerArtworksMutation } from "./bulkUpdatePartnerArtworksMutation"
+import { artsyShippingOptInMutation } from "./partner/ArtsyShippingOptIn/artsyShippingOptInMutation"
 import { CollectorProfileForUser } from "./CollectorProfile/collectorProfile"
 import { CollectorProfilesConnection } from "./CollectorProfile/collectorProfiles"
 import { createConsignmentInquiryMutation } from "./consignments/createConsignmentInquiryMutation"
@@ -429,7 +429,7 @@ export default new GraphQLSchema({
       artworksCollectionsBatchUpdate: artworksCollectionsBatchUpdateMutation,
       assignArtworkImportArtist: AssignArtworkImportArtistMutation,
       bulkUpdateArtworksMetadata: bulkUpdateArtworksMetadataMutation,
-      bulkUpdatePartnerArtworks: bulkUpdatePartnerArtworksMutation,
+      artsyShippingOptIn: artsyShippingOptInMutation,
       commerceOptIn: commerceOptInMutation,
       commerceOptInReport: commerceOptInReportMutation,
       createAccountRequest: createAccountRequestMutation,