Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.hyetaekon.hyetaekon.publicservice.controller;

import com.hyetaekon.hyetaekon.publicservice.dto.FilterOptionDto;
import com.hyetaekon.hyetaekon.publicservice.dto.PublicServiceDetailResponseDto;
import com.hyetaekon.hyetaekon.publicservice.dto.PublicServiceListResponseDto;
import com.hyetaekon.hyetaekon.publicservice.service.PublicServiceHandler;
Expand All @@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;


@Validated
Expand All @@ -41,6 +43,11 @@ public ResponseEntity<Page<PublicServiceListResponseDto>> getAllServices(
sort, specialGroups, familyTypes, categories, PageRequest.of(page, size), userId));
}

@GetMapping("/filters")
public ResponseEntity<Map<String, List<FilterOptionDto>>> getFilterOptions() {
return ResponseEntity.ok(publicServiceHandler.getFilterOptions());
}

// 서비스 분야별 공공서비스 목록 조회
/*@GetMapping("/category/{category}")
public ResponseEntity<Page<PublicServiceListResponseDto>> getServicesByCategory (
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.hyetaekon.hyetaekon.publicservice.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@AllArgsConstructor
public class FilterOptionDto {
private String code;
private String label;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.hyetaekon.hyetaekon.bookmark.repository.BookmarkRepository;
import com.hyetaekon.hyetaekon.common.exception.ErrorCode;
import com.hyetaekon.hyetaekon.common.exception.GlobalException;
import com.hyetaekon.hyetaekon.publicservice.dto.FilterOptionDto;
import com.hyetaekon.hyetaekon.publicservice.dto.PublicServiceDetailResponseDto;
import com.hyetaekon.hyetaekon.publicservice.dto.PublicServiceListResponseDto;
import com.hyetaekon.hyetaekon.publicservice.entity.FamilyTypeEnum;
Expand All @@ -21,8 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

@Service
Expand Down Expand Up @@ -200,6 +200,31 @@ public Page<PublicServiceListResponseDto> getAllServices(
});
}

// 기존 코드에 아래 메서드 추가
public Map<String, List<FilterOptionDto>> getFilterOptions() {
Map<String, List<FilterOptionDto>> filterOptions = new HashMap<>();

// 서비스 분야 (카테고리) 옵션
List<FilterOptionDto> categoryOptions = Arrays.stream(ServiceCategory.values())
.map(category -> new FilterOptionDto(category.name(), category.getType()))
.collect(Collectors.toList());
filterOptions.put("categories", categoryOptions);

// 특수 그룹 (가구형태) 옵션
List<FilterOptionDto> specialGroupOptions = Arrays.stream(SpecialGroupEnum.values())
.map(group -> new FilterOptionDto(group.name(), group.getType()))
.collect(Collectors.toList());
filterOptions.put("specialGroups", specialGroupOptions);

// 가족 유형 (가구상황) 옵션
List<FilterOptionDto> familyTypeOptions = Arrays.stream(FamilyTypeEnum.values())
.map(type -> new FilterOptionDto(type.name(), type.getType()))
.collect(Collectors.toList());
filterOptions.put("familyTypes", familyTypeOptions);

return filterOptions;
}

public Page<PublicServiceListResponseDto> getBookmarkedServices(Long userId, Pageable pageable) {
Page<PublicService> bookmarkedServices = publicServiceRepository.findByBookmarks_User_Id(userId, pageable);

Expand Down