fix: Remove Favorites FF

.env.spec

@@ -11,5 +11,3 @@ COLLECTIONS_CHAIN_ID=137
 API_VERSION=v1
 HTTP_SERVER_PORT=5005
 HTTP_SERVER_HOST=0.0.0.0
-
-FF_FAVORITES=1 # TODO (lists): remove after the release of the feature

src/adapters/sources/items.ts

@@ -5,15 +5,10 @@ import { IFavoritesComponent } from '../../ports/favorites/types'
 import { enhanceItemsWithPicksStats } from '../../logic/favorites/utils'
 import { convertItemToSortableResult } from '../../logic/items/utils'
 
-export function createItemsSource(
-  components: {
-    itemsComponent: IItemsComponent
-    favoritesComponent: IFavoritesComponent
-  },
-  options?: {
-    isFavoritesEnabled?: boolean
-  }
-): IMergerComponent.Source<Item, ItemFilters, ItemSortBy> {
+export function createItemsSource(components: {
+  itemsComponent: IItemsComponent
+  favoritesComponent: IFavoritesComponent
+}): IMergerComponent.Source<Item, ItemFilters, ItemSortBy> {
   const { itemsComponent, favoritesComponent } = components
 
   async function fetch({
@@ -22,14 +17,12 @@ export function createItemsSource(
   }: FetchOptions<ItemOptions, ItemSortBy>) {
     let items = await itemsComponent.fetch(filters)
 
-    if (options && options.isFavoritesEnabled) {
-      const picksStats = await favoritesComponent.getPicksStatsOfItems(
-        items.map(({ id }) => id),
-        pickedBy
-      )
+    const picksStats = await favoritesComponent.getPicksStatsOfItems(
+      items.map(({ id }) => id),
+      pickedBy
+    )
 
-      items = enhanceItemsWithPicksStats(items, picksStats)
-    }
+    items = enhanceItemsWithPicksStats(items, picksStats)
 
     return items.map(convertItemToSortableResult)
   }

src/index.ts

@@ -199,9 +199,6 @@ async function initComponents(): Promise<AppComponents> {
     methods: await config.getString('CORS_METHOD'),
   }
 
-  // FF_FAVORITES
-  const isFavoritesEnabled = (await config.getNumber('FF_FAVORITES')) === 1
-
   const logs = await createLogComponent({ tracer })
 
   const server = await createServerComponent<GlobalContext>(
@@ -451,12 +448,10 @@ async function initComponents(): Promise<AppComponents> {
 
   const items = createMergerComponent<Item, ItemOptions, ItemSortBy>({
     sources: [
-      createItemsSource(
-        { itemsComponent: collectionsItems, favoritesComponent },
-        {
-          isFavoritesEnabled,
-        }
-      ),
+      createItemsSource({
+        itemsComponent: collectionsItems,
+        favoritesComponent,
+      }),
     ],
     defaultSortBy: ITEM_DEFAULT_SORT_BY,
     directions: {
@@ -520,16 +515,11 @@ async function initComponents(): Promise<AppComponents> {
   })
 
   // trendings
-  const trendings = createTrendingsComponent(
-    {
-      collectionsSubgraphComponent: collectionsSubgraph,
-      itemsComponent: items,
-      favoritesComponent,
-    },
-    {
-      isFavoritesEnabled,
-    }
-  )
+  const trendings = createTrendingsComponent({
+    collectionsSubgraphComponent: collectionsSubgraph,
+    itemsComponent: items,
+    favoritesComponent,
+  })
 
   // analytics day data for the marketplace subgraph
   const marketplaceAnalyticsDayData =
@@ -709,7 +699,6 @@ async function initComponents(): Promise<AppComponents> {
 
   const catalog = await createCatalogComponent({
     favoritesComponent,
-    isFavoritesEnabled,
     database: satsumaDatabase,
   })
 

src/ports/catalog/component.ts

@@ -22,9 +22,8 @@ import { getItemIdsBySearchTextQuery, getLatestSubgraphSchema } from './queries'
 export function createCatalogComponent(options: {
   database: IPgComponent
   favoritesComponent: IFavoritesComponent
-  isFavoritesEnabled: boolean
 }): ICatalogComponent {
-  const { database, favoritesComponent, isFavoritesEnabled } = options
+  const { database, favoritesComponent } = options
 
   async function fetch(filters: CatalogOptions) {
     const { network, creator } = filters
@@ -86,14 +85,12 @@ export function createCatalogComponent(options: {
       )
       total = results.rows[0]?.total ?? results.rows[0]?.total_rows ?? 0
 
-      if (isFavoritesEnabled) {
-        const picksStats = await favoritesComponent.getPicksStatsOfItems(
-          catalogItems.map(({ id }) => id),
-          filters.pickedBy
-        )
+      const picksStats = await favoritesComponent.getPicksStatsOfItems(
+        catalogItems.map(({ id }) => id),
+        filters.pickedBy
+      )
 
-        catalogItems = enhanceItemsWithPicksStats(catalogItems, picksStats)
-      }
+      catalogItems = enhanceItemsWithPicksStats(catalogItems, picksStats)
     } catch (e) {
       console.error(e)
       throw new HttpError(

src/tests/adapters/sources/item-source.spec.ts

@@ -12,9 +12,6 @@ let components: {
   favoritesComponent: IFavoritesComponent
 }
 let itemSource: IMergerComponent.Source<Item, ItemOptions, ItemSortBy>
-let options: {
-  isFavoritesEnabled?: boolean
-}
 let fetchMock: jest.Mock
 let countMock: jest.Mock
 let getPicksStatsOfItemsMock: jest.Mock
@@ -38,12 +35,37 @@ beforeEach(() => {
     favoritesComponent: favoritesComponentMock,
   }
 
-  itemSource = createItemsSource(components, options)
+  itemSource = createItemsSource(components)
 })
 
 describe('when fetching items', () => {
   let items: Item[]
   let result: Sortable<Item, ItemSortBy>[]
+  let picksStats: PickStats[]
+  let pickedBy: string
+
+  beforeEach(() => {
+    itemSource = createItemsSource(components)
+
+    items = Array.from(
+      { length: 2 },
+      (_, i) =>
+        ({
+          id: `0x0-${i.toString()}`,
+          name: `item-name-${i}`,
+          contractAddress: '0x0',
+          itemId: i.toString(),
+        } as Item)
+    )
+    picksStats = items.map(
+      (item, i) =>
+        ({
+          itemId: item.id,
+          pickedByUser: i > 0,
+          count: i,
+        } as PickStats)
+    )
+  })
 
   describe('and fetching the items fails', () => {
     beforeEach(() => {
@@ -57,64 +79,8 @@ describe('when fetching items', () => {
     })
   })
 
-  describe('and the favorites feature is disabled', () => {
-    beforeEach(async () => {
-      options = {
-        isFavoritesEnabled: false,
-      }
-      itemSource = createItemsSource(components, options)
-
-      items = Array.from(
-        { length: 2 },
-        (_, i) =>
-          ({
-            id: `0x0-${i.toString()}`,
-            name: `item-name-${i}`,
-            contractAddress: '0x0',
-            itemId: i.toString(),
-          } as Item)
-      )
-      fetchMock.mockResolvedValueOnce(items)
-      result = await itemSource.fetch({})
-    })
-
-    it('should resolve to a list of items without enhancing them with their picks stats', () => {
-      expect(result).toEqual(items.map(convertItemToSortableResult))
-    })
-
-    it('should not have queried the picks stats', () => {
-      expect(getPicksStatsOfItemsMock).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('and the favorites feature is enabled', () => {
-    let picksStats: PickStats[]
-    let pickedBy: string
-
-    beforeEach(async () => {
-      options = {
-        isFavoritesEnabled: true,
-      }
-      itemSource = createItemsSource(components, options)
-
-      items = Array.from(
-        { length: 2 },
-        (_, i) =>
-          ({
-            id: `0x0-${i.toString()}`,
-            name: `item-name-${i}`,
-            contractAddress: '0x0',
-            itemId: i.toString(),
-          } as Item)
-      )
-      picksStats = items.map(
-        (item, i) =>
-          ({
-            itemId: item.id,
-            pickedByUser: i > 0,
-            count: i,
-          } as PickStats)
-      )
+  describe('and fetching the items does not fail', () => {
+    beforeEach(() => {
       fetchMock.mockResolvedValueOnce(items)
     })
 
@@ -190,20 +156,9 @@ describe('when fetching items', () => {
 })
 
 describe('when counting items', () => {
-  describe('and the favorites feature is disabled', () => {
-    beforeEach(() => {
-      itemSource = createItemsSource(components, { isFavoritesEnabled: false })
-      countMock.mockResolvedValueOnce(15)
-    })
-
-    it('should resolve to the number of items', () => {
-      return expect(itemSource.count({})).resolves.toBe(15)
-    })
-  })
-
-  describe('and the favorites feature is enabled', () => {
+  describe('and the fetching the count of items succeeds', () => {
     beforeEach(() => {
-      itemSource = createItemsSource(components, { isFavoritesEnabled: true })
+      itemSource = createItemsSource(components)
       countMock.mockResolvedValueOnce(10)
     })
 

src/tests/components.ts

@@ -182,8 +182,6 @@ export async function initComponents(): Promise<AppComponents> {
   const collectionsChainId = getCollectionsChainId()
   const signaturesServer = await config.requireString('SIGNATURES_SERVER_URL')
 
-  const isFavoritesEnabled = (await config.getNumber('FF_FAVORITES')) === 1
-
   const cors = {
     origin: await config.getString('CORS_ORIGIN'),
     method: await config.getString('CORS_METHOD'),
@@ -387,13 +385,10 @@ export async function initComponents(): Promise<AppComponents> {
 
   const items = createMergerComponent<Item, ItemFilters, ItemSortBy>({
     sources: [
-      createItemsSource(
-        {
-          itemsComponent: collectionsItems,
-          favoritesComponent,
-        },
-        { isFavoritesEnabled }
-      ),
+      createItemsSource({
+        itemsComponent: collectionsItems,
+        favoritesComponent,
+      }),
     ],
     defaultSortBy: ITEM_DEFAULT_SORT_BY,
     directions: {
@@ -451,14 +446,11 @@ export async function initComponents(): Promise<AppComponents> {
   })
 
   // trendings
-  const trendings = createTrendingsComponent(
-    {
-      collectionsSubgraphComponent: collectionsSubgraph,
-      itemsComponent: items,
-      favoritesComponent,
-    },
-    { isFavoritesEnabled }
-  )
+  const trendings = createTrendingsComponent({
+    collectionsSubgraphComponent: collectionsSubgraph,
+    itemsComponent: items,
+    favoritesComponent,
+  })
 
   // analytics day data for the marketplace subgraph
   const marketplaceAnalyticsDayData = createAnalyticsDayDataComponent({
@@ -626,7 +618,6 @@ export async function initComponents(): Promise<AppComponents> {
   const catalog = await createCatalogComponent({
     database: satsumaDatabase,
     favoritesComponent,
-    isFavoritesEnabled,
   })
 
   return {

src/tests/ports/catalog.spec.ts

@@ -84,7 +84,6 @@ test('catalog component', function () {
     catalogComponent = createCatalogComponent({
       database,
       favoritesComponent: favoritesComponentMock,
-      isFavoritesEnabled: true,
     })
   })