Merge branch 'release/4.2.0' into develop

pull/5098/head
Chocobozzz 2022-06-23 11:01:55 +02:00
commit 371d4c6063
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 4 additions and 4 deletions

View File

@ -45,8 +45,9 @@ export class TagModel extends Model<Partial<AttributesOnly<TagModel>>> {
static findOrCreateTags (tags: string[], transaction: Transaction): Promise<MTag[]> {
if (tags === null) return Promise.resolve([])
const tasks: Promise<MTag>[] = []
tags.forEach(tag => {
const uniqueTags = new Set(tags)
const tasks = Array.from(uniqueTags).map(tag => {
const query = {
where: {
name: tag
@ -57,9 +58,8 @@ export class TagModel extends Model<Partial<AttributesOnly<TagModel>>> {
transaction
}
const promise = TagModel.findOrCreate<MTag>(query)
return TagModel.findOrCreate<MTag>(query)
.then(([ tagInstance ]) => tagInstance)
tasks.push(promise)
})
return Promise.all(tasks)