Bugfix/fix query to filter activities of excluded accounts (#3059)
* Fix query to filter activities of excluded accounts * Update changelog
This commit is contained in:
parent
f2d431a6b8
commit
d3679d41b3
@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed the query to filter activities of excluded accounts
|
||||||
- Improved the asset profile validation in the activities import
|
- Improved the asset profile validation in the activities import
|
||||||
|
|
||||||
## 2.57.0 - 2024-02-25
|
## 2.57.0 - 2024-02-25
|
||||||
|
@ -292,19 +292,14 @@ export class OrderService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (types) {
|
if (types) {
|
||||||
where.OR = types.map((type) => {
|
where.type = { in: types };
|
||||||
return {
|
|
||||||
type: {
|
|
||||||
equals: type
|
|
||||||
}
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (withExcludedAccounts === false) {
|
if (withExcludedAccounts === false) {
|
||||||
where.Account = {
|
where.OR = [
|
||||||
NOT: { isExcluded: true }
|
{ Account: null },
|
||||||
};
|
{ Account: { NOT: { isExcluded: true } } }
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
const [orders, count] = await Promise.all([
|
const [orders, count] = await Promise.all([
|
||||||
|
Loading…
x
Reference in New Issue
Block a user