Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/dictionary 검색 기능 개발 #60

Merged
merged 14 commits into from
Jul 14, 2024
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.example.fiurinee.domain.dictionary.controller;

import com.example.fiurinee.domain.dictionary.controller.api.DictionaryApi;
import com.example.fiurinee.domain.dictionary.dto.DictionaryResponseDTO;
import com.example.fiurinee.domain.dictionary.service.DictionaryService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
@RequiredArgsConstructor
public class DictionaryController implements DictionaryApi {
private final DictionaryService dictionaryService;

@Override
public ResponseEntity<List<DictionaryResponseDTO>> getAllFlowers(int page) {
int size = 30; // 한 페이지에 보여줄 꽃의 개수
List<DictionaryResponseDTO> flowers = dictionaryService.getAllFlowers(page, size);
return ResponseEntity.ok(flowers);
}

@Override
public ResponseEntity<List<DictionaryResponseDTO>> searchFlowers(String name) {
List<DictionaryResponseDTO> flowers = dictionaryService.searchFlowersByName(name);
return ResponseEntity.ok(flowers);
}

@Override
public ResponseEntity<Integer> getTotalPages(int size) {
int totalPages = dictionaryService.getTotalPages(size);
return ResponseEntity.ok(totalPages);
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.example.fiurinee.domain.dictionary.controller.api;

import com.example.fiurinee.domain.dictionary.dto.DictionaryResponseDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

@Tag(name = "Dictionary", description = "사전 관련 API")
@RequestMapping("/dictionary")
public interface DictionaryApi {
@Operation(
summary = "모든 꽃 조회",
description = "페이지 단위로 모든 꽃을 조회합니다.",
security = @SecurityRequirement(name = "bearerAuth")
)
@ApiResponse(responseCode = "200", description = "꽃 조회 성공")
@ApiResponse(responseCode = "401", description = "인증 실패")
@GetMapping
ResponseEntity<List<DictionaryResponseDTO>> getAllFlowers(@RequestParam int page);

@Operation(
summary = "꽃 이름으로 검색",
description = "이름에 특정 단어가 포함된 꽃을 검색합니다.",
security = @SecurityRequirement(name = "bearerAuth")
)
@ApiResponse(responseCode = "200", description = "꽃 검색 성공")
@ApiResponse(responseCode = "401", description = "인증 실패")
@GetMapping("/search")
ResponseEntity<List<DictionaryResponseDTO>> searchFlowers(@RequestParam String name);

@Operation(
summary = "총 페이지 수 조회",
description = "전체 꽃 목록의 총 페이지 수를 조회합니다.",
security = @SecurityRequirement(name = "bearerAuth")
)
@ApiResponse(responseCode = "200", description = "총 페이지 수 조회 성공")
@ApiResponse(responseCode = "401", description = "인증 실패")
@GetMapping("/total-pages")
ResponseEntity<Integer> getTotalPages(@RequestParam int size);
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.example.fiurinee.domain.dictionary.dto;

import com.example.fiurinee.domain.flower.entity.Flower;
import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class DictionaryResponseDTO {
private String flower;
private String period;
private String flowerLanguage;
private String explain;
private String image;

public static DictionaryResponseDTO of(Flower flower) {
return DictionaryResponseDTO.builder()
.flower(flower.getName())
.period(String.format("%02d", flower.getPeriod() / 100))
.flowerLanguage(flower.getFlowerLanguage())
.explain(flower.getExplain())
.image(flower.getImage().toString())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.example.fiurinee.domain.dictionary.service;


import com.example.fiurinee.domain.dictionary.dto.DictionaryResponseDTO;
import com.example.fiurinee.domain.flower.entity.Flower;
import com.example.fiurinee.domain.flower.repository.FlowerRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
public class DictionaryService {
private final FlowerRepository flowerRepository;

public List<DictionaryResponseDTO> getAllFlowers(int page, int size) {
PageRequest pageRequest = PageRequest.of(page - 1, size);
List<Flower> flowers = flowerRepository.findDistinctAll(pageRequest);
return flowers.stream()
.map(DictionaryResponseDTO::of)
.collect(Collectors.toList());
}

public List<DictionaryResponseDTO> searchFlowersByName(String name) {
List<Flower> flowers = flowerRepository.findDistinctByNameContaining(name);
return flowers.stream()
.map(DictionaryResponseDTO::of)
.collect(Collectors.toList());
}

public int getTotalPages(int size) {
long count = flowerRepository.countDistinctFlowers();
return (int) Math.ceil((double) count / size);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.example.fiurinee.domain.flower.repository;

import com.example.fiurinee.domain.flower.entity.Flower;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
Expand All @@ -18,4 +20,13 @@ public interface FlowerRepository extends JpaRepository<Flower, Long> {
List<Flower> findByNameAndFlowerLanguage(String name,String flowerLanguage);

List<Flower> findByName(String name);

@Query(value = "SELECT DISTINCT ON (f.name) f.* FROM flower f WHERE f.name LIKE %:name%", nativeQuery = true)
List<Flower> findDistinctByNameContaining(@Param("name") String name);

@Query(value = "SELECT DISTINCT ON (f.name) f.* FROM flower f", nativeQuery = true)
List<Flower> findDistinctAll(Pageable pageable);

@Query(value = "SELECT COUNT(DISTINCT f.name) FROM flower f", nativeQuery = true)
long countDistinctFlowers();
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
.requestMatchers("/oauth2/login", "/login/oauth2/code/**", "/oauth2/authorization/**","/login/oauth2/code/google","/member/*/refresh","/model/test",
"/swagger-ui/index.html", "/swagger-ui/**", "/v3/api-docs/**","/swagger-resources/**", "/v3/api-docs").permitAll()
//비회원 전용 api
.requestMatchers("/main/today","/main/season","/model/ment","/model/*/non").permitAll()
.requestMatchers("/main/today","/main/season","/model/ment","/model/*/non", "/dictionary/**", "dictionary/search/**", "/dictionary", "/dictionary/search", "/dictionary/total-pages", "/dictionary/total-pages/**").permitAll()
//sms api
.requestMatchers("/sms/prove/*","/sms/send").permitAll()
//ALB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class JwtVerifyFilter extends OncePerRequestFilter {
//Swagger
"/swagger-ui/index.html", "/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/v3/api-docs",
//비회원 전용 api
"/main/today","/main/season","/model/ment","/model/*/non",
"/main/today","/main/season","/model/ment","/model/*/non", "/dictionary/**", "dictionary/search/**", "/dictionary", "/dictionary/search", "/dictionary/total-pages", "/dictionary/total-pages/**",
//sms api
"/sms/prove/*","/sms/send",
//ALB
Expand Down
Loading