feat: return minimal item parent (#2004)

* fix: simplify parent items

* refactor: fix tests

* refactor: apply comment

Co-authored-by: Basile Spaenlehauer <spaenleh@gmail.com>

---------

Co-authored-by: kim <kim.phanhoang@epfl.ch>
Co-authored-by: Basile Spaenlehauer <spaenleh@gmail.com>

Author: 3 people

src/services/item/item.controller.read.test.ts

@@ -49,6 +49,19 @@ jest.mock('@aws-sdk/lib-storage', () => {
   };
 });
 
+export const expectParents = (
+  data: { name: string; id: string; path: string }[],
+  parents: { name: string; id: string; path: string }[],
+) => {
+  expect(data).toHaveLength(parents.length);
+
+  for (let i = 0; i < parents.length; i++) {
+    expect(data[i].id).toEqual(parents[i].id);
+    expect(data[i].name).toEqual(parents[i].name);
+    expect(data[i].path).toEqual(parents[i].path);
+  }
+};
+
 describe('Item routes tests', () => {
   let app: FastifyInstance;
 
@@ -1364,63 +1377,19 @@ describe('Item routes tests', () => {
         assertIsMemberForTest(actor);
         mockAuthenticate(actor);
 
-        const parents = [parent, child1].map((i) =>
-          new ItemWrapper({ ...i, creator: null }, { permission: PermissionLevel.Admin }).packed(),
-        );
+        const parents = [parent, child1];
 
         const response = await app.inject({
           method: HttpMethod.Get,
           url: `/items/${childOfChild.id}/parents`,
         });
 
-        const data = response.json<PackedItem[]>();
-        expect(data).toHaveLength(parents.length);
-        data.forEach((p, idx) => {
-          expectPackedItem(p, parents[idx]);
-          expectThumbnails(p, MOCK_SIGNED_URL, false);
-        });
-        expect(response.statusCode).toBe(StatusCodes.OK);
-      });
-
-      it('Returns successfully with thumbnails', async () => {
-        const {
-          actor,
-          items: [parent, child1, childOfChild],
-        } = await seedFromJson({
-          items: [
-            {
-              settings: { hasThumbnail: true },
-              memberships: [{ account: 'actor', permission: PermissionLevel.Admin }],
-              children: [
-                {
-                  settings: { hasThumbnail: true },
-                  children: [{ settings: { hasThumbnail: true } }],
-                },
-              ],
-            },
-            {},
-          ],
-        });
-        assertIsDefined(actor);
-        assertIsMemberForTest(actor);
-        mockAuthenticate(actor);
-
-        const response = await app.inject({
-          method: HttpMethod.Get,
-          url: `/items/${childOfChild.id}/parents`,
-        });
+        const data = response.json();
 
-        const parents = [parent, child1].map((i) =>
-          new ItemWrapper({ ...i, creator: null }, { permission: PermissionLevel.Admin }).packed(),
-        );
-        const data = response.json<PackedItem[]>();
-        expect(data).toHaveLength(parents.length);
-        data.forEach((p, idx) => {
-          expectPackedItem(p, parents[idx]);
-          expectThumbnails(p, MOCK_SIGNED_URL, true);
-        });
+        expectParents(data, parents);
         expect(response.statusCode).toBe(StatusCodes.OK);
       });
+
       it('Bad Request for invalid id', async () => {
         const response = await app.inject({
           method: HttpMethod.Get,
@@ -1465,7 +1434,6 @@ describe('Item routes tests', () => {
       it('Returns successfully', async () => {
         const {
           items: [parent, child1, childOfChild],
-          itemVisibilities: [publicVisibility],
         } = await seedFromJson({
           actor: null,
           items: [
@@ -1486,11 +1454,7 @@ describe('Item routes tests', () => {
 
         const data = response.json();
         expect(data).toHaveLength(parents.length);
-        data.forEach((p, idx) => {
-          expectPackedItem(p, { ...parents[idx], permission: null }, undefined, undefined, [
-            publicVisibility,
-          ]);
-        });
+        expectParents(data, parents);
         expect(response.statusCode).toBe(StatusCodes.OK);
       });
     });

src/services/item/item.controller.ts

@@ -13,15 +13,9 @@ import { assertIsMember } from '../authentication';
 import { memberAccountRole } from '../member/strategies/memberAccountRole';
 import { validatedMemberAccountRole } from '../member/strategies/validatedMemberAccountRole';
 import { ITEMS_PAGE_SIZE } from './constants';
-import { copyMany, deleteMany, moveMany, reorder, updateOne } from './item.schemas';
+import { copyMany, deleteMany, getParentItems, moveMany, reorder, updateOne } from './item.schemas';
 import { create, createWithThumbnail } from './item.schemas.create';
-import {
-  getAccessible,
-  getChildren,
-  getDescendantItems,
-  getOne,
-  getParentItems,
-} from './item.schemas.packed';
+import { getAccessible, getChildren, getDescendantItems, getOne } from './item.schemas.packed';
 import { ItemService } from './item.service';
 import { ItemActionService } from './plugins/action/itemAction.service';
 import { getPostItemPayloadFromFormData } from './utils';

src/services/item/item.schemas.packed.ts

@@ -138,18 +138,3 @@ export const getDescendantItems = {
     '4xx': errorSchemaRef,
   },
 } as const satisfies FastifySchema;
-
-export const getParentItems = {
-  operationId: 'getParentItems',
-  tags: ['item'],
-  summary: 'Get parent items of item',
-  description: 'Get parent items of item given its id.',
-
-  params: customType.StrictObject({
-    id: customType.UUID(),
-  }),
-  response: {
-    [StatusCodes.OK]: Type.Array(packedItemSchemaRef),
-    '4xx': errorSchemaRef,
-  },
-} as const satisfies FastifySchema;

src/services/item/item.schemas.ts

@@ -114,6 +114,23 @@ export const itemUpdateSchema = Type.Partial(
   ),
 );
 
+export const getParentItems = {
+  operationId: 'getParentItems',
+  tags: ['item'],
+  summary: 'Get parents of item',
+  description: 'Get parent items of item given its id.',
+
+  params: customType.StrictObject({
+    id: customType.UUID(),
+  }),
+  response: {
+    [StatusCodes.OK]: Type.Array(
+      customType.StrictObject({ id: Type.String(), name: Type.String(), path: Type.String() }),
+    ),
+    '4xx': errorSchemaRef,
+  },
+} as const satisfies FastifySchema;
+
 export const updateOne = {
   operationId: 'updateItem',
   tags: ['item'],

src/services/item/item.service.ts

@@ -592,17 +592,19 @@ export class ItemService {
     });
     const parents = await this.itemRepository.getAncestors(dbConnection, item);
 
-    const { itemMemberships, visibilities } =
-      await this.authorizedItemService.getPropertiesForItems(dbConnection, {
+    const { itemMemberships } = await this.authorizedItemService.getPropertiesForItems(
+      dbConnection,
+      {
         permission: PermissionLevel.Read,
         accountId: maybeUser?.id,
         items: parents,
-      });
+      },
+    );
     // remove parents actor does not have access
     const parentsIds = Object.keys(itemMemberships.data);
     const items = parents.filter((p) => parentsIds.includes(p.id));
-    const thumbnails = await this.itemThumbnailService.getUrlsByItems(items);
-    return this.itemWrapperService.merge(items, itemMemberships, visibilities, thumbnails);
+
+    return items;
   }
 
   async patch(