Фильтр проклятых предметов #159 Dev to Main (#162)

Author: Magistrus

src/main/java/club/dnd5/portal/controller/api/item/MagicItemApiController.java

@@ -5,7 +5,7 @@
 import club.dnd5.portal.dto.api.RequestApi;
 import club.dnd5.portal.dto.api.item.MagicItemApi;
 import club.dnd5.portal.dto.api.item.MagicItemDetailApi;
-import club.dnd5.portal.dto.api.item.MagicItemRequesApi;
+import club.dnd5.portal.dto.api.item.MagicItemRequestApi;
 import club.dnd5.portal.dto.api.spells.SearchRequest;
 import club.dnd5.portal.dto.fvtt.export.FCreature;
 import club.dnd5.portal.exception.PageNotFoundException;
@@ -44,7 +44,7 @@ public class MagicItemApiController {
 
 	@Operation(summary = "Получение краткого списка магических предметов и артефактов")
 	@PostMapping(value = "/api/v1/items/magic", produces = MediaType.APPLICATION_JSON_VALUE)
-	public List<MagicItemApi> getItems(@RequestBody MagicItemRequesApi request) {
+	public List<MagicItemApi> getItems(@RequestBody MagicItemRequestApi request) {
 		Specification<MagicItem> specification = null;
 		Optional<RequestApi> optionalRequest = Optional.ofNullable(request);
 		if (!optionalRequest.map(RequestApi::getSearch).map(SearchRequest::getValue).orElse("").isEmpty()) {
@@ -93,6 +93,14 @@ public List<MagicItemApi> getItems(@RequestBody MagicItemRequesApi request) {
 					specification = SpecificationUtil.getAndSpecification(specification, (root, query, cb) -> cb.isNull(root.get("charge")));
 				}
 			}
+			if (!request.getFilter().getCurse().isEmpty()) {
+				if (request.getFilter().getCurse().contains("1")) {
+					specification = SpecificationUtil.getAndSpecification(specification, (root, query, cb) -> cb.equal(root.get("curse"), 1));
+				}
+				if (request.getFilter().getCurse().contains("2")) {
+					specification = SpecificationUtil.getAndSpecification(specification, (root, query, cb) -> cb.equal(root.get("curse"), 0));
+				}
+			}
 		}
 		Pageable pageable = PageAndSortUtil.getPageable(request);
 		return magicItemRepository.findAll(specification, pageable).toList()
@@ -166,6 +174,13 @@ public FilterApi getMagicItemsFilter() {
 		chargeFilter.setValues(values);
 		otherFilters.add(chargeFilter);
 
+		FilterApi curseFilter = new FilterApi("Проклятие", "curse");
+		List<FilterValueApi> curseValues = new ArrayList<>(2);
+		curseValues.add(new FilterValueApi("есть", 1));
+		curseValues.add(new FilterValueApi("нет", 2));
+		curseFilter.setValues(curseValues);
+		otherFilters.add(curseFilter);
+
 		filters.setOther(otherFilters);
 		return filters;
 	}

src/main/java/club/dnd5/portal/dto/api/item/MagicItemFilter.java

@@ -1,15 +1,14 @@
 package club.dnd5.portal.dto.api.item;
 
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.List;
+
 @JsonInclude(Include.NON_NULL)
 
 @NoArgsConstructor
@@ -21,7 +20,8 @@ public class MagicItemFilter {
 	List<String> customization;
 	List<String> consumable;
 	List<String> charge;
-	
+	List<String> curse;
+
 	@JsonProperty("book")
 	private List<String> books;
 }

src/main/java/club/dnd5/portal/dto/api/item/MagicItemRequesApi.java renamed to src/main/java/club/dnd5/portal/dto/api/item/MagicItemRequestApi.java

@@ -13,6 +13,6 @@
 @NoArgsConstructor
 @Getter
 @Setter
-public class MagicItemRequesApi extends RequestApi {
+public class MagicItemRequestApi extends RequestApi {
     public MagicItemFilter filter;
 }

src/main/java/club/dnd5/portal/model/items/MagicItem.java

@@ -42,6 +42,9 @@ public class MagicItem {
 	private boolean consumed;
 	private Integer charge;
 
+	@Column(columnDefinition = "TINYINT")
+	private Boolean curse;
+
 	@Column
 	private Integer cost;
 	private Byte bonus;
@@ -74,10 +77,6 @@ public int getCost() {
 		return consumed ? rarity.getBaseCost() / 2 : rarity.getBaseCost();
 	}
 
-	public int getBaseCost() {
-		return cost;
-	}
-
 	public String getCapitalazeName() {
 		return StringUtils.capitalize(name.toLowerCase());
 	}