yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-05 04:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/entity-service-wrapOutput' into feature/private-s3-url-signing-content-api

Browse Source
This commit is contained in:
Marc-Roig 2023-04-26 11:46:37 +02:00
commit 231a391f15
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/core/strapi/lib/services/entity-service/index.js
View File

@ -91,7 +91,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
} }
const entities = await db.query(uid).findMany(query); const entities = await db.query(uid).findMany(query);
return this.wrapResult(entities); return this.wrapResult(entities, { uid, action: 'findMany' });
}, },
async findPage(uid, opts) { async findPage(uid, opts) {
@ -102,7 +102,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
const page = await db.query(uid).findPage(query); const page = await db.query(uid).findPage(query);
return { return {
...page, ...page,
results: await this.wrapResult(page.results), results: await this.wrapResult(page.results, { uid, action: 'findPage' }),
}; };
}, },
@ -113,7 +113,10 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
const query = transformParamsToQuery(uid, wrappedParams); const query = transformParamsToQuery(uid, wrappedParams);
const entities = await db.query(uid).findPage(query); const entities = await db.query(uid).findPage(query);
return this.wrapResult(entities); return {
...entities,
results: await this.wrapResult(entities.results, { uid, action: 'findWithRelationCounts' }),
};
}, },
async findWithRelationCounts(uid, opts) { async findWithRelationCounts(uid, opts) {
@ -121,8 +124,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
const query = transformParamsToQuery(uid, wrappedParams); const query = transformParamsToQuery(uid, wrappedParams);
const entities = db.query(uid).findMany(query); const entities = await db.query(uid).findMany(query);
return this.wrapResult(entities); return this.wrapResult(entities, { uid, action: 'findWithRelationCounts' });
}, },
async findOne(uid, entityId, opts) { async findOne(uid, entityId, opts) {
@ -131,7 +134,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams)); const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));
const entity = db.query(uid).findOne({ ...query, where: { id: entityId } }); const entity = db.query(uid).findOne({ ...query, where: { id: entityId } });
return this.wrapResult(entity); return this.wrapResult(entity, { uid, action: 'findOne' });
}, },
async count(uid, opts) { async count(uid, opts) {
@ -174,7 +177,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
entity = await this.findOne(uid, entity.id, wrappedParams); entity = await this.findOne(uid, entity.id, wrappedParams);
} }
entity = await this.wrapResult(entity); entity = await this.wrapResult(entity, { uid, action: 'create' });
await this.emitEvent(uid, ENTRY_CREATE, entity); await this.emitEvent(uid, ENTRY_CREATE, entity);
@ -227,7 +230,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
entity = await this.findOne(uid, entity.id, wrappedParams); entity = await this.findOne(uid, entity.id, wrappedParams);
} }
entity = await this.wrapResult(entity); entity = await this.wrapResult(entity, { uid, action: 'update' });
await this.emitEvent(uid, ENTRY_UPDATE, entity); await this.emitEvent(uid, ENTRY_UPDATE, entity);
@ -254,7 +257,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
await db.query(uid).delete({ where: { id: entityToDelete.id } }); await db.query(uid).delete({ where: { id: entityToDelete.id } });
await deleteComponents(uid, componentsToDelete, { loadComponents: false }); await deleteComponents(uid, componentsToDelete, { loadComponents: false });
entityToDelete = await this.wrapResult(entityToDelete); entityToDelete = await this.wrapResult(entityToDelete, { uid, action: 'delete' });
await this.emitEvent(uid, ENTRY_DELETE, entityToDelete); await this.emitEvent(uid, ENTRY_DELETE, entityToDelete);
@ -283,7 +286,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
componentsToDelete.map((compos) => deleteComponents(uid, compos, { loadComponents: false })) componentsToDelete.map((compos) => deleteComponents(uid, compos, { loadComponents: false }))
); );
entitiesToDelete = await this.wrapResult(entitiesToDelete); entitiesToDelete = await this.wrapResult(entitiesToDelete, { uid, action: 'delete' });
// Trigger webhooks. One for each entity // Trigger webhooks. One for each entity
await Promise.all(entitiesToDelete.map((entity) => this.emitEvent(uid, ENTRY_DELETE, entity))); await Promise.all(entitiesToDelete.map((entity) => this.emitEvent(uid, ENTRY_DELETE, entity)));
@ -300,7 +303,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
.query(uid) .query(uid)
.load(entity, field, transformLoadParamsToQuery(uid, field, params)); .load(entity, field, transformLoadParamsToQuery(uid, field, params));
return this.wrapResult(loadedEntity); return this.wrapResult(loadedEntity, { uid, action: 'load' });
}, },
async loadPages(uid, entity, field, params = {}, pagination = {}) { async loadPages(uid, entity, field, params = {}, pagination = {}) {
@ -321,7 +324,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
return { return {
...loadedPage, ...loadedPage,
results: await this.wrapResult(loadedPage.results), results: await this.wrapResult(loadedPage.results, { uid, action: 'load' }),
}; };
}, },
}); });