lthn/trade-backend
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #21 from hyle-team/feature/add-pairs-obsolete-filter

Browse source 
update: add pairs obsolete filter
This commit is contained in:
Dmitrii Kolpakov 2026-02-24 12:19:11 +01:00 • committed by GitHub
commit 4b8b8451aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 74 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
src/models/Dex.ts
View file

@ -38,8 +38,58 @@ class DexModel {
}
private getPairsSearchCondition(searchText: string, whitelistedOnly: boolean) {
const tickerRegexp = /^[A-Za-z0-9]{1,14}$/;
const fullNameRegexp = /^[A-Za-z0-9.,:!?\-() ]*$/;
const firstFullNameExpr = Sequelize.literal(`"first_currency"."asset_info"->>'full_name'`);
const secondFullNameExpr = Sequelize.literal(
`"second_currency"."asset_info"->>'full_name'`,
);
const searchCondition: WhereOptions = {
[Op.and]: [
Sequelize.where(Sequelize.col('first_currency.name'), {
[Op.regexp]: tickerRegexp.source,
}),
{
[Op.or]: [
Sequelize.where(Sequelize.col('first_currency.asset_info'), {
[Op.is]: null,
}),
Sequelize.where(firstFullNameExpr, { [Op.is]: null }),
{
[Op.and]: [
Sequelize.where(firstFullNameExpr, {
[Op.regexp]: fullNameRegexp.source,
}),
Sequelize.where(Sequelize.fn('char_length', firstFullNameExpr), {
[Op.lte]: 400,
}),
],
},
],
},
Sequelize.where(Sequelize.col('second_currency.name'), {
[Op.regexp]: tickerRegexp.source,
}),
{
[Op.or]: [
Sequelize.where(Sequelize.col('second_currency.asset_info'), {
[Op.is]: null,
}),
Sequelize.where(secondFullNameExpr, { [Op.is]: null }),
{
[Op.and]: [
Sequelize.where(secondFullNameExpr, {
[Op.regexp]: fullNameRegexp.source,
}),
Sequelize.where(Sequelize.fn('char_length', secondFullNameExpr), {
[Op.lte]: 400,
}),
],
},
],
},
{
[Op.or]: [
Sequelize.where(
@ -70,7 +120,20 @@ class DexModel {
],
};
return searchCondition;
const includeCondition = [
{
model: Currency,
as: 'first_currency',
attributes: ['asset_id', 'code', 'id', 'name', 'type', 'whitelisted'],
},
{
model: Currency,
as: 'second_currency',
attributes: ['asset_id', 'code', 'id', 'name', 'type', 'whitelisted'],
},
];
return { searchCondition, includeCondition };
}
async getPairRow(id: number) {
@ -88,7 +151,10 @@ class DexModel {
sortOption: PairSortOption,
) {
try {
const searchCondition = this.getPairsSearchCondition(searchText, whitelistedOnly);
const { searchCondition, includeCondition } = this.getPairsSearchCondition(
searchText,
whitelistedOnly,
);
const volumeSortDirection =
sortOption === PairSortOption.VOLUME_LOW_TO_HIGH ? 'ASC' : 'DESC';
@ -105,18 +171,7 @@ class DexModel {
'volume',
'featured',
],
include: [
{
model: Currency,
as: 'first_currency',
attributes: ['asset_id', 'code', 'id', 'name', 'type', 'whitelisted'],
},
{
model: Currency,
as: 'second_currency',
attributes: ['asset_id', 'code', 'id', 'name', 'type', 'whitelisted'],
},
],
include: includeCondition,
where: searchCondition,
order: [
['volume', volumeSortDirection],
@ -152,21 +207,13 @@ class DexModel {
async getPairsPagesAmount(searchText: string, whitelistedOnly: boolean) {
try {
const searchCondition = this.getPairsSearchCondition(searchText, whitelistedOnly);
const { searchCondition, includeCondition } = this.getPairsSearchCondition(
searchText,
whitelistedOnly,
);
const count = await Pair.count({
include: [
{
model: Currency,
as: 'first_currency',
attributes: ['asset_id', 'code', 'id', 'name', 'type'],
},
{
model: Currency,
as: 'second_currency',
attributes: ['asset_id', 'code', 'id', 'name', 'type'],
},
],
include: includeCondition,
where: searchCondition,
});