fix(Prompts): use location#display and userInterestsConnection for pr…

…ompt checks (#10681) fix: use location#display and userInterestsConnection for prompt checks
artsy · Aug 29, 2024 · 58c5fc8 · 58c5fc8
1 parent 1bc5f47
commit 58c5fc8
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 150 deletions.
diff --git a/src/app/Scenes/Activity/components/CollectorUpdateNotification.tsx b/src/app/Scenes/Activity/components/CollectorUpdateNotification.tsx
@@ -24,7 +24,7 @@ export const CollectorUpdateNotification: FC<CollectorUpdateNotificationProps> =
   }
 
   const hasEmptyCollection =
-    item.me.myCollectionInfo.artworksCount === 0 && item.me.myCollectionInfo.artistsCount === 0
+    item.me.myCollectionInfo.artworksCount === 0 && !item.me.userInterestsConnection?.totalCount
   const itemInfo = hasEmptyCollection ? addArtistsToCollectiontInfo : collectorProfileInfo
 
   return (
@@ -71,17 +71,12 @@ const ITEM_FRAGMENT = graphql`
     me @required(action: NONE) {
       ...MyProfileEditModal_me
 
-      profession
-      location {
-        city
-      }
       myCollectionInfo @required(action: NONE) {
-        artistsCount
         artworksCount
       }
-    }
-    collectorProfile @required(action: NONE) {
-      lastUpdatePromptAt
+      userInterestsConnection(first: 1, interestType: ARTIST) {
+        totalCount
+      }
     }
   }
 `

diff --git a/src/app/Scenes/Activity/components/__tests__/CollectorUpdateNotification.tests.tsx b/src/app/Scenes/Activity/components/__tests__/CollectorUpdateNotification.tests.tsx
@@ -43,7 +43,8 @@ describe("CollectorUpdateNotification", () => {
   it("renders collector profile information", async () => {
     renderWithRelay({
       Me: () => ({
-        profession: null,
+        profession: "Blacksmith",
+        location: { display: "" },
       }),
       CollectorProfileType: () => ({
         lastUpdatePromptAt: "2021-09-01T00:00:00Z",
@@ -57,10 +58,8 @@ describe("CollectorUpdateNotification", () => {
     renderWithRelay({
       Me: () => ({
         profession: null,
-        myCollectionInfo: {
-          artistsCount: 0,
-          artworksCount: 0,
-        },
+        myCollectionInfo: { artworksCount: 0 },
+        userInterestsConnection: { totalCount: 0 },
       }),
       CollectorProfileType: () => ({
         lastUpdatePromptAt: "2021-09-01T00:00:00Z",

diff --git a/src/app/Scenes/Artwork/hooks/__tests__/useSendInquiry.tests.tsx b/src/app/Scenes/Artwork/hooks/__tests__/useSendInquiry.tests.tsx
@@ -51,7 +51,7 @@ describe("useSendInquiry", () => {
       action_name: "inquirySend",
       owner_type: "Artwork",
       owner_id: '<mock-value-for-field-"internalID">',
-      owner_slug: '<mock-value-for-field-"city">',
+      owner_slug: '<mock-value-for-field-"slug">',
     })
     expect(mockTrackEvent).toHaveBeenNthCalledWith(2, {
       action_type: "success",
@@ -94,7 +94,7 @@ describe("useSendInquiry", () => {
       action_name: "inquirySend",
       owner_type: "Artwork",
       owner_id: '<mock-value-for-field-"internalID">',
-      owner_slug: '<mock-value-for-field-"city">',
+      owner_slug: '<mock-value-for-field-"slug">',
     })
     expect(mockTrackEvent).toHaveBeenNthCalledWith(2, {
       action_type: "fail",
@@ -114,7 +114,7 @@ describe("useSendInquiry", () => {
       const loader = await loaderHook({
         Me: () => ({
           lastUpdatePromptAt: null,
-          location: { city: null },
+          location: { display: null },
           collectorProfile: { lastUpdatePromptAt: null },
           myCollectionInfo: { artistsCount: 1, artworksCount: 1 },
         }),
@@ -144,7 +144,8 @@ describe("useSendInquiry", () => {
       const loader = await loaderHook({
         Me: () => ({
           collectorProfile: { lastUpdatePromptAt: null },
-          myCollectionInfo: { artistsCount: 0, artworksCount: 0 },
+          myCollectionInfo: { artworksCount: 0 },
+          userInterestsConnection: { totalCount: 0 },
         }),
       })
 
@@ -172,7 +173,7 @@ describe("useSendInquiry", () => {
       const loader = await loaderHook({
         Me: () => ({
           lastUpdatePromptAt: null,
-          location: { city: null },
+          location: { display: null },
           collectorProfile: { lastUpdatePromptAt: null },
           myCollectionInfo: { artistsCount: 0, artworksCount: 0 },
         }),

diff --git a/src/app/Scenes/Artwork/hooks/useSendInquiry.ts b/src/app/Scenes/Artwork/hooks/useSendInquiry.ts
@@ -48,9 +48,7 @@ export const useSendInquiry = ({
 
     setIsLoading(true)
 
-    tracking.trackEvent(
-      tracks.attemptedToSendTheInquiry(artwork?.internalID, me.location?.city ?? undefined)
-    )
+    tracking.trackEvent(tracks.attemptedToSendTheInquiry(artwork?.internalID, artwork?.slug))
 
     commit({
       variables: {
@@ -91,8 +89,9 @@ export const useSendInquiry = ({
         tracking.trackEvent(tracks.successfullySentTheInquiry(artwork.internalID, artwork.slug))
 
         const lastUpdatePromptAt = collectorProfile.lastUpdatePromptAt
-        const city = me.location?.city
+        const locationDisplay = me.location?.display
         const profession = me.profession
+        const artworksCount = me.myCollectionInfo.artworksCount
 
         if (!profilePromptIsEnabled) {
           setTimeout(() => {
@@ -101,15 +100,18 @@ export const useSendInquiry = ({
           return
         }
 
-        if (userShouldBePromptedToCompleteProfile({ city, profession, lastUpdatePromptAt })) {
+        if (
+          userShouldBePromptedToCompleteProfile({ locationDisplay, profession, lastUpdatePromptAt })
+        ) {
           dispatch({ type: "setProfilePromptVisible", payload: true })
           return
         }
 
         if (
           userShouldBePromptedToAddArtistsToCollection({
             lastUpdatePromptAt,
-            ...me.myCollectionInfo,
+            artworksCount,
+            artistsCount: me.userInterestsConnection?.totalCount,
           })
         ) {
           dispatch({ type: "setCollectionPromptVisible", payload: true })
@@ -142,16 +144,18 @@ const FRAGMENT_COLLECTOR_PROFILE = graphql`
 const FRAGMENT_ME = graphql`
   fragment useSendInquiry_me on Me {
     location {
-      city
+      display
     }
     profession
     collectorProfile @required(action: NONE) {
       ...useSendInquiry_collectorProfile
     }
     myCollectionInfo @required(action: NONE) {
-      artistsCount
       artworksCount
     }
+    userInterestsConnection(first: 1, interestType: ARTIST) {
+      totalCount
+    }
   }
 `
 

diff --git a/src/app/utils/collectorPromptHelpers.tests.ts b/src/app/utils/collectorPromptHelpers.tests.ts
@@ -8,29 +8,29 @@ const MOCK_DATE = new Date("2024-08-20T00:00:00Z")
 global.Date.now = jest.fn(() => MOCK_DATE.getTime())
 
 describe("userShouldBePromptedToCompleteProfile", () => {
-  it("should prompt the user when city and profession are missing and cooldown period has passed", () => {
+  it("should prompt the user when location and profession are missing and cooldown period has passed", () => {
     const result = userShouldBePromptedToCompleteProfile({
-      city: undefined,
+      locationDisplay: "",
       profession: undefined,
       lastUpdatePromptAt: "2024-07-01T00:00:00Z",
     })
 
     expect(result).toBe(true)
   })
 
-  it("should not prompt the user when city and profession are missing but cooldown period has not passed", () => {
+  it("should not prompt the user when location and profession are missing but cooldown period has not passed", () => {
     const result = userShouldBePromptedToCompleteProfile({
-      city: undefined,
+      locationDisplay: undefined,
       profession: undefined,
       lastUpdatePromptAt: "2024-08-15T00:00:00Z",
     })
 
     expect(result).toBe(false)
   })
 
-  it("should not prompt the user when city and profession are provided even if cooldown period has passed", () => {
+  it("should not prompt the user when location and profession are provided even if cooldown period has passed", () => {
     const result = userShouldBePromptedToCompleteProfile({
-      city: "New York",
+      locationDisplay: "New York",
       profession: "Artist",
       lastUpdatePromptAt: "2024-07-01T00:00:00Z",
     })
@@ -40,7 +40,7 @@ describe("userShouldBePromptedToCompleteProfile", () => {
 
   it("should prompt the user when profession is missing and cooldown period has passed", () => {
     const result = userShouldBePromptedToCompleteProfile({
-      city: "New York",
+      locationDisplay: "New York",
       profession: undefined,
       lastUpdatePromptAt: "2024-07-01T00:00:00Z",
     })
@@ -50,7 +50,7 @@ describe("userShouldBePromptedToCompleteProfile", () => {
 
   it("should return true when there is no lastUpdatePromptAt date and profile is incomplete", () => {
     const result = userShouldBePromptedToCompleteProfile({
-      city: undefined,
+      locationDisplay: undefined,
       profession: undefined,
       lastUpdatePromptAt: undefined,
     })
@@ -104,7 +104,7 @@ describe("userShouldBePromptedToAddArtistsToCollection", () => {
 describe("userHasNotBeenPromptedWithinCooldownPeriod", () => {
   it("should return true when lastUpdatePromptAt is undefined", () => {
     const result = userShouldBePromptedToCompleteProfile({
-      city: undefined,
+      locationDisplay: undefined,
       profession: undefined,
       lastUpdatePromptAt: undefined,
     })
@@ -114,7 +114,7 @@ describe("userHasNotBeenPromptedWithinCooldownPeriod", () => {
 
   it("should return true when the cooldown period has passed", () => {
     const result = userShouldBePromptedToCompleteProfile({
-      city: undefined,
+      locationDisplay: undefined,
       profession: undefined,
       lastUpdatePromptAt: "2024-07-01T00:00:00Z",
     })
@@ -124,7 +124,7 @@ describe("userHasNotBeenPromptedWithinCooldownPeriod", () => {
 
   it("should return false when the cooldown period has not passed", () => {
     const result = userShouldBePromptedToCompleteProfile({
-      city: undefined,
+      locationDisplay: undefined,
       profession: undefined,
       lastUpdatePromptAt: "2024-08-15T00:00:00Z",
     })

diff --git a/src/app/utils/collectorPromptHelpers.ts b/src/app/utils/collectorPromptHelpers.ts
@@ -5,17 +5,17 @@ type InquiryModalMe = NonNullable<useSendInquiry_me$data>
 type InquiryModalCollectorProfile = NonNullable<useSendInquiry_collectorProfile$data>
 
 interface userShouldBePromptedToCompleteProfileParams {
-  city?: NonNullable<InquiryModalMe["location"]>["city"]
+  locationDisplay?: NonNullable<InquiryModalMe["location"]>["display"]
   lastUpdatePromptAt: InquiryModalCollectorProfile["lastUpdatePromptAt"]
   profession?: InquiryModalMe["profession"]
 }
 
 export const userShouldBePromptedToCompleteProfile = ({
-  city,
+  locationDisplay,
   lastUpdatePromptAt,
   profession,
 }: userShouldBePromptedToCompleteProfileParams) => {
-  const userHasAnIncompleteProfile = !profession || !city
+  const userHasAnIncompleteProfile = !profession || !locationDisplay
 
   return (
     userHasAnIncompleteProfile && userHasNotBeenPromptedWithinCooldownPeriod(lastUpdatePromptAt)
@@ -25,7 +25,7 @@ export const userShouldBePromptedToCompleteProfile = ({
 interface userShouldBePromptedToAddArtistsToCollectionParams {
   lastUpdatePromptAt: InquiryModalCollectorProfile["lastUpdatePromptAt"]
   artworksCount: InquiryModalMe["myCollectionInfo"]["artworksCount"]
-  artistsCount: InquiryModalMe["myCollectionInfo"]["artistsCount"]
+  artistsCount: NonNullable<InquiryModalMe["userInterestsConnection"]>["totalCount"]
 }
 
 export const userShouldBePromptedToAddArtistsToCollection = ({

diff --git a/src/app/utils/tests/collectorPromptHelpers.tests.ts b/src/app/utils/tests/collectorPromptHelpers.tests.ts