Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/services/item/item.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ const plugin: FastifyPluginAsyncTypebox = async (fastify) => {
);

// remap to discriminated packed items
const packedItems = await itemWrapperService.createPackedItems(db, result.data);
const packedItems = await itemWrapperService.createPackedItems(db, member, result.data);
return { ...result, data: packedItems };
},
);
Expand Down
58 changes: 58 additions & 0 deletions src/services/item/packedItem.dto.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
const resultOfMemberships = {
data: { [items[0].id]: [itemMemberships[0]], [items[1].id]: [itemMemberships[1]] },
errors: [],
} as any;

Check warning on line 82 in src/services/item/packedItem.dto.spec.ts

View workflow job for this annotation

GitHub Actions / build-unit

Unexpected any. Specify a different type

Check warning on line 82 in src/services/item/packedItem.dto.spec.ts

View workflow job for this annotation

GitHub Actions / build-unit

Unexpected any. Specify a different type
const itemMembershipRepository = {
getForManyItems: vi.fn(),
} as unknown as ItemMembershipRepository;
Expand All @@ -96,6 +96,7 @@
itemThumbnailService,
).createPackedItems(
MOCK_DB,
actor,
items.map((i) => ({ ...resolveItemType(i), creator: actor })),
resultOfMemberships,
);
Expand All @@ -104,5 +105,62 @@
// should return parent visibility, not item visibility
expect(packedItems[1].hidden!.id).toEqual(itemVisibilities[1].id);
});

it('Return the permission for the current user', async () => {
const MOCK_DB = {} as DBConnection;
const { actor, items, itemMemberships } = await seedFromJson({
items: [
{
memberships: [
{ account: { name: 'toto' }, permission: 'admin' },
{ account: 'actor', permission: 'read' },
],
},
],
});
assertIsDefined(actor);
assertIsMemberForTest(actor);

const itemVisibilityRepository = {
getForManyItems: vi.fn(),
} as unknown as ItemVisibilityRepository;
vi.spyOn(itemVisibilityRepository, 'getForManyItems').mockImplementation(async () => ({
data: {
[items[0].id]: [],
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any,
errors: [],
}));

const resultOfMemberships = {
data: {
[items[0].id]: [itemMemberships[0], itemMemberships[1]],
},
errors: [],
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any;
const itemMembershipRepository = {
getForManyItems: vi.fn(),
} as unknown as ItemMembershipRepository;
vi.spyOn(itemMembershipRepository, 'getForManyItems').mockImplementation(
async () => resultOfMemberships,
);

const itemThumbnailService = { getUrlsByItems: vi.fn() } as unknown as ItemThumbnailService;
vi.spyOn(itemThumbnailService, 'getUrlsByItems').mockImplementation(async () => ({}));

const packedItems = await new PackedItemService(
itemVisibilityRepository,
itemMembershipRepository,
itemThumbnailService,
).createPackedItems(
MOCK_DB,
actor,
items.map((i) => ({ ...resolveItemType(i), creator: actor })),
resultOfMemberships,
);

expect(packedItems[0].permission).toEqual('read');
});
});
});
9 changes: 7 additions & 2 deletions src/services/item/packedItem.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import type {
ItemWithCreator,
MinimalAccount,
} from '../../drizzle/types';
import { MaybeUser } from '../../types';
import { ItemMembershipRepository } from '../itemMembership/membership.repository';
import { Item, resolveItemType } from './item';
import { ItemVisibilityRepository } from './plugins/itemVisibility/itemVisibility.repository';
Expand Down Expand Up @@ -128,6 +129,7 @@ export class PackedItemService {

async createPackedItems(
dbConnection: DBConnection,
currentAccount: MaybeUser,
items: ItemWithCreator[],
memberships?: ResultOf<ItemMembershipRaw[]>,
): Promise<PackedItem[]> {
Expand All @@ -140,11 +142,14 @@ export class PackedItemService {

const m =
memberships ?? (await this.itemMembershipRepository.getForManyItems(dbConnection, items));

const itemsThumbnails = await this.itemThumbnailService.getUrlsByItems(items);

return items.map((item) => {
const permission = m.data[item.id][0]?.permission;
// get the permission for the current user
const itemMemberships = m.data[item.id];
const permission =
itemMemberships.find((membership) => membership.accountId === currentAccount?.id)
?.permission ?? null;
const thumbnails = itemsThumbnails[item.id];

// sort visibilities to retrieve the most restrictive (highest) visibility first
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ describe('Item Published', () => {
expect(res.statusCode).toBe(StatusCodes.OK);
expectManyPackedItems(
res.json(),
items.map((i) =>
new PackedItemDTO({ ...i, creator: member }, { permission: 'admin' }).packed(),
),
items.map((i) => new PackedItemDTO({ ...i, creator: member }, null).packed()),
undefined,
undefined,
itemVisibilities,
Expand Down Expand Up @@ -231,9 +229,7 @@ describe('Item Published', () => {
expect(res.statusCode).toBe(StatusCodes.OK);
expectManyPackedItems(
res.json(),
items.map((i) =>
new PackedItemDTO({ ...i, creator: member }, { permission: 'admin' }).packed(),
),
items.map((i) => new PackedItemDTO({ ...i, creator: member }, null).packed()),
member,
undefined,
itemVisibilities,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ export class ItemPublishedService {
async getItemsForMember(dbConnection: DBConnection, actor: MaybeUser, memberId: UUID) {
const items = await this.itemRepository.getPublishedItemsForMember(dbConnection, memberId);

return this.itemWrapperService.createPackedItems(dbConnection, items);
return this.itemWrapperService.createPackedItems(dbConnection, actor, items);
}

async getRecentItems(dbConnection: DBConnection, actor: MaybeUser, limit?: number) {
Expand Down
Loading