From b6903cd77b4779dfa1efa9a2384daaf0c9d7a7a5 Mon Sep 17 00:00:00 2001 From: Convly Date: Mon, 12 Dec 2022 16:24:48 +0100 Subject: [PATCH] Fix naming --- .../lib/providers/shared/strapi/entity.ts | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/core/data-transfer/lib/providers/shared/strapi/entity.ts b/packages/core/data-transfer/lib/providers/shared/strapi/entity.ts index 50a93f8158..5f20cb1a8c 100644 --- a/packages/core/data-transfer/lib/providers/shared/strapi/entity.ts +++ b/packages/core/data-transfer/lib/providers/shared/strapi/entity.ts @@ -26,39 +26,36 @@ const createEntityQuery = (strapi: Strapi.Strapi) => { return assign(entityComponents, dataWithoutComponents); }, - create: async (uid: string, data: T) => { - return data; - }, get: async (uid: string, entity: T) => { return componentsService.getComponents(uid, entity); }, - delete(uid: string, components: T) { - return componentsService.deleteComponents(uid, components, { loadComponents: false }); + delete(uid: string, componentsToDelete: T) { + return componentsService.deleteComponents(uid, componentsToDelete, { loadComponents: false }); }, }; const query = (uid: string) => { - const create = async (query: T) => { - const dataWithComponents = await components.assignToEntity(uid, query.data); + const create = async (params: T) => { + const dataWithComponents = await components.assignToEntity(uid, params.data); const sanitizedData = omitInvalidCreationAttributes(dataWithComponents); - return strapi.db.query(uid).create({ ...query, data: sanitizedData }); + return strapi.db.query(uid).create({ ...params, data: sanitizedData }); }; - const createMany = async (query: T) => { + const createMany = async (params: T) => { return ( - Promise.resolve(query.data) + Promise.resolve(params.data) // Create components for each entity .then(map((data) => components.assignToEntity(uid, data))) // Remove unwanted attributes .then(map(omitInvalidCreationAttributes)) // Execute a strapi db createMany query with all the entities + their created components - .then((data) => strapi.db.query(uid).createMany({ ...query, data })) + .then((data) => strapi.db.query(uid).createMany({ ...params, data })) ); }; - const deleteMany = async (query?: T) => { - const entitiesToDelete = await strapi.db.query(uid).findMany(query ?? {}); + const deleteMany = async (params?: T) => { + const entitiesToDelete = await strapi.db.query(uid).findMany(params ?? {}); if (!entitiesToDelete.length) { return null; @@ -68,7 +65,7 @@ const createEntityQuery = (strapi: Strapi.Strapi) => { entitiesToDelete.map((entityToDelete) => components.get(uid, entityToDelete)) ); - const deletedEntities = await strapi.db.query(uid).deleteMany(query); + const deletedEntities = await strapi.db.query(uid).deleteMany(params); await Promise.all(componentsToDelete.map((compos) => components.delete(uid, compos))); return deletedEntities;