Refactor utility and DTO to common package

Moved utility and DTO classes to 'common' package for proper structuring and better maintainability. This reflects in all the classes references were updated accordingly. This maintains a consistent and clean structure, aiding in easy navigation and understanding of the package hierarchy and its purpose.

src/main/java/com/thoroldvix/economatic/dto/PaginationInfo.java → src/main/java/com/thoroldvix/economatic/common/dto/PaginationInfo.java

@@ -1,4 +1,4 @@
-package com.thoroldvix.economatic.dto;
+package com.thoroldvix.economatic.common.dto;
 
 import lombok.Builder;
 import org.springframework.data.domain.Page;

src/main/java/com/thoroldvix/economatic/dto/TimeRange.java → src/main/java/com/thoroldvix/economatic/common/dto/TimeRange.java

@@ -1,4 +1,4 @@
-package com.thoroldvix.economatic.dto;
+package com.thoroldvix.economatic.common.dto;
 
 import com.thoroldvix.economatic.error.InvalidTimeRangeException;
 

src/main/java/com/thoroldvix/economatic/util/StringEnumConverter.java → src/main/java/com/thoroldvix/economatic/common/util/StringEnumConverter.java

@@ -1,9 +1,9 @@
-package com.thoroldvix.economatic.util;
+package com.thoroldvix.economatic.common.util;
 
 
 import com.thoroldvix.economatic.error.NotFoundException;
 
-import static com.thoroldvix.economatic.util.ValidationUtils.isNonEmptyString;
+import static com.thoroldvix.economatic.common.util.ValidationUtils.isNonEmptyString;
 
 public final class StringEnumConverter {
 

src/main/java/com/thoroldvix/economatic/util/Utils.java → src/main/java/com/thoroldvix/economatic/common/util/Utils.java

@@ -1,4 +1,4 @@
-package com.thoroldvix.economatic.util;
+package com.thoroldvix.economatic.common.util;
 
 import java.time.Duration;
 import java.time.Instant;

src/main/java/com/thoroldvix/economatic/util/ValidationUtils.java → src/main/java/com/thoroldvix/economatic/common/util/ValidationUtils.java

@@ -1,4 +1,4 @@
-package com.thoroldvix.economatic.util;
+package com.thoroldvix.economatic.common.util;
 
 import java.util.Collection;
 import java.util.Objects;

src/main/java/com/thoroldvix/economatic/deal/ItemDealsServiceImpl.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Objects;
 
-import static com.thoroldvix.economatic.util.ValidationUtils.notEmpty;
+import static com.thoroldvix.economatic.common.util.ValidationUtils.notEmpty;
 
 
 @Service

src/main/java/com/thoroldvix/economatic/goldprice/GoldPriceController.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.goldprice;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
 import com.thoroldvix.economatic.search.SearchRequest;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

src/main/java/com/thoroldvix/economatic/goldprice/GoldPriceMapper.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.goldprice;
 
-import com.thoroldvix.economatic.dto.PaginationInfo;
+import com.thoroldvix.economatic.common.dto.PaginationInfo;
 import com.thoroldvix.economatic.server.Server;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -10,7 +10,7 @@
 
 import java.util.List;
 
-import static com.thoroldvix.economatic.util.ValidationUtils.checkNullAndGet;
+import static com.thoroldvix.economatic.common.util.ValidationUtils.checkNullAndGet;
 
 @Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
 interface GoldPriceMapper {

src/main/java/com/thoroldvix/economatic/goldprice/GoldPricePageResponse.java

@@ -1,7 +1,7 @@
 package com.thoroldvix.economatic.goldprice;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.thoroldvix.economatic.dto.PaginationInfo;
+import com.thoroldvix.economatic.common.dto.PaginationInfo;
 import lombok.Builder;
 
 import java.util.List;

src/main/java/com/thoroldvix/economatic/goldprice/GoldPriceService.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.goldprice;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
 import com.thoroldvix.economatic.search.SearchRequest;
 import jakarta.validation.Valid;
 import org.springframework.data.domain.Pageable;

src/main/java/com/thoroldvix/economatic/goldprice/GoldPriceServiceImpl.java

@@ -1,13 +1,13 @@
 package com.thoroldvix.economatic.goldprice;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
+import com.thoroldvix.economatic.common.util.StringEnumConverter;
 import com.thoroldvix.economatic.search.SearchRequest;
 import com.thoroldvix.economatic.search.SpecificationBuilder;
 import com.thoroldvix.economatic.server.Faction;
 import com.thoroldvix.economatic.server.Region;
 import com.thoroldvix.economatic.server.ServerResponse;
 import com.thoroldvix.economatic.server.ServerService;
-import com.thoroldvix.economatic.util.StringEnumConverter;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.Cacheable;
@@ -23,9 +23,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.thoroldvix.economatic.common.util.ValidationUtils.notEmpty;
 import static com.thoroldvix.economatic.error.ErrorMessages.*;
 import static com.thoroldvix.economatic.server.ServerErrorMessages.*;
-import static com.thoroldvix.economatic.util.ValidationUtils.notEmpty;
 import static java.util.Objects.requireNonNull;
 
 @Service

src/main/java/com/thoroldvix/economatic/goldprice/GoldPriceUpdateService.java

@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.thoroldvix.economatic.util.Utils.elapsedTimeInMillis;
+import static com.thoroldvix.economatic.common.util.Utils.elapsedTimeInMillis;
 
 @Service
 @RequiredArgsConstructor

src/main/java/com/thoroldvix/economatic/item/ItemMapper.java

@@ -1,8 +1,8 @@
 package com.thoroldvix.economatic.item;
 
 
-import com.thoroldvix.economatic.dto.PaginationInfo;
-import com.thoroldvix.economatic.util.StringEnumConverter;
+import com.thoroldvix.economatic.common.dto.PaginationInfo;
+import com.thoroldvix.economatic.common.util.StringEnumConverter;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;

src/main/java/com/thoroldvix/economatic/item/ItemPageResponse.java

@@ -1,7 +1,7 @@
 package com.thoroldvix.economatic.item;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.thoroldvix.economatic.dto.PaginationInfo;
+import com.thoroldvix.economatic.common.dto.PaginationInfo;
 import lombok.Builder;
 
 import java.util.List;

src/main/java/com/thoroldvix/economatic/item/ItemServiceImpl.java

@@ -14,10 +14,10 @@
 
 import java.util.Optional;
 
+import static com.thoroldvix.economatic.common.util.ValidationUtils.notEmpty;
 import static com.thoroldvix.economatic.error.ErrorMessages.PAGEABLE_CANNOT_BE_NULL;
 import static com.thoroldvix.economatic.error.ErrorMessages.SEARCH_REQUEST_CANNOT_BE_NULL;
 import static com.thoroldvix.economatic.item.ItemErrorMessages.ITEM_IDENTIFIER_CANNOT_BE_NULL_OR_EMPTY;
-import static com.thoroldvix.economatic.util.ValidationUtils.notEmpty;
 import static java.util.Objects.requireNonNull;
 
 @Service

src/main/java/com/thoroldvix/economatic/itemprice/ItemPriceController.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.itemprice;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
 import com.thoroldvix.economatic.search.SearchRequest;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

src/main/java/com/thoroldvix/economatic/itemprice/ItemPriceMapper.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.itemprice;
 
-import com.thoroldvix.economatic.dto.PaginationInfo;
+import com.thoroldvix.economatic.common.dto.PaginationInfo;
 import com.thoroldvix.economatic.item.Item;
 import com.thoroldvix.economatic.server.Server;
 import org.mapstruct.Mapper;
@@ -11,7 +11,7 @@
 
 import java.util.List;
 
-import static com.thoroldvix.economatic.util.ValidationUtils.checkNullAndGet;
+import static com.thoroldvix.economatic.common.util.ValidationUtils.checkNullAndGet;
 
 
 @Mapper(componentModel = MappingConstants.ComponentModel.SPRING)

src/main/java/com/thoroldvix/economatic/itemprice/ItemPricePageResponse.java

@@ -1,7 +1,7 @@
 package com.thoroldvix.economatic.itemprice;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.thoroldvix.economatic.dto.PaginationInfo;
+import com.thoroldvix.economatic.common.dto.PaginationInfo;
 import lombok.Builder;
 
 import java.util.List;

src/main/java/com/thoroldvix/economatic/itemprice/ItemPriceService.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.itemprice;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
 import com.thoroldvix.economatic.search.SearchRequest;
 import jakarta.validation.Valid;
 import org.springframework.data.domain.Pageable;

src/main/java/com/thoroldvix/economatic/itemprice/ItemPriceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.thoroldvix.economatic.itemprice;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
+import com.thoroldvix.economatic.common.util.StringEnumConverter;
 import com.thoroldvix.economatic.item.ItemResponse;
 import com.thoroldvix.economatic.item.ItemService;
 import com.thoroldvix.economatic.search.SearchRequest;
@@ -9,7 +10,6 @@
 import com.thoroldvix.economatic.server.Region;
 import com.thoroldvix.economatic.server.ServerResponse;
 import com.thoroldvix.economatic.server.ServerService;
-import com.thoroldvix.economatic.util.StringEnumConverter;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.Cacheable;
@@ -24,11 +24,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.thoroldvix.economatic.common.util.ValidationUtils.isCollectionEmpty;
+import static com.thoroldvix.economatic.common.util.ValidationUtils.notEmpty;
 import static com.thoroldvix.economatic.error.ErrorMessages.*;
 import static com.thoroldvix.economatic.item.ItemErrorMessages.ITEM_IDENTIFIER_CANNOT_BE_NULL_OR_EMPTY;
 import static com.thoroldvix.economatic.server.ServerErrorMessages.*;
-import static com.thoroldvix.economatic.util.ValidationUtils.isCollectionEmpty;
-import static com.thoroldvix.economatic.util.ValidationUtils.notEmpty;
 import static java.util.Objects.requireNonNull;
 
 

src/main/java/com/thoroldvix/economatic/itemprice/ItemPriceUpdateService.java

@@ -18,7 +18,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static com.thoroldvix.economatic.util.Utils.elapsedTimeInMillis;
+import static com.thoroldvix.economatic.common.util.Utils.elapsedTimeInMillis;
 
 
 @Service

src/main/java/com/thoroldvix/economatic/population/PopulationController.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.population;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
 import com.thoroldvix.economatic.search.SearchRequest;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

src/main/java/com/thoroldvix/economatic/population/PopulationMapper.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.population;
 
-import com.thoroldvix.economatic.dto.PaginationInfo;
+import com.thoroldvix.economatic.common.dto.PaginationInfo;
 import com.thoroldvix.economatic.server.Server;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

src/main/java/com/thoroldvix/economatic/population/PopulationPageResponse.java

@@ -1,7 +1,7 @@
 package com.thoroldvix.economatic.population;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.thoroldvix.economatic.dto.PaginationInfo;
+import com.thoroldvix.economatic.common.dto.PaginationInfo;
 import lombok.Builder;
 
 import java.util.List;

src/main/java/com/thoroldvix/economatic/population/PopulationService.java

@@ -1,6 +1,6 @@
 package com.thoroldvix.economatic.population;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
 import com.thoroldvix.economatic.search.SearchRequest;
 import jakarta.validation.Valid;
 import org.springframework.data.domain.Pageable;

src/main/java/com/thoroldvix/economatic/population/PopulationServiceImpl.java

@@ -1,13 +1,13 @@
 package com.thoroldvix.economatic.population;
 
-import com.thoroldvix.economatic.dto.TimeRange;
+import com.thoroldvix.economatic.common.dto.TimeRange;
+import com.thoroldvix.economatic.common.util.StringEnumConverter;
 import com.thoroldvix.economatic.search.SearchRequest;
 import com.thoroldvix.economatic.search.SpecificationBuilder;
 import com.thoroldvix.economatic.server.Faction;
 import com.thoroldvix.economatic.server.Region;
 import com.thoroldvix.economatic.server.ServerResponse;
 import com.thoroldvix.economatic.server.ServerService;
-import com.thoroldvix.economatic.util.StringEnumConverter;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.Cacheable;
@@ -20,9 +20,9 @@
 import java.util.List;
 import java.util.Optional;
 
+import static com.thoroldvix.economatic.common.util.ValidationUtils.notEmpty;
 import static com.thoroldvix.economatic.error.ErrorMessages.*;
 import static com.thoroldvix.economatic.server.ServerErrorMessages.*;
-import static com.thoroldvix.economatic.util.ValidationUtils.notEmpty;
 import static java.util.Objects.requireNonNull;
 
 @Service

src/main/java/com/thoroldvix/economatic/population/PopulationUpdateService.java

@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.thoroldvix.economatic.util.Utils.elapsedTimeInMillis;
+import static com.thoroldvix.economatic.common.util.Utils.elapsedTimeInMillis;
 
 @RequiredArgsConstructor
 @Service

src/main/java/com/thoroldvix/economatic/recommendation/BasicRecommendationService.java

@@ -8,7 +8,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.thoroldvix.economatic.util.ValidationUtils.notLessThan;
+import static com.thoroldvix.economatic.common.util.ValidationUtils.notLessThan;
 import static java.util.Objects.requireNonNull;
 
 @Service

src/main/java/com/thoroldvix/economatic/recommendation/ItemPriceScoreProvider.java

@@ -1,9 +1,9 @@
 package com.thoroldvix.economatic.recommendation;
 
+import com.thoroldvix.economatic.common.util.ValidationUtils;
 import com.thoroldvix.economatic.itemprice.ItemPriceRequest;
 import com.thoroldvix.economatic.itemprice.ItemPriceResponse;
 import com.thoroldvix.economatic.itemprice.ItemPriceService;
-import com.thoroldvix.economatic.util.ValidationUtils;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -34,29 +34,38 @@ public Map<String, BigDecimal> getItemPriceScores(@Valid RecommendationRequest r
         ItemPriceRequest itemPriceRequest = buildItemPriceRequest(request.itemList(), servers);
 
         List<ItemPriceResponse> recentItemPrices = itemPriceServiceImpl.getRecentForItemListAndServers(itemPriceRequest, Pageable.unpaged()).prices();
-        return createScores(request.marketValue(), recentItemPrices, itemWeight);
+
+
+        return request.marketValue()
+                ? createScoresForMarketValue(recentItemPrices, itemWeight)
+                : createScoresForMinBuyout(recentItemPrices, itemWeight);
     }
 
-    private Map<String, BigDecimal> createScores(boolean marketValue, List<ItemPriceResponse> recentItemPrices, BigDecimal itemWeight) {
+    private Map<String, BigDecimal> createScoresForMarketValue(List<ItemPriceResponse> recentItemPrices, BigDecimal itemWeight) {
 
         return recentItemPrices
                 .stream()
                 .collect(Collectors.toMap(ItemPriceResponse::server,
-                        itemPrice -> calculateWeightedValue(determineType(marketValue, itemPrice), itemWeight, MAX_ITEM_PRICE_COPPER),
+                        itemPrice -> calculateWeightedValue(itemPrice.marketValue(), itemWeight, MAX_ITEM_PRICE_COPPER),
                         BigDecimal::add)
                 );
     }
 
-    private static long determineType(boolean marketValue, ItemPriceResponse itemPrice) {
-        return marketValue ? itemPrice.marketValue() : itemPrice.minBuyout();
+    private Map<String, BigDecimal> createScoresForMinBuyout(List<ItemPriceResponse> recentItemPrices, BigDecimal itemWeight) {
+
+        return recentItemPrices
+                .stream()
+                .collect(Collectors.toMap(ItemPriceResponse::server,
+                        itemPrice -> calculateWeightedValue(itemPrice.minBuyout(), itemWeight, MAX_ITEM_PRICE_COPPER),
+                        BigDecimal::add)
+                );
     }
 
     private void validateInputs(RecommendationRequest request, Set<String> servers) {
         Objects.requireNonNull(request, "Recommendation request cannot be null");
         ValidationUtils.notEmpty(servers, () -> new IllegalArgumentException("Servers cannot be null or empty"));
     }
 
-
     private static ItemPriceRequest buildItemPriceRequest(Set<String> itemList, Set<String> servers) {
         return ItemPriceRequest.builder()
                 .itemList(itemList)

src/main/java/com/thoroldvix/economatic/search/SpecificationBuilder.java

@@ -9,9 +9,9 @@
 
 import java.util.List;
 
+import static com.thoroldvix.economatic.common.util.ValidationUtils.isNonEmptyString;
+import static com.thoroldvix.economatic.common.util.ValidationUtils.notEmpty;
 import static com.thoroldvix.economatic.error.ErrorMessages.SEARCH_CRITERIA_CANNOT_BE_NULL_OR_EMPTY;
-import static com.thoroldvix.economatic.util.ValidationUtils.isNonEmptyString;
-import static com.thoroldvix.economatic.util.ValidationUtils.notEmpty;
 
 
 public class SpecificationBuilder {