Commit f0ab43f0 authored by Patrik Tomov's avatar Patrik Tomov
Browse files

Fixed task delete

parent 89739ddf

backend/src/main/java/cz/fidentis/web/fileupload/FileUpload.java

+2 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class FileUpload extends BaseEntity { 
    @JoinColumn(name = "face_info_id", referencedColumnName = "id")

    private FaceInfo faceInfo;



    @ManyToMany(mappedBy = "fileUploads")

    @ManyToMany(mappedBy = "fileUploads", fetch = FetchType.LAZY)

    @JsonIgnore

    private Collection<Task> tasks = new ArrayList<>();
@@ -66,7 +66,7 @@ public class FileUpload extends BaseEntity { 
    @JsonIgnore

    private FileData fileData;



    @ManyToMany(mappedBy = "fileUploads")

    @ManyToMany(mappedBy = "fileUploads", fetch = FetchType.LAZY)

    @JsonIgnore

    private Collection<HumanFaceEntity> humanFaceEntities = new ArrayList<>();
@@ -79,7 +79,6 @@ public class FileUpload extends BaseEntity { 
        if (this.humanFaceEntities == null) {

            this.humanFaceEntities = new ArrayList<>();

        }

        this.humanFaceEntities.size();

        this.humanFaceEntities.add(humanFaceEntity);

        humanFaceEntity.getFileUploads().add(this);

    }

backend/src/main/java/cz/fidentis/web/humanface/HumanFaceEntity.java

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public class HumanFaceEntity extends BaseEntity { 
    }



    @Lob

    @JsonIgnore

    private byte[] humanFaceDump;



    @Transient

backend/src/main/java/cz/fidentis/web/task/TaskServiceImpl.java

+0 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import org.springframework.scheduling.annotation.Async; 
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import java.util.Collection;

import java.util.List;

import java.util.Optional;
@@ -128,11 +127,6 @@ public class TaskServiceImpl implements TaskService { 
        log.info("Deleting task with id: {}", id);

        Task task = taskRepo.findById(id)

                .orElseThrow(() -> new EntityNotFoundException("Task with id: %s does not exist".formatted(id)));

        task.getFileUploads().forEach(file -> {

            Collection<Task> tasks = file.getTasks();

            tasks.remove(task);

            em.clear();

        });

        taskRepo.delete(task);

    }