Merge branch 'beta' of https://github.com/OneLiteFeatherNET/vulpes-model into beta

Author: TheMeinerLP

src/main/java/net/onelitefeather/vulpes/api/model/sound/SoundEventEntity.java

@@ -44,7 +44,7 @@ public class SoundEventEntity implements VulpesModel {
      * Represents the list of sound data related to this sound model.
      * This is a one-to-many relationship where each sound model can have multiple sound data entities.
      */
-    @OneToMany(mappedBy = "id")
+    @OneToMany(mappedBy = "soundEvent")
     private List<SoundFileSource> dataEntities;
 
     /**

src/main/java/net/onelitefeather/vulpes/api/repository/FontRepository.java

@@ -2,6 +2,7 @@
 
 import io.micronaut.data.annotation.Query;
 import io.micronaut.data.annotation.Repository;
+import io.micronaut.data.model.Pageable;
 import io.micronaut.data.repository.PageableRepository;
 import net.onelitefeather.vulpes.api.model.FontEntity;
 
@@ -24,8 +25,11 @@ public interface FontRepository extends PageableRepository<FontEntity, UUID> {
      * @param id the unique identifier of the font
      * @return a list of characters associated with the font
      */
-    @Query("SELECT c FROM fonts f JOIN f.chars c WHERE f.id = :id")
-    List<String> findCharsByFontId(UUID id);
+    @Query(
+            value = "SELECT c FROM fonts f JOIN f.chars c WHERE f.id = :id",
+            countQuery = "SELECT COUNT(c) FROM fonts f JOIN f.chars c WHERE f.id = :id"
+    )
+    List<String> findCharsByFontId(UUID id, Pageable pageable);
 
     /**
      * Retrieves all fonts along with their associated characters.

src/main/java/net/onelitefeather/vulpes/api/repository/ItemRepository.java

@@ -2,6 +2,7 @@
 
 import io.micronaut.data.annotation.Query;
 import io.micronaut.data.annotation.Repository;
+import io.micronaut.data.model.Pageable;
 import io.micronaut.data.repository.PageableRepository;
 import net.onelitefeather.vulpes.api.model.ItemEntity;
 
@@ -25,33 +26,42 @@ public interface ItemRepository extends PageableRepository<ItemEntity, UUID> {
      * @param id the unique identifier of the item
      * @return a map of enchantment names and their levels associated with the item
      */
-    @Query("SELECT e FROM items i JOIN i.enchantments e WHERE i.id = :id")
-    Map<String, Short> findEnchantmentsById(UUID id);
+    @Query(value = "SELECT e FROM items i JOIN i.enchantments e WHERE i.id = :id",
+            countQuery = "SELECT count(e) FROM items i JOIN i.enchantments e WHERE i.id = :id"
+    )
+    Map<String, Short> findEnchantmentsById(UUID id, Pageable pageable);
 
     /**
      * Retrieves the lore associated with an item by its ID.
      *
      * @param id the unique identifier of the item
      * @return a list of lore strings associated with the item
      */
-    @Query("SELECT l FROM items i JOIN i.enchantments l WHERE i.id = :id")
-    List<String> findLoreById(UUID id);
+    @Query(value = "SELECT l FROM items i JOIN i.lore l WHERE i.id = :id",
+            countQuery = "SELECT count(l) FROM items i JOIN i.lore l WHERE i.id = :id"
+    )
+    List<String> findLoreById(UUID id, Pageable pageable);
 
     /**
      * Retrieves the flags associated with an item by its ID.
      *
      * @param id the unique identifier of the item
      * @return a list of flags associated with the item
      */
-    @Query("SELECT f FROM items i JOIN i.enchantments f WHERE i.id = :id")
-    List<String> findFlagsById(UUID id);
+    @Query(value = "SELECT f FROM items i JOIN i.flags f WHERE i.id = :id",
+            countQuery = "SELECT count(f) FROM items i JOIN i.flags f WHERE i.id = :id"
+    )
+    List<String> findFlagsById(UUID id, Pageable pageable);
 
 
     /**
      * Retrieves all items along with their associated enchantments, lore, and flags.
      *
      * @return a list of all ItemEntity objects with their enchantments, lore, and flags
      */
-    @Query("SELECT i FROM items i LEFT JOIN FETCH i.enchantments LEFT JOIN FETCH i.lore LEFT JOIN FETCH i.flags")
-    List<ItemEntity> findAllWithFetches();
+    @Query(
+            value = "SELECT i FROM items i LEFT JOIN FETCH i.enchantments LEFT JOIN FETCH i.lore LEFT JOIN FETCH i.flags",
+            countQuery = "SELECT count(i) FROM items i"
+    )
+    List<ItemEntity> findAllWithFetches(Pageable pageable);
 }