@punks/backend-entity-manager 0.0.457 → 0.0.459

package/dist/cjs/types/abstractions/actions.d.ts

@@ -19,6 +19,11 @@ export interface IEntitiesDeleteAction<TEntity, TEntitiesDeleteParameters extend
 export interface IEntityGetAction<TEntity, TEntityId, TEntityDto> {
     execute(id: TEntityId): Promise<TEntityDto | undefined>;
 }
+export interface IEntityGetAction<TEntity, TEntityId, TEntityDto> {
+    execute(id: TEntityId, options?: {
+        relations?: string[];
+    }): Promise<TEntityDto | undefined>;
+}
 export interface IEntityExistsAction<TEntity, TEntityFilters extends ISearchFilters> {
     execute(filters: TEntityFilters): Promise<boolean>;
 }

package/dist/cjs/types/abstractions/commands.d.ts

@@ -49,7 +49,7 @@ export interface IEntitiesSampleDownloadCommand<TEntity> {
 }
 export interface IEntityUpsertByParameters<TEntity, TEntityFilters extends ISearchFilters> {
     filter: TEntityFilters;
-    data: Partial<Omit<TEntity, "id">>;
+    data: Partial<TEntity>;
 }
 export interface IEntityUpsertByResult {
     id: string;

package/dist/cjs/types/abstractions/files.d.ts

@@ -5,6 +5,8 @@ export type FileData = {
     contentType: string;
     fileName: string;
     folderPath: string;
+    storageFilePath?: string;
+    storageBucket?: string;
     metadata?: Record<string, any>;
 };
 export type FileDownloadUrl = {
@@ -50,12 +52,15 @@ export interface IFilesReferenceRepository {
 }
 export type FileProviderReference = {
     reference: string;
+    bucket?: string;
 };
 export type FileProviderUploadData = {
     fileId?: string;
     fileName: string;
+    filePath?: string;
     content: Buffer;
     contentType: string;
+    bucket?: string;
 };
 export type FileProviderDownloadData = {
     content: Buffer;

package/dist/cjs/types/platforms/nest/plugins/buckets/aws-s3/provider/files.d.ts

@@ -9,5 +9,6 @@ export declare class AwsS3FileProvider implements IFileProvider {
     downloadFile(reference: FileProviderReference): Promise<FileProviderDownloadData>;
     getFileProviderDownloadUrl(reference: FileProviderReference): Promise<FileProviderDownloadUrl>;
     private getBucketFileUploadPath;
+    private getBucketFileUploadDayPath;
     get defaultBucket(): string;
 }

package/dist/esm/index.js

@@ -22994,6 +22994,8 @@ let FilesManager = class FilesManager {
             content: file.content,
             contentType: file.contentType,
             fileName: file.fileName,
+            filePath: file.storageFilePath,
+            bucket: file.storageBucket,
         });
         const record = await this.referencesRepo.createReference({
             fileId: file.fileId,
@@ -35824,9 +35826,11 @@ let AwsS3FileProvider = class AwsS3FileProvider {
         return "awsS3";
     }
     async uploadFile(file) {
-        const path = this.getBucketFileUploadPath(file.fileName, new Date());
+        const path = file.filePath
+            ? this.getBucketFileUploadPath(file.fileName, file.filePath)
+            : this.getBucketFileUploadDayPath(file.fileName, new Date());
         await this.bucket.fileUpload({
-            bucket: this.defaultBucket,
+            bucket: file.bucket ?? this.defaultBucket,
             filePath: path,
             content: file.content,
             contentType: file.contentType,
@@ -35837,13 +35841,13 @@ let AwsS3FileProvider = class AwsS3FileProvider {
     }
     async deleteFile(reference) {
         await this.bucket.fileDelete({
-            bucket: this.defaultBucket,
+            bucket: reference.bucket ?? this.defaultBucket,
             filePath: reference.reference,
         });
     }
     async downloadFile(reference) {
         const content = await this.bucket.fileDownload({
-            bucket: this.defaultBucket,
+            bucket: reference.bucket ?? this.defaultBucket,
             filePath: reference.reference,
         });
         return {
@@ -35852,7 +35856,7 @@ let AwsS3FileProvider = class AwsS3FileProvider {
     }
     async getFileProviderDownloadUrl(reference) {
         const url = await this.bucket.filePublicUrlCreate({
-            bucket: this.defaultBucket,
+            bucket: reference.bucket ?? this.defaultBucket,
             expirationMinutes: awsBucketSettings.value.publicLinksExpirationMinutes,
             filePath: reference.reference,
         });
@@ -35860,7 +35864,10 @@ let AwsS3FileProvider = class AwsS3FileProvider {
             downloadUrl: url,
         };
     }
-    getBucketFileUploadPath(fileName, date) {
+    getBucketFileUploadPath(fileName, filePath) {
+        return `${ensureTailingSlash(filePath)}${ensureStartSlash(fileName)}`;
+    }
+    getBucketFileUploadDayPath(fileName, date) {
         return `${ensureTailingSlash(awsBucketSettings.value.paths.filesUpload)}${createDayPath(date)}${ensureStartSlash(newUuid$1())}_${fileName}`;
     }
     get defaultBucket() {