Merge pull request #206 from Dokyeongyun/ft-220403-refactoringAlertLogMonitoring

Ft 220403 refactoring alert log monitoring

Author: Dokyeongyun

pom.xml

@@ -179,6 +179,14 @@
 		    <version>5.7.0</version>
 		    <scope>test</scope>
 		</dependency>
+		
+		<!-- mockito -->
+		<dependency>
+		    <groupId>org.mockito</groupId>
+		    <artifactId>mockito-core</artifactId>
+		    <version>4.3.1</version>
+		    <scope>test</scope>
+		</dependency>
 
 		<!-- logback -->
 		<dependency>

src/main/java/root/applications/ConsoleApp.java

@@ -15,7 +15,6 @@
 import root.common.server.implement.JschServer;
 import root.core.batch.DBCheckBatch;
 import root.core.batch.ServerCheckBatch;
-import root.core.domain.AlertLogCommandPeriod;
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
 import root.core.repository.constracts.DBCheckRepository;
@@ -167,9 +166,9 @@ public static void main(String[] args) throws IOException {
 			ServerCheckUsecase usecase = new ServerCheckUsecaseImpl(repo, ReportFileRepo.getInstance());
 			ServerCheckBatch serverBatch = new ServerCheckBatch(usecase);
 
-			AlertLogCommandPeriod alcp = new AlertLogCommandPeriod(jsch.getAlc(),
-					DateUtils.addDate(DateUtils.getToday("yyyy-MM-dd"), 0, 0, -1), DateUtils.getToday("yyyy-MM-dd"));
-			serverBatch.startBatchAlertLogCheckDuringPeriod(alcp);
+			String startDate = DateUtils.addDate(DateUtils.getToday("yyyy-MM-dd"), 0, 0, -1);
+			String endDate = DateUtils.getToday("yyyy-MM-dd");
+			serverBatch.startBatchAlertLogCheckDuringPeriod(jsch.getAlc(), startDate, endDate);
 			serverBatch.startBatchOSDiskUsageCheck();
 			System.out.println("■ [ " + jsch.getServerName() + " Monitoring End ]\n\n");
 		}

src/main/java/root/applications/CsvReportSeparatorApp.java

@@ -10,12 +10,12 @@
 import java.util.regex.Pattern;
 
 import root.core.repository.constracts.ReportRepository;
-import root.core.repository.implement.ReportRepositoryImpl;
+import root.core.repository.implement.ReportFileRepo;
 import root.utils.DateUtils;
 
 public class CsvReportSeparatorApp {
 
-	public static ReportRepository reportRepository = ReportRepositoryImpl.getInstance();
+	public static ReportRepository reportRepository = ReportFileRepo.getInstance();
 
 	public static void main(String[] args) throws IOException {
 		/*

src/main/java/root/core/batch/ServerCheckBatch.java

@@ -1,7 +1,6 @@
 package root.core.batch;
 
 import root.core.domain.AlertLogCommand;
-import root.core.domain.AlertLogCommandPeriod;
 import root.core.usecase.constracts.ServerCheckUsecase;
 
 public class ServerCheckBatch {
@@ -19,9 +18,9 @@ public void startBatchAlertLogCheck(AlertLogCommand alc) {
 		}
 	}
 
-	public void startBatchAlertLogCheckDuringPeriod(AlertLogCommandPeriod alcp) {
+	public void startBatchAlertLogCheckDuringPeriod(AlertLogCommand alc, String startDate, String endDate) {
 		try {
-			this.serverCheckUsecase.printAlertLogDuringPeriod(alcp);
+			this.serverCheckUsecase.printAlertLogDuringPeriod(alc, startDate, endDate);
 		}catch(Exception e) {
 			e.printStackTrace();
 		}

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

@@ -6,7 +6,6 @@
 
 import root.core.domain.AlertLog;
 import root.core.domain.AlertLogCommand;
-import root.core.domain.AlertLogCommandPeriod;
 import root.core.domain.OSDiskUsage;
 
 public interface ServerCheckRepository {
@@ -22,7 +21,7 @@ public interface ServerCheckRepository {
 
 	String checkAlertLog(AlertLogCommand alc);
 
-	AlertLog checkAlertLogDuringPeriod(AlertLogCommandPeriod alc);
+	AlertLog checkAlertLogDuringPeriod(AlertLogCommand alc, String startDate, String endDate);
 
 	List<OSDiskUsage> checkOSDiskUsage();
 }