Skip to content

change sorting for recently listed #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivostoynovski wants to merge 2 commits into
base: universe-v1.0.12
Choose a base branch
from
Open

change sorting for recently listed #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd5e8d3
change sorting for recently listed
ivostoynovski Aug 25, 2022
a9a2246
return nft with all orders
ivostoynovski Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 56 additions & 7 deletions src/services/orders/aggregations/order.aggregations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { OrderSide, AssetClass } from '../../../models';
import { OrderSide, AssetClass, OrderStatus } from '../../../models';
import { Utils, TOKENS } from '../../../utils';
import { fetchTokenPrices } from '../../token-prices/token-price.service';

Expand Down Expand Up @@ -72,7 +72,10 @@ export const addPriceSortingAggregation = async (orderSide: OrderSide) => {
},
{
case: {
$eq: ['$make.assetType.contract', Utils.tokenAddresses.weth],
$eq: [
'$make.assetType.contract',
Utils.tokenAddresses.weth,
],
},
then: {
$divide: [
Expand All @@ -84,7 +87,10 @@ export const addPriceSortingAggregation = async (orderSide: OrderSide) => {
},
{
case: {
$eq: ['$make.assetType.contract', Utils.tokenAddresses['usd-coin']],
$eq: [
'$make.assetType.contract',
Utils.tokenAddresses['usd-coin'],
],
},
then: {
$divide: [
Expand All @@ -96,7 +102,10 @@ export const addPriceSortingAggregation = async (orderSide: OrderSide) => {
},
{
case: {
$eq: ['$make.assetType.contract', Utils.tokenAddresses['universe-xyz']],
$eq: [
'$make.assetType.contract',
Utils.tokenAddresses['universe-xyz'],
],
},
then: {
$divide: [
Expand Down Expand Up @@ -153,7 +162,10 @@ export const addPriceSortingAggregation = async (orderSide: OrderSide) => {
},
{
case: {
$eq: ['$take.assetType.contract', Utils.tokenAddresses.weth],
$eq: [
'$take.assetType.contract',
Utils.tokenAddresses.weth,
],
},
then: {
$multiply: [
Expand All @@ -169,7 +181,10 @@ export const addPriceSortingAggregation = async (orderSide: OrderSide) => {
},
{
case: {
$eq: ['$take.assetType.contract', Utils.tokenAddresses['usd-coin']],
$eq: [
'$take.assetType.contract',
Utils.tokenAddresses['usd-coin'],
],
},
then: {
$multiply: [
Expand All @@ -185,7 +200,10 @@ export const addPriceSortingAggregation = async (orderSide: OrderSide) => {
},
{
case: {
$eq: ['$take.assetType.contract', Utils.tokenAddresses['universe-xyz']],
$eq: [
'$take.assetType.contract',
Utils.tokenAddresses['universe-xyz'],
],
},
then: {
$multiply: [
Expand All @@ -208,3 +226,34 @@ export const addPriceSortingAggregation = async (orderSide: OrderSide) => {
];
}
};

export const recentlyListedAggregation = async (timestamp: number) => {
return [
{
$addFields: {
active: {
$cond: {
if: {
$and: [
{
$in: [
'$status',
[OrderStatus.CREATED, OrderStatus.PARTIALFILLED],
],
},
{
$or: [{ $lt: ['$start', timestamp] }, { $eq: ['$start', 0] }],
},
{
$or: [{ $gt: ['$end', timestamp] }, { $eq: ['$end', 0] }],
},
],
},
then: true,
else: false,
},
},
},
},
];
};
13 changes: 9 additions & 4 deletions src/services/orders/builders/order.builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
import {
addEndSortingAggregation,
addPriceSortingAggregation,
recentlyListedAggregation,
} from '../aggregations/order.aggregations';

import { Utils } from '../../../utils';
Expand Down Expand Up @@ -50,9 +51,11 @@ export const buildOrderQueryFilters = async (
side: OrderSide.SELL,
});
}
filters.push({
status: { $in: [OrderStatus.CREATED, OrderStatus.PARTIALFILLED] },
});
if (orderSort !== SortOrderOptionsEnum.RecentlyListed) {
filters.push({
status: { $in: [OrderStatus.CREATED, OrderStatus.PARTIALFILLED] },
});
}
filters.push({
$or: [{ start: { $lt: utcTimestamp } }, { start: 0 }],
});
Expand Down Expand Up @@ -196,6 +199,8 @@ export const buildOrderQueryFilters = async (
sort.usd_value = 1;
break;
case SortOrderOptionsEnum.RecentlyListed:
sortingAggregation = await recentlyListedAggregation(utcTimestamp);
sort.active = -1;
sort.createdAt = -1;
break;
case SortOrderOptionsEnum.TokenIdAscending:
Expand All @@ -222,5 +227,5 @@ export const buildOrderQueryFilters = async (
console.log('ORDER FILTERS:');
console.log(finalFilters);

return { finalFilters, sortingAggregation, sort };
return { finalFilters, sortingAggregation, sort, sorting };
};
69 changes: 48 additions & 21 deletions src/strategies/nft-owner-order.strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class NftOwnerOrderStrategy implements IStrategy {
ownerParams,
nftParams.tokenType.toString(),
);
const { finalFilters, sortingAggregation, sort } =
const { finalFilters, sortingAggregation, sort, sorting } =
await buildOrderQueryFilters(orderParams, generalParams);

console.time('query-time');
Expand All @@ -64,13 +64,16 @@ export class NftOwnerOrderStrategy implements IStrategy {
},
}),
ownerQuery,
OrderModel.aggregate([{ $match: finalFilters }], {
collation: {
locale: 'en',
strength: 2,
numericOrdering: true,
OrderModel.aggregate(
[{ $match: finalFilters }, ...sortingAggregation, { $sort: sort }],
{
collation: {
locale: 'en',
strength: 2,
numericOrdering: true,
},
},
}),
),
]);
console.timeEnd('query-time');

Expand All @@ -81,6 +84,7 @@ export class NftOwnerOrderStrategy implements IStrategy {
}

const filtered = [];
const uniqueFiltered = new Set();
for (let i = 0; i < orders.length; i++) {
const order = orders[i];

Expand Down Expand Up @@ -119,12 +123,15 @@ export class NftOwnerOrderStrategy implements IStrategy {
if (!ownersInfo.length) {
continue;
}

filtered.push(nft);
if (sorting === 1) {
uniqueFiltered.add(nft.tokenId && nft.contractAddress && nft);
} else {
filtered.push(nft);
}
}

return {
count: filtered.length,
count: sorting === 1 ? uniqueFiltered.size : filtered.length,
};
}

Expand Down Expand Up @@ -152,7 +159,7 @@ export class NftOwnerOrderStrategy implements IStrategy {
ownerParams,
nftParams.tokenType.toString(),
);
const { finalFilters, sortingAggregation, sort } =
const { finalFilters, sortingAggregation, sort, sorting } =
await buildOrderQueryFilters(orderParams, generalParams);

console.time('query-time');
Expand Down Expand Up @@ -188,6 +195,7 @@ export class NftOwnerOrderStrategy implements IStrategy {

// Apply Pagination
const filtered = [];
const uniqueFiltered = new Set();
for (let i = 0; i < orders.length; i++) {
const order = orders[i];

Expand Down Expand Up @@ -247,26 +255,45 @@ export class NftOwnerOrderStrategy implements IStrategy {
nft.orders = nftOrders;
nft.owners = ownerAddresses;

filtered.push(nft);
if (filtered.length === generalParams.skippedItems + limit) {
break;
if (sorting === 1) {
uniqueFiltered.add(nft.tokenId && nft.contractAddress && nft);
if (uniqueFiltered.size === generalParams.skippedItems + limit) {
break;
}
} else {
filtered.push(nft);
if (filtered.length === generalParams.skippedItems + limit) {
break;
}
}
}

if (!filtered.length) {
return {
page: page,
size: limit,
nfts: [],
};
const emptyResponse = {
page: page,
size: limit,
nfts: [],
};

if (sorting === 1) {
if (!uniqueFiltered.size) {
return emptyResponse;
}
} else {
if (!filtered.length) {
return emptyResponse;
}
}

const uniqeToArr = [...uniqueFiltered];

const paginated = filtered.slice(generalParams.skippedItems);
const paginatedUnique = uniqeToArr.slice(generalParams.skippedItems);

return {
page: page,
size: limit,
nfts: paginated,
nfts: sorting === 1 ? paginatedUnique : paginated,
count: paginatedUnique.length,
};
}
}