Багфикс классов

TTG-Club · Mar 3, 2025 · 80b6687 · 80b6687
1 parent c208fa8
commit 80b6687
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/club/ttg/dnd5/domain/clazz/rest/mapper/ClassMapper.java b/src/main/java/club/ttg/dnd5/domain/clazz/rest/mapper/ClassMapper.java
@@ -19,12 +19,16 @@ public interface ClassMapper {
     @Mapping(source = "name", target = "name.name")
     @Mapping(source = "english", target = "name.english")
     @Mapping(source = "hitDice", target = "hitDice", qualifiedByName = "diceToString")
+    @Mapping(source = "source.name", target = "source.group.name")
+    @Mapping(source = "source.sourceAcronym", target = "source.name.name")
     ClassShortResponse toShortDto(ClassCharacter entity);
 
     @Mapping(source = "name", target = "name.name")
     @Mapping(source = "english", target = "name.english")
     @Mapping(source = "mainAbility", target = "mainAbility", qualifiedByName = "abilityToString")
     @Mapping(source = "hitDice", target = "hitDice", qualifiedByName = "diceToString")
+    @Mapping(source = "source.name", target = "source.group.name")
+    @Mapping(source = "source.sourceAcronym", target = "source.name.name")
     ClassDetailResponse toDetailDto(ClassCharacter entity);
 
     @Mapping(source = "name.name", target = "name")

diff --git a/src/main/java/club/ttg/dnd5/domain/item/model/Item.java b/src/main/java/club/ttg/dnd5/domain/item/model/Item.java
@@ -8,6 +8,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.awt.print.Book;
 import java.util.Set;
 
 @Getter
@@ -20,7 +21,7 @@
         @Index(name = "url_index", columnList = "url"),
         @Index(name = "name_index", columnList = "name, english, alternative")
 })
-public class Item extends NamedEntity implements HasSourceEntity {
+public class Item extends NamedEntity {
     @ElementCollection(targetClass = ItemType.class)
     @Enumerated(EnumType.STRING)
     private Set<ItemType> types;