diff --git a/src/main/java/ru/soune/nocopy/controller/ApiController.java b/src/main/java/ru/soune/nocopy/controller/ApiController.java index ad12fce..21b2667 100644 --- a/src/main/java/ru/soune/nocopy/controller/ApiController.java +++ b/src/main/java/ru/soune/nocopy/controller/ApiController.java @@ -392,7 +392,7 @@ public class ApiController { FileEntity fileEntity = optionalFileEntity.get(); - Path path = Paths.get(fileEntity.getFilePath()); + Path path = Paths.get(fileEntity.getProtectedFilePath()); File file = path.toFile(); NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file, diff --git a/src/main/java/ru/soune/nocopy/entity/ImageProtection.java b/src/main/java/ru/soune/nocopy/entity/ImageProtection.java deleted file mode 100644 index eef9e95..0000000 --- a/src/main/java/ru/soune/nocopy/entity/ImageProtection.java +++ /dev/null @@ -1,49 +0,0 @@ -package ru.soune.nocopy.entity; - -import jakarta.persistence.*; -import lombok.*; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; - -import java.time.LocalDateTime; - -@Entity -@Table(name = "image_protection") -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@ToString -@EntityListeners(AuditingEntityListener.class) -public class ImageProtection { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long protectionId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id", nullable = false) - @ToString.Exclude - private User user; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "content_id", nullable = false) - @ToString.Exclude - private UserContent content; - - @Column(name = "protection_method", nullable = false, length = 50) - private String protectionMethod; - - @Column(name = "protection_level", nullable = false) - private Integer protectionLevel; - - @Column(name = "is_active", nullable = false) - private Boolean isActive = true; - - @CreatedDate - @Column(name = "applied_at", nullable = false, updatable = false) - private LocalDateTime appliedAt; - - @Column(name = "metadata", columnDefinition = "JSON") - private String metadata; -} diff --git a/src/main/java/ru/soune/nocopy/entity/User.java b/src/main/java/ru/soune/nocopy/entity/User.java index 0841027..b893637 100644 --- a/src/main/java/ru/soune/nocopy/entity/User.java +++ b/src/main/java/ru/soune/nocopy/entity/User.java @@ -84,10 +84,4 @@ public class User { @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) @JsonIgnore @ToString.Exclude - private List violations = new ArrayList<>(); - - @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) - @JsonIgnore - @ToString.Exclude - private List imageProtections = new ArrayList<>(); -} + private List violations = new ArrayList<>();} diff --git a/src/main/java/ru/soune/nocopy/entity/file/FileType.java b/src/main/java/ru/soune/nocopy/entity/file/FileType.java index 8844013..5c17f24 100644 --- a/src/main/java/ru/soune/nocopy/entity/file/FileType.java +++ b/src/main/java/ru/soune/nocopy/entity/file/FileType.java @@ -10,7 +10,7 @@ public enum FileType { IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")), VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg", "3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")), - AUDIO("audio", Arrays.asList("mp3", "wav", "flac")); + AUDIO("audio", List.of("wav")); private final String displayName; private final List allowedExtensions; diff --git a/src/main/java/ru/soune/nocopy/service/file/impl/AudioLocalSearchImpl.java b/src/main/java/ru/soune/nocopy/service/file/impl/AudioLocalSearchImpl.java index 34834e9..6ac96bb 100644 --- a/src/main/java/ru/soune/nocopy/service/file/impl/AudioLocalSearchImpl.java +++ b/src/main/java/ru/soune/nocopy/service/file/impl/AudioLocalSearchImpl.java @@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.springframework.stereotype.Service; +import ru.soune.nocopy.entity.file.FileEntity; import ru.soune.nocopy.service.file.FileEntityService; import ru.soune.nocopy.util.FileUtil; @@ -23,7 +24,9 @@ public class AudioLocalSearchImpl implements AudioLocalSearch { @Override public @Nullable FileProtector.FileInfo findBySignature(@NotNull String signature) { - return fileUtil.createFileInfo(fileEntityService.findBySignature(signature)); + FileEntity fileEntity = fileEntityService.findBySignature(signature); + + return fileUtil.createFileInfo(fileEntity); } @Override