@punks/backend-entity-manager 0.0.459 → 0.0.461

package/dist/cjs/index.js

@@ -689,7 +689,9 @@ class EntityUpdateAction {
         await this.services
             .resolveUpdateCommand()
             .execute(id, updateInput);
-        const entity = await this.services.resolveGetQuery().execute(id);
+        const entity = await this.services
+            .resolveGetQuery()
+            .execute(id);
         if (!entity) {
             throw new Error(`Newly created entity not found with id ${id}`);
         }
@@ -721,7 +723,9 @@ class EntityUpsertAction {
         await this.services
             .resolveUpsertCommand()
             .execute(id, updateInput);
-        const entity = await this.services.resolveGetQuery().execute(id);
+        const entity = await this.services
+            .resolveGetQuery()
+            .execute(id);
         if (!entity) {
             throw new Error(`Newly created entity not found with id ${id}`);
         }
@@ -2308,11 +2312,11 @@ class EntityGetQuery {
     constructor(services) {
         this.services = services;
     }
-    async execute(id) {
+    async execute(id, options) {
         const context = await this.getContext();
         const entity = await this.services
             .resolveQueryBuilder()
-            .get(id, context);
+            .get(id, context, options);
         if (entity) {
             await this.authorize(entity);
         }
@@ -2346,11 +2350,14 @@ class EntitiesSearchQuery {
     constructor(services) {
         this.services = services;
     }
-    async execute(request) {
+    async execute(request, options) {
         const context = await this.getContext();
         await this.authorizeSearch(context);
         const queryBuilder = this.services.resolveQueryBuilder();
-        const result = await queryBuilder.search(request, context);
+        const result = await queryBuilder.search({
+            ...request,
+            relations: options?.relations ?? request.relations,
+        }, context);
         const filteredEntities = await this.filterAllowedEntities(result.items, context);
         return {
             ...result,
@@ -3830,9 +3837,10 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
         this.clause = new QueryClauseBuilder();
         this.permissions = new PermissionsChecker();
     }
-    async get(id, context) {
+    async get(id, context, options) {
         return await this.getRepository().get(id, {
-            relations: this.getRelationsToLoad(undefined, context, exports.QueryBuilderOperation.Get),
+            relations: options?.relations ??
+                this.getRelationsToLoad(undefined, context, exports.QueryBuilderOperation.Get),
         });
     }
     async exists(filters, context) {
@@ -35880,7 +35888,7 @@ let AwsS3FileProvider = class AwsS3FileProvider {
         };
     }
     getBucketFileUploadPath(fileName, filePath) {
-        return `${backendCore.ensureTailingSlash(filePath)}${backendCore.ensureStartSlash(fileName)}`;
+        return `${backendCore.ensureTailingSlash(filePath)}${fileName}`;
     }
     getBucketFileUploadDayPath(fileName, date) {
         return `${backendCore.ensureTailingSlash(awsBucketSettings.value.paths.filesUpload)}${createDayPath(date)}${backendCore.ensureStartSlash(backendCore.newUuid())}_${fileName}`;