From 4c89178111a47c744f5a9ced636fb5fb62aa6d1f Mon Sep 17 00:00:00 2001
From: Kevin Mattutat <kevin.mattutat@spaceparrots.de>
Date: Sun, 25 Apr 2021 15:31:43 +0200
Subject: [PATCH] fix(core): Fixed missing customField input for assets (#844)

---
 packages/core/src/service/services/asset.service.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/service/services/asset.service.ts b/packages/core/src/service/services/asset.service.ts
index 0cfc78e703..c93ca4d7c8 100644
--- a/packages/core/src/service/services/asset.service.ts
+++ b/packages/core/src/service/services/asset.service.ts
@@ -40,6 +40,7 @@ import { AssetEvent } from '../../event-bus/events/asset-event';
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
 import { patchEntity } from '../helpers/utils/patch-entity';
 import { TransactionalConnection } from '../transaction/transactional-connection';
+import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
 
 import { ChannelService } from './channel.service';
 import { RoleService } from './role.service';
@@ -69,6 +70,7 @@ export class AssetService {
         private tagService: TagService,
         private channelService: ChannelService,
         private roleService: RoleService,
+        private customFieldRelationService: CustomFieldRelationService,
     ) {
         this.permittedMimeTypes = this.configService.assetOptions.permittedFileTypes
             .map(val => (/\.[\w]+/.test(val) ? mime.lookup(val) || undefined : val))
@@ -235,10 +237,11 @@ export class AssetService {
     async create(ctx: RequestContext, input: CreateAssetInput): Promise<CreateAssetResult> {
         const { createReadStream, filename, mimetype } = await input.file;
         const stream = createReadStream();
-        const result = await this.createAssetInternal(ctx, stream, filename, mimetype);
+        const result = await this.createAssetInternal(ctx, stream, filename, mimetype, input.customFields);
         if (isGraphQlErrorResult(result)) {
             return result;
         }
+        await this.customFieldRelationService.updateRelations(ctx, Asset, input, result);
         if (input.tags) {
             const tags = await this.tagService.valuesToTags(ctx, input.tags);
             result.tags = tags;
@@ -419,6 +422,7 @@ export class AssetService {
         stream: Stream,
         filename: string,
         mimetype: string,
+        customFields?: { [key: string]: any }
     ): Promise<Asset | MimeTypeError> {
         const { assetOptions } = this.configService;
         if (!this.validateMimeType(mimetype)) {
@@ -454,6 +458,7 @@ export class AssetService {
             source: sourceFileIdentifier,
             preview: previewFileIdentifier,
             focalPoint: null,
+            customFields
         });
         this.channelService.assignToCurrentChannel(asset, ctx);
         return this.connection.getRepository(ctx, Asset).save(asset);