diff --git a/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java b/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java deleted file mode 100644 index c9c4202..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.demo.app.presentation.form; - -import java.util.List; - -import com.example.demo.app.domain.model.AnalysisModel; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class AnalysisForm { - - private Integer currentMonthTotalAmount; - private Integer previousMonthTotalAmount; - private Integer totalDifferenceAmount; - private List categoryAnalysisFormList; - - public static AnalysisForm convertFrom( - AnalysisModel analysisModel) { - - return new AnalysisForm( - analysisModel.getCurrentMonthTotalAmount(), - analysisModel.getPreviousMonthTotalAmount(), - analysisModel.getTotalDifferenceAmount(), - CategoryAnalysisForm.convertFrom( - analysisModel.getCategoryAnalysisModelList())); - } - -} diff --git a/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java b/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java deleted file mode 100644 index add1762..0000000 --- a/src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.example.demo.app.presentation.form; - -import java.util.List; - -import com.example.demo.app.domain.model.CategoryAnalysisModel; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CategoryAnalysisForm { - - private String categoryName; - - private Integer currentMonthAmount; - - private Integer previousMonthAmount; - - private Integer monthDifferenceAmount; - - private Integer courseLimitAmount; - - private Integer courseDifferenceAmount; - - public static CategoryAnalysisForm convertFrom( - - CategoryAnalysisModel categoryAnalysisModel) { - return new CategoryAnalysisForm( - categoryAnalysisModel.getCategoryName(), - categoryAnalysisModel.getCurrentMonthAmount(), - categoryAnalysisModel.getPreviousMonthAmount(), - categoryAnalysisModel.getMonthDifferenceAmount(), - categoryAnalysisModel.getCourseLimitAmount(), - categoryAnalysisModel.getCourseDifferenceAmount()); - } - - public static List convertFrom( - List categoryAnalysisModelList) { - - return categoryAnalysisModelList.stream() - .map(CategoryAnalysisForm::convertFrom) - .toList(); - } - -}