From e1301f007b87c9e2b3fa07cee09b111746ecf68d Mon Sep 17 00:00:00 2001 From: "Gu://em_" Date: Sat, 4 Apr 2026 00:01:13 +0200 Subject: [PATCH] trop tard --- .../yakamon/data/model/ItemModel.java | 30 +++++++++++++++++-- .../yakamon/domain/service/GameService.java | 4 +-- .../yakamon/domain/service/PlayerService.java | 10 +++---- .../presentation/rest/InventoryResource.java | 6 ++-- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/yakamon/src/main/java/fr/epita/assistants/yakamon/data/model/ItemModel.java b/yakamon/src/main/java/fr/epita/assistants/yakamon/data/model/ItemModel.java index ff1a256..e71d104 100644 --- a/yakamon/src/main/java/fr/epita/assistants/yakamon/data/model/ItemModel.java +++ b/yakamon/src/main/java/fr/epita/assistants/yakamon/data/model/ItemModel.java @@ -9,10 +9,34 @@ public class ItemModel { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - protected Integer id; + private Integer id; @Enumerated - public ItemType type; + private ItemType type; - public Integer quantity; + private Integer quantity; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public ItemType getType() { + return type; + } + + public void setType(ItemType type) { + this.type = type; + } + + public Integer getQuantity() { + return quantity; + } + + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } } diff --git a/yakamon/src/main/java/fr/epita/assistants/yakamon/domain/service/GameService.java b/yakamon/src/main/java/fr/epita/assistants/yakamon/domain/service/GameService.java index 0d4fd1c..29abf6e 100644 --- a/yakamon/src/main/java/fr/epita/assistants/yakamon/domain/service/GameService.java +++ b/yakamon/src/main/java/fr/epita/assistants/yakamon/domain/service/GameService.java @@ -59,8 +59,8 @@ public class GameService { // Initialize player inventory ItemModel yakaballs = new ItemModel(); - yakaballs.type = ItemType.YAKABALL; - yakaballs.quantity = 5; + yakaballs.setType(ItemType.YAKABALL); + yakaballs.setQuantity(5); // Store playerRepository.persist(player); diff --git a/yakamon/src/main/java/fr/epita/assistants/yakamon/domain/service/PlayerService.java b/yakamon/src/main/java/fr/epita/assistants/yakamon/domain/service/PlayerService.java index d8bd07c..954eea4 100644 --- a/yakamon/src/main/java/fr/epita/assistants/yakamon/domain/service/PlayerService.java +++ b/yakamon/src/main/java/fr/epita/assistants/yakamon/domain/service/PlayerService.java @@ -145,7 +145,7 @@ public class PlayerService { ItemModel yakaballItem = itemRepository .find("type", ItemType.YAKABALL) .firstResult(); - if (yakaballItem == null || yakaballItem.quantity < 1) { + if (yakaballItem == null || yakaballItem.getQuantity() < 1) { throw new WebApplicationException( Response.status(400).entity("Not enough Yakaballs").build() ); @@ -170,7 +170,7 @@ public class PlayerService { ErrorCode.BAD_REQUEST.throwException("Yakamon species not found"); } - yakaballItem.quantity -= 1; + yakaballItem.setQuantity(yakaballItem.getQuantity() - 1); itemRepository.persist(yakaballItem); YakamonModel newYakamon = new YakamonModel(); @@ -342,11 +342,11 @@ public class PlayerService { .firstResult(); if (item == null) { item = new ItemModel(); - item.type = itemType; - item.quantity = 1; + item.setType(itemType); + item.setQuantity(1); itemRepository.persist(item); } else { - item.quantity += 1; + item.setQuantity(item.getQuantity() + 1); itemRepository.persist(item); } } diff --git a/yakamon/src/main/java/fr/epita/assistants/yakamon/presentation/rest/InventoryResource.java b/yakamon/src/main/java/fr/epita/assistants/yakamon/presentation/rest/InventoryResource.java index ff1c655..c8af0e9 100644 --- a/yakamon/src/main/java/fr/epita/assistants/yakamon/presentation/rest/InventoryResource.java +++ b/yakamon/src/main/java/fr/epita/assistants/yakamon/presentation/rest/InventoryResource.java @@ -41,10 +41,10 @@ public class InventoryResource { for (ItemModel item : items) { GetInventoryResponse.Items responseItem = temp.new Items(); GetInventoryResponse.ItemType itemType = temp.new ItemType(); - itemType.type = item.type.name(); - itemType.value = item.type.name(); + itemType.type = item.getType().name(); + itemType.value = item.getType().name(); responseItem.itemType = itemType; - responseItem.quantity = item.quantity; + responseItem.quantity = item.getQuantity(); responseItems.add(responseItem); }