fix: Expiration queries

src/logic/expiration.ts

@@ -1,3 +1,6 @@
 export function isOrderExpired(expiresAt: string) {
-  return BigInt(expiresAt) * 1000n < Date.now()
+  let expiresAtNum =
+    expiresAt.length === 13 ? Number(expiresAt) : Number(expiresAt) * 1000
+
+  return expiresAtNum < Date.now()
 }

src/logic/prices/marketplace.ts

@@ -88,8 +88,17 @@ export function marketplacePricesQuery(filters: PriceFilters) {
     category: filters.category as NFTCategory,
   })
   const categories = getNFTCategoryFromPriceCategory(filters.category)
+
+  const innerWhere = `
+    searchOrderPrice_gt:0, 
+    searchOrderStatus: open,
+    category_in: [${categories}],
+    searchEstateSize_gt: 0,
+    ${additionalWheres.join('\n')}
+  `
   return `query NFTPrices(
       $expiresAt: String
+      $expiresAtSec: String
       $wearableCategory: String
       $isWearableHead: Boolean
       $isWearableAccessory: Boolean
@@ -98,13 +107,18 @@ export function marketplacePricesQuery(filters: PriceFilters) {
         first: ${MAX_RESULTS},
         orderBy: tokenId,
         orderDirection: asc, 
-        where: { 
-          searchOrderPrice_gt:0, 
-          searchOrderStatus: open,
-          searchOrderExpiresAt_gt: $expiresAt,
-          category_in: [${categories}],
-          searchEstateSize_gt: 0,
-          ${additionalWheres.join('\n')}
+        where: {
+          or:[
+            {
+              ${innerWhere}
+              searchOrderExpiresAt_gt: $expiresAtSec
+              searchOrderExpiresAt_lt: "1000000000000"
+            },
+            {
+              ${innerWhere}
+              searchOrderExpiresAt_gt: $expiresAt
+            }
+          ]
         }) {
         ...priceFragment
       }

src/ports/nfts/types.ts

@@ -10,6 +10,7 @@ export type QueryVariables = Omit<NFTFilters, 'sortBy' | 'rentalDays'> & {
   orderBy: string
   orderDirection: 'asc' | 'desc'
   expiresAt: string
+  expiresAtSec: string
 }
 
 export interface INFTsComponent {

src/ports/nfts/utils.ts

@@ -10,6 +10,7 @@ const NFTS_FILTERS = `
   $orderBy: String
   $orderDirection: String
   $expiresAt: String
+  $expiresAtSec: String
   $owner: String
   $wearableCategory: String
   $isWearableHead: Boolean
@@ -44,11 +45,14 @@ export function getQueryVariables<T>(
   const { sortBy, ...variables } = options
   const orderBy = getOrderBy(sortBy) as string
   const orderDirection = getOrderDirection(sortBy)
+  const expiresAt = Date.now()
+  const expiresAtSec = Math.trunc(expiresAt / 1000)
   return {
     ...variables,
     orderBy,
     orderDirection,
-    expiresAt: Date.now().toString(),
+    expiresAt: expiresAt.toString(),
+    expiresAtSec: expiresAtSec.toString(),
   }
 }
 
@@ -183,6 +187,7 @@ export function getFetchQuery(
   isCount = false
 ) {
   const where: string[] = []
+  let wrapWhere = false
 
   if (filters.owner) {
     where.push('owner: $owner')
@@ -194,7 +199,7 @@ export function getFetchQuery(
     filters.sortBy === NFTSortBy.RECENTLY_LISTED
   ) {
     where.push('searchOrderStatus: open')
-    where.push('searchOrderExpiresAt_gt: $expiresAt')
+    wrapWhere = true
   }
 
   if (filters.search) {
@@ -247,15 +252,36 @@ export function getFetchQuery(
       : filters.first
     : max
 
+  let wrappedWhere = `{
+      ${where.join('\n')}
+      ${getExtraWhere ? getExtraWhere(filters).join('\n') : ''}
+    }`
+
+  if (wrapWhere) {
+    wrappedWhere = `{
+      or:[
+        {
+          ${[
+            ...where,
+            `searchOrderExpiresAt_gt: $expiresAtSec`,
+            `searchOrderExpiresAt_lt: "1000000000000"`,
+          ].join('\n')}
+          ${getExtraWhere ? getExtraWhere(filters).join('\n') : ''}
+        },
+        {
+          ${[...where, `searchOrderExpiresAt_gt: $expiresAt`].join('\n')}
+          ${getExtraWhere ? getExtraWhere(filters).join('\n') : ''}
+        }
+      ]
+    }`
+  }
+
   const query = `query NFTs(
     ${NFTS_FILTERS}
     ${getExtraVariables ? getExtraVariables(filters).join('\n') : ''}
     ) {
     nfts(
-      where: {
-        ${where.join('\n')}
-        ${getExtraWhere ? getExtraWhere(filters).join('\n') : ''}
-      }${getArguments(total)})
+      where: ${wrappedWhere}${getArguments(total)})
     {
       ${isCount ? 'id' : `...${fragmentName}`}
     }

src/ports/orders/utils.ts

@@ -89,6 +89,7 @@ export const getOrdersQuery = (
   } = filters
 
   const where: string[] = []
+  let wrapWhere = false
 
   if (marketplaceAddress) {
     where.push(`marketplaceAddress : "${marketplaceAddress}"`)
@@ -122,7 +123,7 @@ export const getOrdersQuery = (
 
   if (status) {
     if (status === ListingStatus.OPEN) {
-      where.push(`expiresAt_gt: "${Math.round(Date.now() / 1000)}"`)
+      wrapWhere = true
     }
     where.push(`status: ${status}`)
   }
@@ -169,15 +170,38 @@ export const getOrdersQuery = (
       orderDirection = 'desc'
   }
 
+  let wrappedWhere = `{
+    ${where.join('\n')}
+  }`
+
+  if (wrapWhere) {
+    const expiresAt = Date.now()
+    const expiresAtSec = Math.trunc(expiresAt / 1000)
+
+    wrappedWhere = `{
+      or:[
+        {
+          ${[
+            ...where,
+            `expiresAt_gt: "${expiresAtSec}"`,
+            `expiresAt_lt: "1000000000000"`,
+          ].join('\n')}
+        },
+        {
+          ${[...where, `expiresAt_gt: "${expiresAt}"`].join('\n')}
+        }
+      ]
+    }`
+  }
+
   return `
     query Orders {
       orders(
         first: ${total},
         orderBy: ${orderBy},
         orderDirection: ${orderDirection},
-        where: {
-          ${where.join('\n')}
-        })
+        where: ${wrappedWhere}
+      )
       { ${isCount ? 'id' : `...orderFragment`} }
     }
     ${isCount ? '' : getOrderFragment(getOrderFields)}

src/ports/prices/component.ts

@@ -42,10 +42,13 @@ export function createPricesComponent(options: {
     let priceFragments: PriceFragment[] = []
     while (true) {
       const query = getPricesQuery(queryGetter, filters, lastId)
+      const expiresAt = Date.now()
+      const expiresAtSec = Math.trunc(expiresAt / 1000)
       const queryVariables = {
         ...filters,
         lastId,
-        expiresAt: Date.now().toString(),
+        expiresAt: expiresAt.toString(),
+        expiresAtSec: expiresAtSec.toString(),
       }
       const { prices: fragments } = await subgraph.query<{
         prices: PriceFragment[]

src/ports/stats/component.ts

@@ -24,9 +24,12 @@ export function createStatsComponent(options: {
     let sizes: FetchEstateSizesQueryFragment[] = []
     while (true) {
       const query = getEstatesSizesQuery(filters)
+      const expiresAt = Date.now()
+      const expiresAtSec = Math.trunc(expiresAt / 1000)
       const queryVariables = {
         lastId,
-        expiresAt: Date.now().toString(),
+        expiresAt: expiresAt.toString(),
+        expiresAtSec: expiresAtSec.toString(),
       }
       const { nfts: fragments } = await subgraph.query<{
         nfts: FetchEstateSizesQueryFragment[]

src/ports/stats/utils.ts

@@ -5,9 +5,11 @@ export const MAX_RESULTS = 1000
 
 export function getEstatesSizesQuery(filters: StatsEstateFilters) {
   const extraWhere = []
+  let wrapWhere = false
+
   if (filters.isOnSale) {
     extraWhere.push('searchOrderStatus: open')
-    extraWhere.push('searchOrderExpiresAt_gt: $expiresAt')
+    wrapWhere = true
   }
   if (filters.maxPrice) {
     extraWhere.push(`searchOrderPrice_lte: "${filters.maxPrice}"`)
@@ -16,16 +18,37 @@ export function getEstatesSizesQuery(filters: StatsEstateFilters) {
   if (filters.minPrice) {
     extraWhere.push(`searchOrderPrice_gte: "${filters.minPrice}"`)
   }
+
   addLandFilters(filters, extraWhere)
+
+  let wrappedWhere = `
+    category: estate, 
+    searchEstateSize_gt:0, 
+    id_gt: $lastId, 
+    ${extraWhere.join('\n')} 
+  `
+
+  if (wrapWhere) {
+    wrappedWhere = `
+      or:[
+        {
+          ${wrappedWhere}
+          searchOrderExpiresAt_gt: $expiresAtSec
+          searchOrderExpiresAt_lt: "1000000000000"
+        },
+        {
+          ${wrappedWhere}
+          searchOrderExpiresAt_gt: $expiresAt
+        }
+      ]`
+  }
+
   return `
-    query EstateSizesQuery($lastId: ID, $expiresAt: String ) {
+    query EstateSizesQuery($lastId: ID, $expiresAt: String, $expiresAtSec: String) {
       nfts (
         first: ${MAX_RESULTS}, 
-        where: { 
-          category: estate, 
-          searchEstateSize_gt:0, 
-          id_gt: $lastId, 
-          ${extraWhere.join('\n')} 
+        where: {
+          ${wrappedWhere}
         }, 
         orderBy: id, 
         orderDirection: asc)