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.

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

refactor: 엑셀 메서드 분리 #1041

Merged
merged 6 commits into from
Dec 11, 2024
+82 −89
Merged

refactor: 엑셀 메서드 분리 #1041

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75bd90c
feat: 엑셀 다운로드 리팩토링
dradnats1012 Nov 17, 2024
1971ecb
feat: 엑셀 다운로드 리팩토링
dradnats1012 Nov 18, 2024
16a772a
refactor: 동시성 제어 어노테이션 삭제
dradnats1012 Nov 18, 2024
840b971
Merge branch 'develop' into refactor/coop-excel-refactor
dradnats1012 Dec 11, 2024
da3b8c7
fix: 리뷰 반영
dradnats1012 Dec 11, 2024
c508138
fix: 주석 삭제
dradnats1012 Dec 11, 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
173 changes: 82 additions & 91 deletions src/main/java/in/koreatech/koin/domain/coop/service/CoopService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.streaming.SXSSFCell;
import org.apache.poi.xssf.streaming.SXSSFRow;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.context.ApplicationEventPublisher;
Expand Down Expand Up @@ -69,8 +67,6 @@ public class CoopService {
private final PasswordEncoder passwordEncoder;
private final JwtProvider jwtProvider;

private final int EXCEL_COLUMN_COUNT = 8;

@Transactional
public void changeSoldOut(SoldOutRequest soldOutRequest) {
Dining dining = diningRepository.getById(soldOutRequest.menuId());
Expand Down Expand Up @@ -120,124 +116,119 @@ public CoopLoginResponse coopLogin(CoopLoginRequest request) {
}

public ByteArrayInputStream generateDiningExcel(LocalDate startDate, LocalDate endDate, Boolean isCafeteria) {
checkDate(startDate, endDate);

List<Dining> dinings;

if (isCafeteria) {
List<String> placeFilters = Arrays.asList("A코너", "B코너", "C코너");
dinings = diningRepository.findByDateBetweenAndPlaceIn(startDate, endDate, placeFilters);
} else {
dinings = diningRepository.findByDateBetween(startDate, endDate);
}
validateDates(startDate, endDate);
List<Dining> dinings = fetchDiningData(startDate, endDate, isCafeteria);

try (SXSSFWorkbook workbook = new SXSSFWorkbook()) {
SXSSFSheet sheet = workbook.createSheet("식단 메뉴");
sheet.setRandomAccessWindowSize(100);

CellStyle headerStyle = makeHeaderStyle(workbook);
CellStyle commonStyle = makeCommonStyle(workbook);
createHeaderCell(sheet, headerStyle);

ByteArrayInputStream result = putDiningData(dinings, sheet, commonStyle, workbook);
SXSSFSheet sheet = createSheet(workbook, "식단 메뉴");
CellStyle headerStyle = createHeaderStyle(workbook);
CellStyle commonStyle = createCommonStyle(workbook);

return result;
addHeaderRow(sheet, headerStyle);
addDiningDataToSheet(dinings, sheet, commonStyle);

return writeWorkbookToStream(workbook);
} catch (IOException e) {
throw new RuntimeException("엑셀 파일 생성 중 오류가 발생했습니다.", e);
}
}

private static void checkDate(LocalDate startDate, LocalDate endDate) {
private void validateDates(LocalDate startDate, LocalDate endDate) {
LocalDate limitDate = LocalDate.of(2022, 11, 29);
LocalDate today = LocalDate.now();

if (startDate.isBefore(limitDate) || endDate.isBefore(limitDate)) {
throw new DiningLimitDateException("2022/11/29 식단부터 다운받을 수 있어요.");
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

limitDate 상수로 빼는건 어떠신가요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

좋은것 같아용 👍


LocalDate now = LocalDate.now();
if (startDate.isAfter(now) || endDate.isAfter(now)) {
if (startDate.isAfter(today) || endDate.isAfter(today)) {
throw new DiningNowDateException("오늘 날짜 이후 기간은 설정할 수 없어요.");
}

if (startDate.isAfter(endDate)) {
throw new StartDateAfterEndDateException("시작일은 종료일 이전으로 설정해주세요.");
throw new StartDateAfterEndDateException("시작일은 종료일 이전으로 설정해주세요");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

점이 다시 빠졌어요!

}
}

private ByteArrayInputStream putDiningData(List<Dining> dinings, SXSSFSheet sheet, CellStyle commonStyle,
SXSSFWorkbook workbook) throws IOException {
AtomicInteger rowIdx = new AtomicInteger(1);
private List<Dining> fetchDiningData(LocalDate startDate, LocalDate endDate, Boolean isCafeteria) {
if (isCafeteria) {
List<String> cafeteriaPlaces = Arrays.asList("A코너", "B코너", "C코너");
return diningRepository.findByDateBetweenAndPlaceIn(startDate, endDate, cafeteriaPlaces);
}
return diningRepository.findByDateBetween(startDate, endDate);
}

private SXSSFSheet createSheet(SXSSFWorkbook workbook, String sheetName) {
SXSSFSheet sheet = workbook.createSheet(sheetName);
sheet.setRandomAccessWindowSize(100);
return sheet;
}

private CellStyle createHeaderStyle(Workbook workbook) {
CellStyle style = workbook.createCellStyle();
Font font = workbook.createFont();
font.setBold(true);
font.setColor(IndexedColors.WHITE.getIndex());
style.setFont(font);
style.setFillForegroundColor(IndexedColors.LIGHT_BLUE.getIndex());
style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setAlignment(HorizontalAlignment.CENTER);
return style;
}

private CellStyle createCommonStyle(Workbook workbook) {
CellStyle style = workbook.createCellStyle();
style.setAlignment(HorizontalAlignment.CENTER);
style.setVerticalAlignment(VerticalAlignment.CENTER);
style.setWrapText(true);
return style;
}

private void addHeaderRow(Sheet sheet, CellStyle headerStyle) {
String[] headers = {"날짜", "타입", "코너", "칼로", "메뉴", "이미지", "품절 여부", "변경 여부"};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오타 있어요. 칼로 -> 칼로리

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

헉 나이스입니다

Row headerRow = sheet.createRow(0);

for (int i = 0; i < headers.length; i++) {
Cell cell = headerRow.createCell(i);
cell.setCellValue(headers[i]);
cell.setCellStyle(headerStyle);
}
}

private void addDiningDataToSheet(List<Dining> dinings, SXSSFSheet sheet, CellStyle commonStyle) {
AtomicInteger rowIndex = new AtomicInteger(1);
dinings.forEach(dining -> {
SXSSFRow row = sheet.createRow(rowIdx.getAndIncrement());
row.createCell(0).setCellValue(dining.getDate().toString());
row.createCell(1).setCellValue(dining.getType().getDiningName());
row.createCell(2).setCellValue(dining.getPlace());
row.createCell(3).setCellValue(dining.getKcal() != null ? dining.getKcal() : 0);

String formattedMenu = dining.getMenu().toString()
.replaceAll("^\\[|\\]$", "")
.replaceAll(", ", "\n");

SXSSFCell menuCell = row.createCell(4);
menuCell.setCellValue(formattedMenu);

row.createCell(5).setCellValue(dining.getImageUrl());
row.createCell(6).setCellValue(
Optional.ofNullable(dining.getSoldOut()).map(Object::toString).orElse("")
);
row.createCell(7).setCellValue(Optional.ofNullable(dining.getIsChanged()).map(Object::toString).orElse(""));

for (int i = 0; i < EXCEL_COLUMN_COUNT; i++) {
row.getCell(i).setCellStyle(commonStyle);
}
Row row = sheet.createRow(rowIndex.getAndIncrement());
fillDiningRow(dining, row, commonStyle);
});

for (int i = 0; i < EXCEL_COLUMN_COUNT; i++) {
for (int i = 0; i < 8; i++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

상수에서 다시 숫자로 돌아온 이유가 있나요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오잉 상수가 없어졋네요

sheet.setColumnWidth(i, 6000);
}

ByteArrayOutputStream out = new ByteArrayOutputStream();
workbook.write(out);
workbook.close();
workbook.dispose();
return new ByteArrayInputStream(out.toByteArray());
}

private void createHeaderCell(Sheet sheet, CellStyle headerStyle) {
Row headerRow = sheet.createRow(0);
headerRow.createCell(0).setCellValue("날짜");
headerRow.createCell(1).setCellValue("타입");
headerRow.createCell(2).setCellValue("코너");
headerRow.createCell(3).setCellValue("칼로리");
headerRow.createCell(4).setCellValue("메뉴");
headerRow.createCell(5).setCellValue("이미지");
headerRow.createCell(6).setCellValue("품절 여부");
headerRow.createCell(7).setCellValue("변경 여부");

for (int i = 0; i < EXCEL_COLUMN_COUNT; i++) {
Cell cell = headerRow.getCell(i);
cell.setCellStyle(headerStyle);
private void fillDiningRow(Dining dining, Row row, CellStyle commonStyle) {
row.createCell(0).setCellValue(dining.getDate().toString());
row.createCell(1).setCellValue(dining.getType().getDiningName());
row.createCell(2).setCellValue(dining.getPlace());
row.createCell(3).setCellValue(Optional.ofNullable(dining.getKcal()).orElse(0));
row.createCell(4).setCellValue(formatMenu(dining.getMenu()));
row.createCell(5).setCellValue(dining.getImageUrl());
row.createCell(6).setCellValue(Optional.ofNullable(dining.getSoldOut()).map(Object::toString).orElse(""));
row.createCell(7).setCellValue(Optional.ofNullable(dining.getIsChanged()).map(Object::toString).orElse(""));

for (int i = 0; i < 8; i++) {
row.getCell(i).setCellStyle(commonStyle);
}
}

private static CellStyle makeCommonStyle(Workbook workbook) {
CellStyle commonStyle = workbook.createCellStyle();
commonStyle.setAlignment(HorizontalAlignment.CENTER);
commonStyle.setVerticalAlignment(VerticalAlignment.CENTER);
commonStyle.setWrapText(true);
return commonStyle;
private String formatMenu(List<String> menu) {
return String.join("\n", menu);
}

private static CellStyle makeHeaderStyle(Workbook workbook) {
CellStyle headerStyle = workbook.createCellStyle();
Font font = workbook.createFont();
font.setBold(true);
font.setColor(IndexedColors.WHITE.getIndex());
headerStyle.setFont(font);
headerStyle.setFillForegroundColor(IndexedColors.LIGHT_BLUE.getIndex());
headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
headerStyle.setAlignment(HorizontalAlignment.CENTER);
return headerStyle;
private ByteArrayInputStream writeWorkbookToStream(SXSSFWorkbook workbook) throws IOException {
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
workbook.write(out);
workbook.dispose();
return new ByteArrayInputStream(out.toByteArray());
}
}
}
Loading