WIP

src/api/useSearchVenuesOffer/useSearchVenueOffers.native.test.ts

@@ -120,7 +120,10 @@ describe('useSearchVenueOffers', () => {
       const shouldFilterVenueOfferHit = filterVenueOfferHit({
         hit: {
           ...mockedAlgoliaResponse.hits[0],
-          offer: { ...mockedAlgoliaResponse.hits[0].offer, subcategoryId: undefined },
+          offer: {
+            ...mockedAlgoliaResponse.hits[0].offer,
+            subcategoryId: SubcategoryIdEnum.ACHAT_INSTRUMENT,
+          },
         },
         offerId: 102283,
         venueId: 2,

src/api/useSearchVenuesOffer/useSearchVenueOffers.ts

@@ -10,7 +10,7 @@ import { formatFullAddressStartsWithPostalCode } from 'libs/address/useFormatFul
 import { useSearchAnalyticsState } from 'libs/algolia/analytics/SearchAnalyticsWrapper'
 import { FetchOffersResponse, fetchOffers } from 'libs/algolia/fetchAlgolia/fetchOffers'
 import { useTransformOfferHits } from 'libs/algolia/fetchAlgolia/transformOfferHit'
-import { AlgoliaHit, Geoloc } from 'libs/algolia/types'
+import { AlgoliaOffer, Geoloc } from 'libs/algolia/types'
 import { Position, useLocation } from 'libs/location'
 import { LocationMode } from 'libs/location/types'
 import { formatDistance } from 'libs/parsers/formatDistance'
@@ -39,7 +39,7 @@ type OfferVenueType = VenueListItem & {
 }
 
 type FilterVenueOfferType = {
-  hit: AlgoliaHit
+  hit: AlgoliaOffer
   offerId: number
   venueId: number | undefined
 }
@@ -89,9 +89,7 @@ export function getVenueList(hits: Offer[], userLocation: Position) {
 }
 
 export const filterVenueOfferHit = ({ hit, offerId, venueId }: FilterVenueOfferType): boolean =>
-  typeof hit.offer.subcategoryId !== 'undefined' &&
-  hit.objectID !== String(offerId) &&
-  hit.venue.id !== venueId
+  !!hit.offer.subcategoryId && hit.objectID !== String(offerId) && hit.venue.id !== venueId
 
 export const useSearchVenueOffers = ({
   allocineId,

src/features/artist/components/ArtistPlaylist/ArtistPlaylist.tsx

@@ -1,9 +1,9 @@
 import React, { FunctionComponent } from 'react'
 
 import { OfferResponseV2 } from 'api/gen'
-import { HitOfferWithArtistAndEan } from 'features/offer/api/fetchOffersByArtist/fetchOffersByArtist'
 import { OfferPlaylistItem } from 'features/offer/components/OfferPlaylistItem/OfferPlaylistItem'
 import { PlaylistType } from 'features/offer/enums'
+import { AlgoliaOfferWithArtistAndEan } from 'libs/algolia/types'
 import { usePlaylistItemDimensionsFromLayout } from 'libs/contentful/usePlaylistItemDimensionsFromLayout'
 import { getDisplayedPrice } from 'libs/parsers/getDisplayedPrice'
 import { useCategoryIdMapping } from 'libs/subcategories'
@@ -16,10 +16,10 @@ import { PassPlaylist } from 'ui/components/PassPlaylist'
 type ArtistPlaylistProps = {
   offer: OfferResponseV2
   artistName: string
-  items: HitOfferWithArtistAndEan[]
+  items: AlgoliaOfferWithArtistAndEan[]
 }
 
-const keyExtractor = (item: Offer | HitOfferWithArtistAndEan) => item.objectID
+const keyExtractor = (item: Offer | AlgoliaOfferWithArtistAndEan) => item.objectID
 
 export const ArtistPlaylist: FunctionComponent<ArtistPlaylistProps> = ({
   offer,

src/features/artist/components/ArtistTopOffers/ArtistTopOffers.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent } from 'react'
 import { FlatList } from 'react-native'
 import styled from 'styled-components/native'
 
-import { HitOfferWithArtistAndEan } from 'features/offer/api/fetchOffersByArtist/fetchOffersByArtist'
+import { AlgoliaOfferWithArtistAndEan } from 'libs/algolia/types'
 import { Offer } from 'shared/offer/types'
 import { theme } from 'theme'
 import { Separator } from 'ui/components/Separator'
@@ -11,16 +11,16 @@ import { Spacer, TypoDS, getSpacing } from 'ui/theme'
 
 type Props = {
   artistName: string
-  items: HitOfferWithArtistAndEan[]
+  items: AlgoliaOfferWithArtistAndEan[]
 }
 
-const keyExtractor = (item: Offer | HitOfferWithArtistAndEan) => item.objectID
+const keyExtractor = (item: Offer | AlgoliaOfferWithArtistAndEan) => item.objectID
 
 const renderItem = ({
   item,
   artistName,
 }: {
-  item: HitOfferWithArtistAndEan
+  item: AlgoliaOfferWithArtistAndEan
   artistName: string
 }) => {
   const subtitles = item.offer.bookFormat ? [item.offer.bookFormat] : undefined

src/features/gtlPlaylist/types.ts

@@ -1,5 +1,5 @@
 import { OffersModuleParameters } from 'features/home/types'
-import { AlgoliaHit } from 'libs/algolia/types'
+import { AlgoliaOffer } from 'libs/algolia/types'
 import { Layout, DisplayParametersFields } from 'libs/contentful/types'
 
 export type GtlPlaylistRequest = {
@@ -10,7 +10,7 @@ export type GtlPlaylistRequest = {
 
 export type GtlPlaylistData = {
   title: string
-  offers: { hits: AlgoliaHit[] }
+  offers: { hits: AlgoliaOffer[] }
   layout: Layout
   minNumberOfOffers: number
   entryId: string

src/features/home/api/helpers/mapOffersDataAndModules.ts

@@ -4,7 +4,7 @@ import { UseQueryResult } from 'react-query'
 
 import { ModuleData, OfferModuleParamsInfo } from 'features/home/types'
 import { filterOfferHit } from 'libs/algolia/fetchAlgolia/transformOfferHit'
-import { AlgoliaHit } from 'libs/algolia/types'
+import { AlgoliaOffer } from 'libs/algolia/types'
 import { Offer } from 'shared/offer/types'
 
 const isOfferModuleParamsInfo = (module: unknown): module is OfferModuleParamsInfo =>
@@ -15,7 +15,7 @@ const hasParams = (module: OfferModuleParamsInfo) => module.adaptedPlaylistParam
 interface MapProps {
   results: UseQueryResult<SearchResponse<Offer>[], unknown>
   modulesParams: (OfferModuleParamsInfo | undefined)[]
-  transformHits: (hit: AlgoliaHit) => AlgoliaHit
+  transformHits: (hit: AlgoliaOffer) => AlgoliaOffer
 }
 
 export const mapOffersDataAndModules = ({ results, modulesParams, transformHits }: MapProps) => {

src/features/home/api/useAlgoliaRecommendedOffers.ts

@@ -4,7 +4,7 @@ import { useQuery } from 'react-query'
 import { useIsUserUnderage } from 'features/profile/helpers/useIsUserUnderage'
 import { fetchOffersByIds } from 'libs/algolia/fetchAlgolia/fetchOffersByIds'
 import { filterOfferHit, useTransformOfferHits } from 'libs/algolia/fetchAlgolia/transformOfferHit'
-import { IncompleteSearchHit } from 'libs/algolia/types'
+import { AlgoliaOffer } from 'libs/algolia/types'
 import { QueryKeys } from 'libs/queryKeys'
 import { getSimilarOrRecoOffersInOrder } from 'shared/offer/getSimilarOrRecoOffersInOrder'
 import { Offer } from 'shared/offer/types'
@@ -29,9 +29,9 @@ export const useAlgoliaRecommendedOffers = (
 
     if (shouldPreserveIdsOrder) {
       const offers = getSimilarOrRecoOffersInOrder(ids, hits)
-      return (offers as IncompleteSearchHit[]).filter(filterOfferHit).map(transformHits) as Offer[]
+      return (offers as AlgoliaOffer[]).filter(filterOfferHit).map(transformHits) as Offer[]
     }
 
-    return (hits as IncompleteSearchHit[]).filter(filterOfferHit).map(transformHits) as Offer[]
+    return (hits as AlgoliaOffer[]).filter(filterOfferHit).map(transformHits) as Offer[]
   }, [hits, shouldPreserveIdsOrder, ids, transformHits])
 }

src/features/home/api/useHighlightOffer.ts

@@ -5,11 +5,12 @@ import { fetchOffersByEan } from 'libs/algolia/fetchAlgolia/fetchOffersByEan'
 import { fetchOffersByIds } from 'libs/algolia/fetchAlgolia/fetchOffersByIds'
 import { fetchOffersByTags } from 'libs/algolia/fetchAlgolia/fetchOffersByTags'
 import { useTransformOfferHits } from 'libs/algolia/fetchAlgolia/transformOfferHit'
+import { AlgoliaGeoloc } from 'libs/algolia/types'
 import { useLocation } from 'libs/location'
 import { Position } from 'libs/location/types'
 import { computeDistanceInMeters } from 'libs/parsers/formatDistance'
 import { QueryKeys } from 'libs/queryKeys'
-import { Offer, OfferLocation } from 'shared/offer/types'
+import { Offer } from 'shared/offer/types'
 
 type UseHightlightOfferParams = {
   id: string
@@ -104,7 +105,7 @@ export const useHighlightOffer = ({
 
 const shouldDisplayHighlightOffer = (
   position: Position,
-  offerLocation?: OfferLocation,
+  offerLocation?: AlgoliaGeoloc,
   isGeolocated?: boolean,
   aroundRadius?: number
 ) => {

src/features/home/api/useVideoCarouselData.ts

@@ -9,7 +9,7 @@ import { fetchCarouselVideoOffers } from 'libs/algolia/fetchAlgolia/fetchCarouse
 import { buildVideoCarouselOffersQueries } from 'libs/algolia/fetchAlgolia/fetchMultipleOffers/helpers/buildVideoCarouselOffersQueries'
 import { searchResponsePredicate } from 'libs/algolia/fetchAlgolia/searchResponsePredicate'
 import { filterOfferHit, useTransformOfferHits } from 'libs/algolia/fetchAlgolia/transformOfferHit'
-import { AlgoliaHit, OfferModuleQuery } from 'libs/algolia/types'
+import { AlgoliaOffer, OfferModuleQuery } from 'libs/algolia/types'
 import { useLocation } from 'libs/location'
 import { QueryKeys } from 'libs/queryKeys'
 import { Offer } from 'shared/offer/types'
@@ -31,7 +31,7 @@ const getRedirectionMode = (item: VideoCarouselItem): RedirectionMode => {
 
 const mapDataAndItem = (
   offersResultList: UseQueryResult<SearchResponse<Offer>[], unknown>,
-  transformOfferHits: (hit: AlgoliaHit) => AlgoliaHit
+  transformOfferHits: (hit: AlgoliaOffer) => AlgoliaOffer
 ) => {
   const { data } = offersResultList
 

src/features/home/api/useVideoOffers.native.test.ts

@@ -70,7 +70,7 @@ describe('useVideoOffers', () => {
   })
 
   it('should return offers when only OffersModuleParameters are provided', async () => {
-    mockFetchMultipleOffers.mockResolvedValueOnce({ hits: mockOffers, nbHits: 6 })
+    mockFetchMultipleOffers.mockResolvedValueOnce([{ hits: mockOffers, nbHits: 6 }])
 
     const { result } = renderHook(
       () => useVideoOffers([{}] as OffersModuleParameters[], 'moduleId', undefined, undefined),

src/features/home/api/useVideoOffers.ts

@@ -74,7 +74,7 @@ export const useVideoOffers = (
       isUserUnderage,
     })
 
-    return result.hits
+    return result.flatMap((data) => data.hits)
   }
   const queryByQueryMode = {
     [QueryMode.OFFER_IDS]: offersByIdsQuery,

src/features/offer/api/fetchOffersByArtist/fetchOffersByArtist.test.ts

@@ -2,12 +2,12 @@ import { SearchResponse } from '@algolia/client-search'
 
 import { SearchGroupNameEnumv2 } from 'api/gen'
 import {
-  HitOfferWithArtistAndEan,
   buildAlgoliaFilter,
   fetchOffersByArtist,
 } from 'features/offer/api/fetchOffersByArtist/fetchOffersByArtist'
 import { offerAttributesToRetrieve } from 'libs/algolia/fetchAlgolia/buildAlgoliaParameters/offerAttributesToRetrieve'
 import * as multipleQueries from 'libs/algolia/fetchAlgolia/multipleQueries'
+import { AlgoliaOfferWithArtistAndEan } from 'libs/algolia/types'
 import { Position } from 'libs/location'
 
 const mockMultipleQueries = jest.spyOn(multipleQueries, 'multipleQueries')
@@ -19,10 +19,10 @@ describe('fetchOffersByArtist', () => {
     mockMultipleQueries.mockResolvedValueOnce([
       {
         hits: [],
-      } as unknown as SearchResponse<HitOfferWithArtistAndEan>,
+      } as unknown as SearchResponse<AlgoliaOfferWithArtistAndEan>,
       {
         hits: [],
-      } as unknown as SearchResponse<HitOfferWithArtistAndEan>,
+      } as unknown as SearchResponse<AlgoliaOfferWithArtistAndEan>,
     ])
     await fetchOffersByArtist({
       artists: 'Eiichiro Oda',

src/features/offer/api/fetchOffersByArtist/fetchOffersByArtist.ts

@@ -5,9 +5,9 @@ import { EXCLUDED_ARTISTS } from 'features/offer/helpers/constants'
 import { captureAlgoliaError } from 'libs/algolia/fetchAlgolia/AlgoliaError'
 import { offerAttributesToRetrieve } from 'libs/algolia/fetchAlgolia/buildAlgoliaParameters/offerAttributesToRetrieve'
 import { multipleQueries } from 'libs/algolia/fetchAlgolia/multipleQueries'
+import { AlgoliaOfferWithArtistAndEan } from 'libs/algolia/types'
 import { env } from 'libs/environment/env'
 import { Position } from 'libs/location'
-import { HitOffer, Offer } from 'shared/offer/types'
 
 type BuildAlgoliaFilterType = {
   artists?: string | null
@@ -18,13 +18,6 @@ export type FetchOfferByArtist = BuildAlgoliaFilterType & {
   userLocation: Position
 }
 
-export type HitOfferWithArtistAndEan = Offer & {
-  offer: HitOffer & {
-    artist: string
-    ean: string
-  }
-}
-
 export const fetchOffersByArtist = async ({
   artists,
   searchGroupName,
@@ -75,9 +68,11 @@ export const fetchOffersByArtist = async ({
     return { playlistHits: [], topOffersHits: [] }
 
   try {
-    const [playlistResponse, topOffersResponse] = (await multipleQueries<HitOfferWithArtistAndEan>(
-      queries
-    )) as [SearchResponse<HitOfferWithArtistAndEan>, SearchResponse<HitOfferWithArtistAndEan>]
+    const [playlistResponse, topOffersResponse] =
+      (await multipleQueries<AlgoliaOfferWithArtistAndEan>(queries)) as [
+        SearchResponse<AlgoliaOfferWithArtistAndEan>,
+        SearchResponse<AlgoliaOfferWithArtistAndEan>,
+      ]
 
     return { playlistHits: playlistResponse.hits, topOffersHits: topOffersResponse.hits }
   } catch (error) {

src/features/offer/api/useAlgoliaSimilarOffers.ts

@@ -4,7 +4,7 @@ import { useQuery } from 'react-query'
 import { useIsUserUnderage } from 'features/profile/helpers/useIsUserUnderage'
 import { fetchOffersByIds } from 'libs/algolia/fetchAlgolia/fetchOffersByIds'
 import { filterOfferHit, useTransformOfferHits } from 'libs/algolia/fetchAlgolia/transformOfferHit'
-import { IncompleteSearchHit } from 'libs/algolia/types'
+import { AlgoliaOffer } from 'libs/algolia/types'
 import { QueryKeys } from 'libs/queryKeys'
 import { getSimilarOrRecoOffersInOrder } from 'shared/offer/getSimilarOrRecoOffersInOrder'
 import { Offer } from 'shared/offer/types'
@@ -27,9 +27,9 @@ export const useAlgoliaSimilarOffers = (
 
     if (shouldPreserveIdsOrder) {
       const offers = getSimilarOrRecoOffersInOrder(ids, hits)
-      return (offers as IncompleteSearchHit[]).filter(filterOfferHit).map(transformHits) as Offer[]
+      return (offers as AlgoliaOffer[]).filter(filterOfferHit).map(transformHits) as Offer[]
     }
 
-    return (hits as IncompleteSearchHit[]).filter(filterOfferHit).map(transformHits) as Offer[]
+    return (hits as AlgoliaOffer[]).filter(filterOfferHit).map(transformHits) as Offer[]
   }, [hits, ids, shouldPreserveIdsOrder, transformHits])
 }

src/features/offer/components/OfferPlaylist/OfferPlaylist.tsx

@@ -2,13 +2,13 @@ import React from 'react'
 import { View } from 'react-native'
 import styled from 'styled-components/native'
 
-import { HitOfferWithArtistAndEan } from 'features/offer/api/fetchOffersByArtist/fetchOffersByArtist'
 import { PlaylistType } from 'features/offer/enums'
+import { AlgoliaOfferWithArtistAndEan } from 'libs/algolia/types'
 import { Offer } from 'shared/offer/types'
 import { PassPlaylist } from 'ui/components/PassPlaylist'
 
 interface OfferPlaylistProps {
-  items: Offer[] | HitOfferWithArtistAndEan[]
+  items: Offer[] | AlgoliaOfferWithArtistAndEan[]
   renderItem: (props: {
     item: Offer
     width: number
@@ -22,7 +22,7 @@ interface OfferPlaylistProps {
   onEndReached?: () => void
 }
 
-const keyExtractor = (item: Offer | HitOfferWithArtistAndEan) => item.objectID
+const keyExtractor = (item: Offer | AlgoliaOfferWithArtistAndEan) => item.objectID
 
 export function OfferPlaylist({
   items,

src/features/offer/helpers/useArtistResults/useArtistResults.tsx

@@ -3,11 +3,9 @@ import { useCallback, useMemo } from 'react'
 import { useQuery } from 'react-query'
 
 import { SearchGroupNameEnumv2 } from 'api/gen'
-import {
-  HitOfferWithArtistAndEan,
-  fetchOffersByArtist,
-} from 'features/offer/api/fetchOffersByArtist/fetchOffersByArtist'
+import { fetchOffersByArtist } from 'features/offer/api/fetchOffersByArtist/fetchOffersByArtist'
 import { useTransformOfferHits } from 'libs/algolia/fetchAlgolia/transformOfferHit'
+import { AlgoliaOfferWithArtistAndEan } from 'libs/algolia/types'
 import { useLocation } from 'libs/location'
 import { formatDistance } from 'libs/parsers/formatDistance'
 import { QueryKeys } from 'libs/queryKeys'
@@ -37,7 +35,7 @@ export const useArtistResults = ({ artists, searchGroupName }: UseArtistResultsP
   )
 
   const getSortedHits = useCallback(
-    (hits: Hit<HitOfferWithArtistAndEan>[]) => {
+    (hits: Hit<AlgoliaOfferWithArtistAndEan>[]) => {
       if (hits.length === 0) return []
 
       const transformedHitsWithDistance = hits.map((hit) => {
@@ -54,7 +52,7 @@ export const useArtistResults = ({ artists, searchGroupName }: UseArtistResultsP
 
       return sortedHits.map(
         ({ distance: _distance, ...rest }) => rest
-      ) as HitOfferWithArtistAndEan[]
+      ) as AlgoliaOfferWithArtistAndEan[]
     },
     [transformHits, userLocation]
   )

src/features/offer/types.ts

@@ -10,14 +10,14 @@ import {
 import { ChronicleCardData } from 'features/chronicle/type'
 import { Referrals } from 'features/navigation/RootNavigator/types'
 import { PlaylistType } from 'features/offer/enums'
+import { AlgoliaGeoloc } from 'libs/algolia/types'
 import { Subcategory } from 'libs/subcategories/types'
-import { OfferLocation } from 'shared/offer/types'
 
 export interface OfferTileProps {
   categoryId: CategoryIdEnum | null | undefined
   categoryLabel: string | null
   subcategoryId: SubcategoryIdEnum
-  offerLocation: OfferLocation
+  offerLocation: AlgoliaGeoloc
   date?: string
   name?: string
   isDuo?: boolean

src/features/search/pages/ThematicSearch/types.ts

@@ -1,6 +1,6 @@
-import { AlgoliaHit } from 'libs/algolia/types'
+import { AlgoliaOffer } from 'libs/algolia/types'
 
 export type ThematicSearchPlaylistData = {
   title: string
-  offers: { hits: AlgoliaHit[] }
+  offers: { hits: AlgoliaOffer[] }
 }