backend
/
nutri-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: backend:fix/filters-endpoint
Branches Tags
backend:main
backend:fix/filters-endpoint
backend:feature/filters-and-search
..
compare: backend:main
Branches Tags
backend:fix/filters-endpoint
backend:feature/filters-and-search
backend:main

No commits in common. "fix/filters-endpoint" and "main" have entirely different histories.
fix/filter ... main

7 changed files with 0 additions and 90 deletions
Show Stats Expand all files Collapse all files

6
src/main/java/ru/oa2/mvp/nutriapi/controller/SupplementController.java
View File

@ -47,12 +47,6 @@ public class SupplementController {
return supplementService.findAll(pageable);
}
@GetMapping("/filters")
@Operation(summary = "Get available filter values (categories, brands, countries)")
public FilterResponse getFilters() {
return supplementService.getFilters();
}
@GetMapping("/{id}")
@Operation(summary = "Get supplement by ID")
public SupplementResponse getById(@PathVariable UUID id) {

10
src/main/java/ru/oa2/mvp/nutriapi/dto/FilterResponse.java
View File

@ -1,10 +0,0 @@
package ru.oa2.mvp.nutriapi.dto;
import java.util.List;
public record FilterResponse(
List<String> categories,
List<String> brands,
List<String> countries
) {
}

10
src/main/java/ru/oa2/mvp/nutriapi/repository/SupplementRepository.java
View File

@ -8,21 +8,11 @@ import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import ru.oa2.mvp.nutriapi.entity.Supplement;
import java.util.List;
import java.util.UUID;
@Repository
public interface SupplementRepository extends JpaRepository<Supplement, UUID> {
@Query("SELECT DISTINCT s.category FROM Supplement s WHERE s.category IS NOT NULL ORDER BY s.category")
List<String> findDistinctCategories();
@Query("SELECT DISTINCT s.brand FROM Supplement s WHERE s.brand IS NOT NULL ORDER BY s.brand")
List<String> findDistinctBrands();
@Query("SELECT DISTINCT s.country FROM Supplement s WHERE s.country IS NOT NULL ORDER BY s.country")
List<String> findDistinctCountries();
Page<Supplement> findByCategory(String category, Pageable pageable);
Page<Supplement> findByBrand(String brand, Pageable pageable);

9
src/main/java/ru/oa2/mvp/nutriapi/service/SupplementService.java
View File

@ -11,7 +11,6 @@ import ru.oa2.mvp.nutriapi.entity.Supplement;
import ru.oa2.mvp.nutriapi.exception.ResourceNotFoundException;
import ru.oa2.mvp.nutriapi.repository.SupplementRepository;
import java.util.List;
import java.util.UUID;
@Service
@ -47,14 +46,6 @@ public class SupplementService {
return toPageResponse(page);
}
@Transactional(readOnly = true)
public FilterResponse getFilters() {
List<String> categories = supplementRepository.findDistinctCategories();
List<String> brands = supplementRepository.findDistinctBrands();
List<String> countries = supplementRepository.findDistinctCountries();
return new FilterResponse(categories, brands, countries);
}
@Transactional(readOnly = true)
public PageResponse<SupplementResponse> search(String query, Pageable pageable) {
Page<Supplement> page = supplementRepository.fullTextSearch(query, pageable);

12
src/test/java/ru/oa2/mvp/nutriapi/NutriApiApplicationTests.java
View File

@ -1,18 +1,15 @@
package ru.oa2.mvp.nutriapi;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@SpringBootTest
@Testcontainers
@EnabledIf("isDockerAvailable")
class NutriApiApplicationTests {
@Container
@ -28,15 +25,6 @@ class NutriApiApplicationTests {
registry.add("spring.datasource.password", postgres::getPassword);
}
static boolean isDockerAvailable() {
try {
DockerClientFactory.instance().client();
return true;
} catch (Exception e) {
return false;
}
}
@Test
void contextLoads() {
}

30
src/test/java/ru/oa2/mvp/nutriapi/controller/SupplementControllerTest.java
View File

@ -159,34 +159,4 @@ class SupplementControllerTest {
.andExpect(status().isOk())
.andExpect(jsonPath("$.content").isArray());
}
@Test
void getFilters_returnsFilterValues() throws Exception {
var filters = new FilterResponse(
List.of("Minerals", "Vitamins"),
List.of("BrandA", "BrandB"),
List.of("France", "USA")
);
when(supplementService.getFilters()).thenReturn(filters);
mockMvc.perform(get("/api/v1/supplements/filters"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.categories").isArray())
.andExpect(jsonPath("$.categories[0]").value("Minerals"))
.andExpect(jsonPath("$.categories[1]").value("Vitamins"))
.andExpect(jsonPath("$.brands[0]").value("BrandA"))
.andExpect(jsonPath("$.countries[0]").value("France"));
}
@Test
void getFilters_returnsEmptyArraysWhenNoData() throws Exception {
var filters = new FilterResponse(List.of(), List.of(), List.of());
when(supplementService.getFilters()).thenReturn(filters);
mockMvc.perform(get("/api/v1/supplements/filters"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.categories").isEmpty())
.andExpect(jsonPath("$.brands").isEmpty())
.andExpect(jsonPath("$.countries").isEmpty());
}
}

13
src/test/java/ru/oa2/mvp/nutriapi/service/SupplementServiceTest.java
View File

@ -177,17 +177,4 @@ class SupplementServiceTest {
assertThat(result.content()).hasSize(1);
}
@Test
void getFilters_returnsDistinctValues() {
when(supplementRepository.findDistinctCategories()).thenReturn(List.of("Minerals", "Vitamins"));
when(supplementRepository.findDistinctBrands()).thenReturn(List.of("BrandA"));
when(supplementRepository.findDistinctCountries()).thenReturn(List.of("USA"));
var result = supplementService.getFilters();
assertThat(result.categories()).containsExactly("Minerals", "Vitamins");
assertThat(result.brands()).containsExactly("BrandA");
assertThat(result.countries()).containsExactly("USA");
}
}