Skip to content

[Refactor] festival-list refact #196

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.

Sign up for GitHub

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

Open
dongmin1009 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[Refactor] festival-list refact #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cff2e5f
[Feat] 페스티벌 리스트 수정
dongmin1009 Feb 20, 2024
8bb999a
Merge pull request #195 from Career-Festival/feature/mainpage
dongmin1009 Feb 20, 2024
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
14 changes: 12 additions & 2 deletions src/main/java/careerfestival/career/mainPage/controller/MainPageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,18 @@ public ResponseEntity<Map<String, Object>> getEventsFilter(
} else { // 로그인 하지 않은 사용자일 경우 (필터링 여부)
if(city !=null || category != null || keywordName != null){ // 필터링이 된 경우
try {
Long regionId = mainPageService.getRegionIdFilter(city, addressLine);
Long regionId = null;
if (city != null) {
regionId = mainPageService.getRegionIdFilter(city, addressLine);
}

// 1. 조회순으로 보여지는 행사 9개
Page<MainPageFestivalListResponseDto> mainPageFestivalListResponseDtos
= mainPageService.getEventsFiltered(category, keywordName, regionId, pageable);
// 2. 조회수에 의한 이벤트명
List<MainPageResponseDto> mainPageResponseDtoNames = mainPageService.getEventNames();
// 3. (219명의 주최자) 정보 입력 공간
int countOrganizer = mainPageService.getOrganizerCount();

// 4. 주최자 정보 페이지 형태 반환
Pageable organizerPageable = PageRequest.of(0, 10, Sort.by("countEvent").descending());
Page<MainPageOrganizerListResponseDto> mainPageOrganizerListDtos = mainPageService.getOrganizers(organizerPageable);
Expand All @@ -234,10 +237,17 @@ public ResponseEntity<Map<String, Object>> getEventsFilter(
List<MainPageResponseDto> mainPageResponseDtoNames = mainPageService.getEventNames();
// 2. 조회수에 의한 정렬 리스트
List<MainPageResponseDto> mainPageResponseDtoViews = mainPageService.getEventsHitsDesc();
// 3. (219명의 주최자) 정보 입력 공간
int countOrganizer = mainPageService.getOrganizerCount();
// 4. 주최자 정보 페이지 형태 반환
Pageable organizerPageable = PageRequest.of(0, 10, Sort.by("countEvent").descending());
Page<MainPageOrganizerListResponseDto> mainPageOrganizerListDtos = mainPageService.getOrganizers(organizerPageable);

Map<String, Object> mainPageResponseDtoObjectMap = new HashMap<>();
mainPageResponseDtoObjectMap.put("eventViews", mainPageResponseDtoViews);
mainPageResponseDtoObjectMap.put("eventNames", mainPageResponseDtoNames);
mainPageResponseDtoObjectMap.put("countOrganizer", countOrganizer);
mainPageResponseDtoObjectMap.put("organizers", mainPageOrganizerListDtos);

return ResponseEntity.ok().body(mainPageResponseDtoObjectMap);
} catch (IllegalArgumentException e) {
Expand Down
23 changes: 1 addition & 22 deletions src/main/java/careerfestival/career/register/service/RegisterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,29 +127,11 @@ public void registerEvent(String email, MultipartFile eventMainImage, MultipartF

try {
if(!eventInformImage.isEmpty()){
// 이미지 리사이징
BufferedImage resizedImage = ImageUtils.resizeImage(eventInformImage, 600, 400);

// BufferedImage를 byte[]로 변환
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ImageIO.write(resizedImage, getFileExtension(eventInformImage.getOriginalFilename()), baos);
byte[] resizedImageBytes = baos.toByteArray();

// byte[]를 MultipartFile로 변환
MultipartFile multipartFile = new MockMultipartFile(
"resized_" + eventInformImage.getOriginalFilename(),
eventInformImage.getOriginalFilename(),
eventInformImage.getContentType(),
resizedImageBytes
);

// S3에 업로드하고 URL 받기
String storedFileName = s3Uploader.upload(multipartFile, "event_inform");

String storedFileName = s3Uploader.upload(eventInformImage, "event_inform");
// 이벤트에 이미지 URL 설정하고 저장
event.setEventInformFileUrl(storedFileName);
organizer.updateCountEvent();
eventRepository.save(event);
} else {
throw new Exception();
}
Expand All @@ -160,9 +142,6 @@ public void registerEvent(String email, MultipartFile eventMainImage, MultipartF
}





// 주최자가 등록한 행사 목록 반환
public Page<RegisterMainResponseDto> getEventList(Long organizerId, Pageable pageable) {
Page<Event> events = eventRepository.findPageByOrganizerId(organizerId, pageable);
Expand Down