diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/OperatorMarketServiceConfiguration.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/OperatorMarketServiceConfiguration.java index e05a2bd4..1e0e5c7f 100644 --- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/OperatorMarketServiceConfiguration.java +++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/OperatorMarketServiceConfiguration.java @@ -13,10 +13,9 @@ @Configuration @EnableAsync @EnableScheduling -@EntityScan(basePackages = "com.datamate.operator.domain.modal") +@EntityScan(basePackages = "com.datamate.operator.domain.model") @ComponentScan(basePackages = { - "com.datamate.operator", - "com.datamate.shared" + "com.datamate.operator" }) public class OperatorMarketServiceConfiguration { // Service configuration class for JAR packaging diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/CategoryService.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/CategoryService.java index 45da8d8b..77f9c631 100644 --- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/CategoryService.java +++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/CategoryService.java @@ -1,10 +1,10 @@ package com.datamate.operator.application; -import com.datamate.operator.domain.modal.Category; -import com.datamate.operator.domain.modal.CategoryRelation; -import com.datamate.operator.infrastructure.persistence.mapper.CategoryMapper; -import com.datamate.operator.infrastructure.persistence.mapper.CategoryRelationMapper; +import com.datamate.operator.domain.repository.CategoryRelationRepository; +import com.datamate.operator.domain.repository.CategoryRepository; +import com.datamate.operator.interfaces.dto.CategoryDto; +import com.datamate.operator.interfaces.dto.CategoryRelationDto; import com.datamate.operator.interfaces.dto.CategoryTreeResponse; import com.datamate.operator.interfaces.dto.SubCategory; import lombok.RequiredArgsConstructor; @@ -18,30 +18,30 @@ @Service @RequiredArgsConstructor public class CategoryService { - private final CategoryMapper categoryMapper; + private final CategoryRepository categoryRepo; - private final CategoryRelationMapper categoryRelationMapper; + private final CategoryRelationRepository categoryRelationRepo; public List getAllCategories() { - List allCategories = categoryMapper.findAllCategories(); - List allRelations = categoryRelationMapper.findAllRelation(); + List allCategories = categoryRepo.findAllCategories(); + List allRelations = categoryRelationRepo.findAllRelation(); Map relationMap = allRelations.stream() .collect(Collectors.groupingBy( - CategoryRelation::getCategoryId, + CategoryRelationDto::getCategoryId, Collectors.collectingAndThen(Collectors.counting(), Math::toIntExact))); Map nameMap = allCategories.stream() - .collect(Collectors.toMap(Category::getId, Category::getName)); - Map> groupedByParentId = allCategories.stream() + .collect(Collectors.toMap(CategoryDto::getId, CategoryDto::getName)); + Map> groupedByParentId = allCategories.stream() .filter(relation -> relation.getParentId() > 0) - .collect(Collectors.groupingBy(Category::getParentId)); + .collect(Collectors.groupingBy(CategoryDto::getParentId)); return groupedByParentId.entrySet().stream() .sorted(Map.Entry.comparingByKey()) .map(entry -> { Integer parentId = entry.getKey(); - List group = entry.getValue(); + List group = entry.getValue(); CategoryTreeResponse response = new CategoryTreeResponse(); response.setId(parentId); response.setName(nameMap.get(parentId)); diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/LabelService.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/LabelService.java index cba6ce41..f9fe8be1 100644 --- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/LabelService.java +++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/LabelService.java @@ -1,21 +1,20 @@ package com.datamate.operator.application; -import com.datamate.operator.interfaces.dto.Label; -import com.datamate.operator.interfaces.dto.*; +import com.datamate.operator.interfaces.dto.LabelDto; import org.springframework.stereotype.Service; import java.util.List; import java.util.Collections; @Service public class LabelService { - public List