Query previous and next history data

Author: Dokyeongyun

src/main/java/root/core/usecase/constracts/ReportUsecase.java

@@ -14,6 +14,12 @@ <T extends MonitoringResult> List<T> getMonitoringReportData(Class<T> clazz, Str
 	<T extends MonitoringResult> Map<String, List<T>> getMonitoringReportDataByTime(Class<T> clazz, String alias,
 			FileSize unit, int round, String inquiryDate);
 
+	<T extends MonitoringResult> Map<String, List<T>> getPrevMonitoringReportDataByTime(Class<T> clazz, String alias,
+			FileSize unit, int round, String inquiryDateTime);
+	
+	<T extends MonitoringResult> Map<String, List<T>> getNextMonitoringReportDataByTime(Class<T> clazz, String alias,
+			FileSize unit, int round, String inquiryDateTime);
+
 	<T extends MonitoringResult> Map<Integer, Long> getMonitoringReportCountByTime(Class<T> clazz, String alias,
 			FileSize unit, int round, String inquiryDate);
 

src/main/java/root/core/usecase/implement/ReportUsecaseImpl.java

@@ -1,6 +1,7 @@
 package root.core.usecase.implement;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -54,6 +55,62 @@ public <T extends MonitoringResult> Map<String, List<T>> getMonitoringReportData
 				.collect(Collectors.groupingBy(m -> m.getMonitoringDateTime(), 
 						Collectors.mapping(m -> m, Collectors.toList())));
 	}
+	
+	@Override
+	public <T extends MonitoringResult> Map<String, List<T>> getPrevMonitoringReportDataByTime(Class<T> clazz,
+			String alias, FileSize unit, int round, String inquiryDateTime) {
+
+		String prevDateTime = getPrevHistoryDateTime(clazz, alias, unit, round, inquiryDateTime);
+
+		return getMonitoringReportData(clazz, alias, unit, round)
+				.stream()
+				.filter(m -> prevDateTime.equals(m.getMonitoringDateTime()))
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime).reversed())
+				.collect(Collectors.groupingBy(m -> m.getMonitoringDateTime(), 
+						Collectors.mapping(m -> m, Collectors.toList())));
+	}
+
+	private <T extends MonitoringResult> String getPrevHistoryDateTime(Class<T> clazz, String alias, FileSize unit,
+			int round, String curHistoryDateTime) {
+		
+		// TODO 날짜 컬럼만 읽기
+		MonitoringResult result =  getMonitoringReportData(clazz, alias, unit, round)
+				.stream()
+				.filter(m -> DateUtils.compareTo("yyyyMMddHHmmss", curHistoryDateTime, m.getMonitoringDateTime()) == 1)
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime).reversed())
+				.findFirst()
+				.orElse(null);
+		
+		return result == null ? curHistoryDateTime : result.getMonitoringDateTime();
+	}
+	
+	@Override
+	public <T extends MonitoringResult> Map<String, List<T>> getNextMonitoringReportDataByTime(Class<T> clazz,
+			String alias, FileSize unit, int round, String inquiryDateTime) {
+
+		String nextDateTime = getNextHistoryDateTime(clazz, alias, unit, round, inquiryDateTime);
+		
+		return getMonitoringReportData(clazz, alias, unit, round)
+				.stream()
+				.filter(m -> nextDateTime.equals(m.getMonitoringDateTime()))
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime))
+				.collect(Collectors.groupingBy(m -> m.getMonitoringDateTime(), 
+						Collectors.mapping(m -> m, Collectors.toList())));
+	}
+	
+	private <T extends MonitoringResult> String getNextHistoryDateTime(Class<T> clazz, String alias, FileSize unit,
+			int round, String curHistoryDateTime) {
+		
+		// TODO 날짜 컬럼만 읽기
+		MonitoringResult result =  getMonitoringReportData(clazz, alias, unit, round)
+				.stream()
+				.filter(m -> DateUtils.compareTo("yyyyMMddHHmmss", curHistoryDateTime, m.getMonitoringDateTime()) == -1)
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime))
+				.findFirst()
+				.orElse(null);
+		
+		return result == null ? curHistoryDateTime : result.getMonitoringDateTime();
+	}
 
 	@Override
 	public <T extends MonitoringResult> Map<Integer, Long> getMonitoringReportCountByTime(Class<T> clazz,

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

@@ -170,4 +170,18 @@ public static String convertDateFormat(String fromFormat, String toFormat, Strin
 	public static String format(Date date, String toFormat) {
 		return new SimpleDateFormat(toFormat).format(date);
 	}
+	
+	public static int compareTo(String format, String base, String compare) {
+		try {
+			SimpleDateFormat dateFormat = new SimpleDateFormat(format);
+			Date date1 = dateFormat.parse(base);
+			Date date2 = dateFormat.parse(compare);
+
+			return date1.compareTo(date2);
+		} catch (ParseException e) {
+			
+		}
+
+		return -1;
+	}
 }