laudom
/
metropolis
2
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

fix item ancestor/descendant lists

master
Lauren Liberda 2021-07-31 19:35:36 +02:00
parent e2b0ffb7cd
commit 3cc2c73bc2
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/items/items.service.ts
View File

@ -36,14 +36,13 @@ export class ItemsService {
}
async getItemAncestors(item: ItemModel): Promise<Item[]> {
const childItem = await this.itemRepository.findOneOrFail(
this.eans.toID(item.id),
{
relations: ['parent'],
},
const id = this.eans.toID(item.id);
const childItem = await this.itemRepository.findOneOrFail(id, {
relations: ['parent'],
});
return (await this.treeRepository.findAncestors(childItem)).filter(
(anc) => anc.id !== id,
);
// TreeRepository.findAncestors()[-1] is always the child item itself
return (await this.treeRepository.findAncestors(childItem)).slice(0, -1);
}
async getItemChildren(item: ItemModel): Promise<Item[]> {
@ -55,14 +54,13 @@ export class ItemsService {
}
async getItemDescendants(item: ItemModel): Promise<Item[]> {
const parentItem = await this.itemRepository.findOneOrFail(
this.eans.toID(item.id),
{
relations: ['parent'],
},
const id = this.eans.toID(item.id);
const parentItem = await this.itemRepository.findOneOrFail(id, {
relations: ['parent'],
});
return (await this.treeRepository.findDescendants(parentItem)).filter(
(des) => des.id !== id,
);
// TreeRepository.findDescendants()[0] is always the parent item
return (await this.treeRepository.findDescendants(parentItem)).slice(1);
}
async getItemList(cursor: number = 0): Promise<PaginatedItems> {