Add 'MonitoringResult' Object for combine monitoring time and monitoring results

Author: Dokyeongyun

src/main/java/root/core/domain/MonitoringResult.java

@@ -0,0 +1,37 @@
+package root.core.domain;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import root.utils.DateUtils;
+
+@AllArgsConstructor
+@Data
+public class MonitoringResult<T> {
+	private Date monitoringDate;
+	private List<T> monitoringResults;
+	
+	public MonitoringResult(List<T> monitoringResults) {
+		this.monitoringDate = new Date();
+		this.monitoringResults = monitoringResults;
+	}
+	
+	public String getMonitoringDay() {
+		if(monitoringDate == null) {
+			return null;
+		}
+		
+		return DateUtils.format(monitoringDate, "yyyyMMdd");
+	}
+	
+	public String getMonitoringTime() {
+		if(monitoringDate == null) {
+			return null;
+		}
+
+		return DateUtils.format(monitoringDate, "HHmmss");
+	}
+}

src/main/java/root/utils/DateUtils.java

@@ -159,4 +159,15 @@ public static String convertDateFormat(String fromFormat, String toFormat, Strin
 		}
 		return convertedDateString;
 	}
+	
+	/**
+	 * Date 객체를 포맷팅한다.
+	 * 
+	 * @param date
+	 * @param toFormat
+	 * @return
+	 */
+	public static String format(Date date, String toFormat) {
+		return new SimpleDateFormat(toFormat).format(date);
+	}
 }

src/test/java/root/core/repository/implement/ReportRepositoryImplTest.java

@@ -3,15 +3,16 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import root.core.domain.MonitoringResult;
 import root.core.domain.TableSpaceUsage;
 import root.utils.CsvUtils;
-import root.utils.DateUtils;
 
 public class ReportRepositoryImplTest {
 
@@ -26,16 +27,19 @@ public void writeReportFile_TableSpaceObj() {
 		String filePath = "TableSpaceUsage";
 		String fileName = "DB1";
 		String fileExtension = ".csv";
-		List<TableSpaceUsage> monitoringResult = List.of(
-				new TableSpaceUsage("GGS_DATA", 17.67, 16.83, 95, .84),
+		List<TableSpaceUsage> list = List.of(new TableSpaceUsage("GGS_DATA", 17.67, 16.83, 95, .84),
 				new TableSpaceUsage("SYSTEM", 3.2, 2.9, 91, .3),
 				new TableSpaceUsage("DAISO_INDX", 1080, 960.09, 89, 119.91),
-				new TableSpaceUsage("DAISO_TBS", 2130, 1719.55, 81, 410.45)
-				);
+				new TableSpaceUsage("DAISO_TBS", 2130, 1719.55, 81, 410.45));
+
+		MonitoringResult<TableSpaceUsage> monitoringResult = new MonitoringResult<>(list);
+
+		File file = new File(rootDirectory + "/" + filePath + "/" + fileName + fileExtension);
+		File parentDir = file.getParentFile();
+
+		String content = null;
 
 		try {
-			File file = new File(rootDirectory + "/" + filePath + "/" + fileName + fileExtension);
-			File parentDir = file.getParentFile();
 
 			boolean isNewFile = false;
 			if (!file.exists()) {
@@ -44,26 +48,33 @@ public void writeReportFile_TableSpaceObj() {
 				isNewFile = true;
 			}
 
-			String content = null;
 			if (isNewFile) { // 첫 파일작성인 경우 헤더 추가
 				content = StringUtils.joinWith(",", "MONITORING_DATE", "MONITORING_TIME",
 						CsvUtils.createCsvHeader(TableSpaceUsage.class));
 			}
-			
-			String now = DateUtils.getToday("yyyyMMddHHmmss");
-			for (TableSpaceUsage t : monitoringResult) {
-				String row = StringUtils.joinWith(",", now.substring(0, 8), now.substring(8),
-						CsvUtils.createCsvRow(t, TableSpaceUsage.class));
+
+			String monitoringDay = monitoringResult.getMonitoringDay();
+			String monitoringTime = monitoringResult.getMonitoringTime();
+			for (Object t : monitoringResult.getMonitoringResults()) {
+				String row = StringUtils.joinWith(",", monitoringDay, monitoringTime,
+						CsvUtils.createCsvRow(t, t.getClass()));
 				content = StringUtils.joinWith(System.lineSeparator(), content, row);
-			}			
-			
-			BufferedWriter bw = new BufferedWriter(new FileWriter(file, true));
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		if(content == null) {
+			System.out.println(String.format("파일에 작성할 내용이 없습니다. 파일경로: %s", file.getPath()));
+			return;
+		}
+
+		try(BufferedWriter bw = new BufferedWriter(new FileWriter(file, true))) {
 			bw.append(content);
 			bw.flush();
 			bw.close();
-			
-		} catch (Exception e) {
+		} catch (IOException e) {
 			e.printStackTrace();
-		}
+		} 
 	}
 }