Чейнджлог для видов

pom.xml

@@ -30,7 +30,7 @@
 		<java.version>17</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
+		<hypersistence-utils.version>3.9.2</hypersistence-utils.version>
 		<org.springdoc.version>2.6.0</org.springdoc.version>
 		<jjwt.version>0.12.5</jjwt.version>
 		<mapstruct.version>1.6.0.Beta2</mapstruct.version>
@@ -135,6 +135,11 @@
 			<artifactId>commons-io</artifactId>
 			<version>${commons-io.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.hypersistence</groupId>
+			<artifactId>hypersistence-utils-hibernate-63</artifactId>
+			<version>${hypersistence-utils.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/club/ttg/dnd5/domain/book/model/Book.java

@@ -1,7 +1,5 @@
 package club.ttg.dnd5.domain.book.model;
 
-import club.ttg.dnd5.domain.common.model.HasTagEntity;
-import club.ttg.dnd5.domain.common.model.Tag;
 import club.ttg.dnd5.domain.common.model.Timestamped;
 import club.ttg.dnd5.domain.common.model.Translation;
 import jakarta.persistence.*;
@@ -18,7 +16,7 @@
 @Table(name = "books")
 @AllArgsConstructor
 @Builder
-public class Book extends Timestamped implements HasTagEntity {
+public class Book extends Timestamped {
     @Id
     @Column(unique = true, nullable = false)
     private String sourceAcronym;
@@ -46,14 +44,6 @@ public class Book extends Timestamped implements HasTagEntity {
     @Column(name = "author_name") // Column for the author names
     private Set<String> authors = new HashSet<>();
 
-    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
-    @JoinTable(
-            name = "book_tags", // name of the join table
-            joinColumns = @JoinColumn(name = "book_id"), // foreign key for the book
-            inverseJoinColumns = @JoinColumn(name = "tag_id") // foreign key for the tag
-    )
-    private Set<Tag> tags = new HashSet<>(); // Set of tags associated with the book
-
     public Book(String source) {
         this.sourceAcronym = source;
     }

src/main/java/club/ttg/dnd5/domain/book/repository/BookRepository.java

@@ -1,11 +1,8 @@
 package club.ttg.dnd5.domain.book.repository;
 
-import club.ttg.dnd5.domain.common.model.Tag;
 import club.ttg.dnd5.domain.book.model.Book;
 import club.ttg.dnd5.domain.book.model.TypeBook;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -18,6 +15,6 @@ public interface BookRepository extends JpaRepository<Book, String> {
     List<Book> findByType(TypeBook type);
 
     // Метод для поиска книг по тегу
-    @Query("SELECT b FROM Book b JOIN b.tags t WHERE t = :tag")
-    List<Book> findByTags(@Param("tag") Tag tag);
+//    @Query("SELECT b FROM Book b JOIN b.tags t WHERE t = :tag")
+//    List<Book> findByTags(@Param("tag") Tag tag);
 }

src/main/java/club/ttg/dnd5/domain/book/service/BookService.java

@@ -66,13 +66,16 @@ public List<String> getAllBookTypes() {
     public List<BookDetailResponse> getBooksByTag(String tagName) {
         Tag tag = tagRepository.findByNameIgnoreCase(tagName).orElseThrow(() -> new EntityNotFoundException("Tag not found"));
 
-        return bookRepository.findByTags(tag).stream().map(this::convertingEntityToSourceDTO).toList();
+//        return bookRepository.findByTags(tag).stream().map(this::convertingEntityToSourceDTO).toList();
+        return List.of();
     }
 
+
     public List<BookDetailResponse> getBooksByBookTagType() {
         List<Tag> tags = tagRepository.findByTagType(TagType.TAG_BOOK);
 
-        Set<Book> books = tags.stream().flatMap(tag -> tag.getBooks().stream()).collect(Collectors.toSet());
+        Set<Book> books = Set.of();
+//                tags.stream().flatMap(tag -> tag.getBooks().stream()).collect(Collectors.toSet());
 
         return books.stream().map(this::convertingEntityToSourceDTO).toList();
     }
@@ -92,7 +95,6 @@ private Book convertingCreateSourceToEntity(BookDetailResponse sourceBookDto) {
                 .authors(sourceBookDto.getAuthor())
                 .image(sourceBookDto.getImage())
                 .description(sourceBookDto.getDescription())
-                .tags(generatingTags(sourceBookDto.getTags()))
                 .type(TypeBook.parse(sourceBookDto.getType()))
                 .translation(convertingTranslation(sourceBookDto.getTranslation()))
                 .url(sourceBookDto.getUrl())
@@ -118,7 +120,6 @@ private BookDetailResponse convertingEntityToSourceDTO(Book book) {
                 .image(book.getImage())
                 .url(book.getUrl())
                 .description(book.getDescription())
-                .tags(book.getTags().stream().map(Tag::getName).collect(Collectors.toSet()))
                 .type(book.getType().getName())
                 .translation(convertingTranslationToDTO(book.getTranslation())).build();
     }

src/main/java/club/ttg/dnd5/domain/common/model/Tag.java

@@ -1,18 +1,12 @@
 package club.ttg.dnd5.domain.common.model;
 
-import club.ttg.dnd5.domain.book.model.Book;
-import club.ttg.dnd5.domain.species.model.Species;
-import club.ttg.dnd5.domain.species.model.SpeciesFeature;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.util.HashSet;
-import java.util.Set;
-
 @Entity
 @Table(name = "tags")
 @Getter
@@ -31,14 +25,14 @@ public class Tag {
     @Enumerated(EnumType.STRING)
     private TagType tagType;
 
-    @ManyToMany(mappedBy = "tags") // This is the inverse side of the relationship
-    private Set<Book> books; // Set of books associated with the tag
-
-    @ManyToMany(mappedBy = "tags")  // The "tags" field in SpeciesFeature will manage the relationship
-    private Set<SpeciesFeature> speciesFeatures = new HashSet<>();
-
-    @ManyToMany(mappedBy = "tags")
-    private Set<Species> species = new HashSet<>();
+//    @ManyToMany(mappedBy = "tags") // This is the inverse side of the relationship
+//    private Set<Book> books; // Set of books associated with the tag
+//
+//    @ManyToMany(mappedBy = "tags")  // The "tags" field in SpeciesFeature will manage the relationship
+//    private Set<SpeciesFeature> speciesFeatures = new HashSet<>();
+//
+//    @ManyToMany(mappedBy = "tags")
+//    private Set<Species> species = new HashSet<>();
 
     public Tag(String name) {
         this.name = name;

src/main/java/club/ttg/dnd5/domain/species/model/Species.java

@@ -1,15 +1,16 @@
 package club.ttg.dnd5.domain.species.model;
 
-import club.ttg.dnd5.domain.common.model.HasSourceEntity;
-import club.ttg.dnd5.domain.common.model.Tag;
 import club.ttg.dnd5.domain.book.model.Source;
+import club.ttg.dnd5.domain.common.model.HasSourceEntity;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.Cascade;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /**
  Виды или разновидности (расы)
@@ -41,14 +42,6 @@ public class Species extends CreatureProperties implements HasSourceEntity {
     @JoinColumn(name = "source")
     private Source source = new Source();
 
-    /** Тэги */
-    @ManyToMany
-    @JoinTable(
-            name = "species_tags",
-            joinColumns = @JoinColumn(name = "species_id"),
-            inverseJoinColumns = @JoinColumn(name = "tag_id")
-    )
-    private Set<Tag> tags = new HashSet<>();
 
     /** Умения */
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)

src/main/java/club/ttg/dnd5/domain/species/model/SpeciesFeature.java

@@ -2,29 +2,19 @@
 
 import club.ttg.dnd5.domain.common.model.FeatureBase;
 import club.ttg.dnd5.domain.common.model.HasSourceEntity;
-import club.ttg.dnd5.domain.common.model.HasTagEntity;
-import club.ttg.dnd5.domain.common.model.Tag;
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Index;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashSet;
-import java.util.Set;
-
 @Entity
 @Table(
         name = "species_features",
         indexes = {@Index(name = "url_index", columnList = "url")}
 )
 @Getter
 @Setter
-public class SpeciesFeature extends FeatureBase implements HasTagEntity, HasSourceEntity {
+public class SpeciesFeature extends FeatureBase implements HasSourceEntity {
 
-    @ManyToMany(fetch = FetchType.LAZY)
-    @JoinTable(
-            name = "feature_tags",  // Name of the junction table
-            joinColumns = @JoinColumn(name = "feature_id"),  // Foreign key for SpeciesFeature (FeatureBase)
-            inverseJoinColumns = @JoinColumn(name = "tag_id")  // Foreign key for Tag
-    )
-    private Set<Tag> tags = new HashSet<>();
 }

src/main/java/club/ttg/dnd5/domain/species/model/SpeciesSize.java

@@ -1,19 +1,35 @@
 package club.ttg.dnd5.domain.species.model;
 
 import club.ttg.dnd5.domain.common.dictionary.Size;
-import jakarta.persistence.*;
+import io.hypersistence.utils.hibernate.type.array.ListArrayType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.Parameter;
+import org.hibernate.annotations.Type;
 
-import java.util.Collection;
+import java.util.List;
 
 @Getter
 @Setter
 @Embeddable
 public class SpeciesSize {
     /** Размер */
-    @Enumerated(EnumType.STRING)
-    private Collection<Size> size;
+    @Type(
+            value = ListArrayType.class,
+            parameters = {
+                    @Parameter(
+                            name = ListArrayType.SQL_ARRAY_TYPE,
+                            value = "species_size"
+                    )
+            }
+    )
+    @Column(
+            name = "species_size",
+            columnDefinition = "species_size[]"
+    )
+    private List<Size> size;
     /** Размер текстом */
     private String text;
 }

src/main/java/club/ttg/dnd5/domain/species/service/TagService.java

@@ -1,58 +1,50 @@
 package club.ttg.dnd5.domain.species.service;
 
-import club.ttg.dnd5.exception.EntityNotFoundException;
-import club.ttg.dnd5.domain.common.model.Tag;
-import club.ttg.dnd5.domain.species.model.SpeciesFeature;
-import club.ttg.dnd5.domain.species.repository.SpeciesFeatureRepository;
 import club.ttg.dnd5.domain.common.repository.TagRepository;
+import club.ttg.dnd5.domain.species.repository.SpeciesFeatureRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 @Service
 @RequiredArgsConstructor
 public class TagService {
     private final TagRepository tagRepository;
     private final SpeciesFeatureRepository speciesFeatureRepository;
 
-    public Tag createTag(String tagName) {
-        Tag tag = new Tag(tagName);
-        return tagRepository.save(tag);
-    }
-
-    public List<Tag> getAllTags() {
-        return tagRepository.findAll();
-    }
-
-    public Optional<Tag> getTagByName(String name) {
-        return tagRepository.findByNameIgnoreCase(name);
-    }
-
-    // Добавление тега к SpeciesFeature
-    public SpeciesFeature addTagToFeature(String featureId, Long tagId) {
-        SpeciesFeature feature = speciesFeatureRepository.findById(featureId)
-                .orElseThrow(() -> new EntityNotFoundException("Feature not found"));
-        Tag tag = tagRepository.findById(tagId)
-                .orElseThrow(() -> new EntityNotFoundException("Tag not found"));
-        feature.getTags().add(tag);
-        return speciesFeatureRepository.save(feature);
-    }
-
-    // Получить все features по тегу
-    public List<SpeciesFeature> getSpeciesFeaturesByTag(Long tagId) {
-        Tag tag = tagRepository.findById(tagId)
-                .orElseThrow(() -> new EntityNotFoundException("Tag not found"));
-        return tag.getSpeciesFeatures().stream().collect(Collectors.toList());
-    }
-
-    // Получить все теги для Feature
-    public Set<Tag> getTagsForFeature(String featureUrl) {
-        SpeciesFeature feature = speciesFeatureRepository.findById(featureUrl)
-                .orElseThrow(() -> new EntityNotFoundException("Feature not found"));
-        return feature.getTags();
-    }
+//    public Tag createTag(String tagName) {
+//        Tag tag = new Tag(tagName);
+//        return tagRepository.save(tag);
+//    }
+//
+//    public List<Tag> getAllTags() {
+//        return tagRepository.findAll();
+//    }
+//
+//    public Optional<Tag> getTagByName(String name) {
+//        return tagRepository.findByNameIgnoreCase(name);
+//    }
+//
+//    // Добавление тега к SpeciesFeature
+//    public SpeciesFeature addTagToFeature(String featureId, Long tagId) {
+//        SpeciesFeature feature = speciesFeatureRepository.findById(featureId)
+//                .orElseThrow(() -> new EntityNotFoundException("Feature not found"));
+//        Tag tag = tagRepository.findById(tagId)
+//                .orElseThrow(() -> new EntityNotFoundException("Tag not found"));
+//        feature.getTags().add(tag);
+//        return speciesFeatureRepository.save(feature);
+//    }
+//
+//    // Получить все features по тегу
+//    public List<SpeciesFeature> getSpeciesFeaturesByTag(Long tagId) {
+//        Tag tag = tagRepository.findById(tagId)
+//                .orElseThrow(() -> new EntityNotFoundException("Tag not found"));
+//        return tag.getSpeciesFeatures().stream().collect(Collectors.toList());
+//    }
+//
+//    // Получить все теги для Feature
+//    public Set<Tag> getTagsForFeature(String featureUrl) {
+//        SpeciesFeature feature = speciesFeatureRepository.findById(featureUrl)
+//                .orElseThrow(() -> new EntityNotFoundException("Feature not found"));
+//        return feature.getTags();
+//    }
 }