icons bug
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { Entity, Index, Property, Collection, OneToMany } from '@mikro-orm/core';
|
||||
import { Entity, Index, Property, Collection, OneToMany, Cascade } from '@mikro-orm/core';
|
||||
import { BaseEntity } from '../../../common/entities/base.entity';
|
||||
import { Icon } from './icon.entity';
|
||||
|
||||
@@ -7,6 +7,9 @@ export class Group extends BaseEntity {
|
||||
@Property()
|
||||
name!: string;
|
||||
|
||||
@OneToMany(() => Icon, icon => icon.group)
|
||||
@OneToMany(() => Icon, icon => icon.group,{
|
||||
cascade: [Cascade.ALL],
|
||||
orphanRemoval: true,
|
||||
})
|
||||
icons = new Collection<Icon>(this);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ export class GroupService {
|
||||
constructor(
|
||||
private readonly groupRepository: GroupRepository,
|
||||
private readonly em: EntityManager,
|
||||
) {}
|
||||
) { }
|
||||
|
||||
async create(dto: CreateGroupDto): Promise<Group> {
|
||||
const data: RequiredEntityData<Group> = {
|
||||
@@ -47,12 +47,11 @@ export class GroupService {
|
||||
}
|
||||
|
||||
async remove(id: string): Promise<void> {
|
||||
const group = await this.groupRepository.findOne({ id });
|
||||
const group = await this.groupRepository.findOne({ id }, { populate: ['icons'] });
|
||||
if (!group) {
|
||||
throw new NotFoundException(GroupMessage.NOT_FOUND);
|
||||
}
|
||||
group.deletedAt = new Date();
|
||||
await this.em.persistAndFlush(group);
|
||||
await this.em.removeAndFlush(group);
|
||||
}
|
||||
|
||||
findAllPublic(): Promise<Group[]> {
|
||||
|
||||
@@ -70,8 +70,7 @@ export class IconService {
|
||||
if (!icon) {
|
||||
throw new NotFoundException(IconMessage.NOT_FOUND);
|
||||
}
|
||||
icon.deletedAt = new Date();
|
||||
await this.em.persistAndFlush(icon);
|
||||
await this.em.removeAndFlush(icon);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user