diff --git a/apps/api/src/app/account/account.service.ts b/apps/api/src/app/account/account.service.ts index b74197ae2..f84f085a3 100644 --- a/apps/api/src/app/account/account.service.ts +++ b/apps/api/src/app/account/account.service.ts @@ -128,7 +128,7 @@ export class AccountService { aUserId: string, tagIds?: string[] ): Promise { - await this.tagService.validateTagIds(tagIds, aUserId); + await this.tagService.validateTagIds({ tagIds, userId: aUserId }); const account = await this.prismaService.account.create({ data: { @@ -268,7 +268,7 @@ export class AccountService { ): Promise { const { data, where } = params; - await this.tagService.validateTagIds(tagIds, aUserId); + await this.tagService.validateTagIds({ tagIds, userId: aUserId }); const account = await this.prismaService.account.update({ data: { diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.ts index 3cb1b97ed..539c05c66 100644 --- a/apps/api/src/app/activities/activities.service.ts +++ b/apps/api/src/app/activities/activities.service.ts @@ -109,12 +109,12 @@ export class ActivitiesService { tags, userId }: { tags: Tag[]; userId: string } & AssetProfileIdentifier) { - await this.tagService.validateTagIds( - tags.map(({ id }) => { + await this.tagService.validateTagIds({ + userId, + tagIds: tags.map(({ id }) => { return id; - }), - userId - ); + }) + }); const activities = await this.prismaService.order.findMany({ where: { @@ -164,12 +164,12 @@ export class ActivitiesService { ): Promise { const tags = data.tags ?? []; - await this.tagService.validateTagIds( - tags.map(({ id }) => { + await this.tagService.validateTagIds({ + tagIds: tags.map(({ id }) => { return id; }), - data.userId - ); + userId: data.userId + }); let account: Prisma.AccountCreateNestedOneWithoutActivitiesInput; @@ -965,12 +965,12 @@ export class ActivitiesService { }): Promise { const tags = data.tags ?? []; - await this.tagService.validateTagIds( - tags.map(({ id }) => { + await this.tagService.validateTagIds({ + userId, + tagIds: tags.map(({ id }) => { return id; - }), - userId - ); + }) + }); if (!data.comment) { data.comment = null; diff --git a/apps/api/src/services/tag/tag.service.ts b/apps/api/src/services/tag/tag.service.ts index f2d7c718b..38fb90a69 100644 --- a/apps/api/src/services/tag/tag.service.ts +++ b/apps/api/src/services/tag/tag.service.ts @@ -126,7 +126,13 @@ export class TagService { }); } - public async validateTagIds(tagIds: string[], userId: string) { + public async validateTagIds({ + tagIds, + userId + }: { + tagIds: string[]; + userId: string; + }) { if (!tagIds?.length) { return; }