Merge pull request #90 from ehBeak/fix/expense-domain

Fix/expense domain

src/main/java/com/connect/accountApp/domain/expense/adapter/in/web/controller/GetDailyTotalExpensesController.java

@@ -18,7 +18,7 @@
 @RestController
 @RequestMapping("/api/v1/expense")
 @RequiredArgsConstructor
-public class GetDailyTotalExpensesController {
+public class GetDailyTotalExpensesController { // 월별 지출 캘린더
 
   private final GetDailyTotalExpensesOfHouseholdUseCase getDailyTotalExpensesOfHouseholdUseCase;
 

src/main/java/com/connect/accountApp/domain/expense/adapter/in/web/controller/GetExpenseController.java

@@ -1,15 +1,9 @@
 package com.connect.accountApp.domain.expense.adapter.in.web.controller;
 
-import com.connect.accountApp.domain.expense.adapter.in.web.controller.response.DailyExpenseResponse;
 import com.connect.accountApp.domain.expense.adapter.in.web.controller.response.GetExpenseResponse;
 import com.connect.accountApp.domain.expense.application.port.in.GetExpenseUseCase;
-import com.connect.accountApp.domain.expense.application.port.in.command.DailyExpenseCommand;
 import com.connect.accountApp.domain.expense.domain.model.Expense;
 import com.connect.accountApp.global.common.adapter.in.web.response.SuccessResponse;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.Size;
-import java.time.LocalDate;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;

src/main/java/com/connect/accountApp/domain/expense/adapter/in/web/controller/RegisterExpenseController.java

@@ -4,6 +4,7 @@
 import com.connect.accountApp.domain.expense.application.port.in.RegisterExpenseUseCase;
 import com.connect.accountApp.global.common.adapter.in.web.response.SuccessResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -15,15 +16,17 @@
 @RestController
 @RequestMapping("/api/v1/expense")
 @RequiredArgsConstructor
+@Slf4j
 public class RegisterExpenseController {
 
   private final RegisterExpenseUseCase registerExpenseUseCase;
 
-
   @PostMapping("")
   public ResponseEntity registerExpense(@AuthenticationPrincipal UserDetails userDetails,
       @RequestBody RegisterExpenseRequest request) {
 
+    log.info("[controller] : {}", "RegisterExpenseController");
+
     String userEmail = userDetails.getUsername();
     Long expenseId = registerExpenseUseCase.registerExpense(userEmail, request);
     return ResponseEntity.ok(SuccessResponse.create201CreatedResponse(expenseId));

src/main/java/com/connect/accountApp/domain/expense/adapter/in/web/controller/response/DailyExpenseResponse.java

@@ -1,9 +1,9 @@
 package com.connect.accountApp.domain.expense.adapter.in.web.controller.response;
 
 import com.connect.accountApp.domain.expense.application.port.in.command.DailyExpenseCommand;
-import com.connect.accountApp.domain.expense.application.port.in.command.DailyExpenseCommand.SettlementSubjectCommand;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Collections;
 import java.util.List;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -13,51 +13,31 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class DailyExpenseResponse {
 
-  private List<DailyExpense> expenses;
+    private List<DailyExpense> expenses;
 
-  public DailyExpenseResponse(List<DailyExpenseCommand> commands) {
-    this.expenses = commands.stream().map(DailyExpense::new).toList();
-  }
-
-  @Getter
-  @NoArgsConstructor(access = AccessLevel.PROTECTED)
-  public class DailyExpense {
-
-    private Long expenseId;
-    private BigDecimal expenseAmount;
-    private String expenseStore;
-    private String expenseCategoryName;
-    private String expenseCategoryImage;
-    private List<SettlementSubject> settlementSubjects;
-
-    public DailyExpense(DailyExpenseCommand command ) {
-      this.expenseId = command.getExpenseId();
-      this.expenseAmount = command.getExpenseAmount().setScale(0, RoundingMode.FLOOR);
-      this.expenseStore = command.getExpenseStore();
-      this.expenseCategoryName = command.getExpenseCategory().getTitle();
-      this.expenseCategoryImage = command.getExpenseCategory().getImgUrl();
-
-      this.settlementSubjects = command.getSettlementSubjects().stream().map(SettlementSubject::new).toList();
+    public DailyExpenseResponse(List<DailyExpenseCommand> commands) {
+        this.expenses = commands.stream().map(DailyExpense::new).toList();
     }
 
     @Getter
     @NoArgsConstructor(access = AccessLevel.PROTECTED)
-    public class SettlementSubject {
-
-      private Long userId;
-      private String userName;
-      private Boolean isExpenseConsumer;
-      private String userProfileImage;
-
-      public SettlementSubject(SettlementSubjectCommand command) {
-        this.userId = command.getUserId();
-        this.userName = command.getUserNickname();
-        this.isExpenseConsumer = command.getIsExpenseConsumer();
-        this.userProfileImage = command.getUserProfileImage();
-      }
+    public class DailyExpense {
+
+        private Long expenseId;
+        private BigDecimal expenseAmount;
+        private String expenseStore;
+        private String expenseCategoryName;
+        private String expenseCategoryImage;
+        private List settlementSubjects;
+
+        public DailyExpense(DailyExpenseCommand command) {
+            this.expenseId = command.getExpenseId();
+            this.expenseAmount = command.getExpenseAmount().setScale(0, RoundingMode.FLOOR);
+            this.expenseStore = command.getExpenseStore();
+            this.expenseCategoryName = command.getExpenseCategory().getTitle();
+            this.expenseCategoryImage = command.getExpenseCategory().getImgUrl();
+            this.settlementSubjects = Collections.EMPTY_LIST;
+        }
     }
 
-  }
-
-
 }

src/main/java/com/connect/accountApp/domain/expense/adapter/out/persistence/ExpenseMapper.java

@@ -2,35 +2,85 @@
 
 import com.connect.accountApp.domain.expense.adapter.out.persistence.jpa.model.ExpenseJpaEntity;
 import com.connect.accountApp.domain.expense.domain.model.Expense;
+import com.connect.accountApp.domain.household.adapter.out.persistence.HouseholdMapper;
+import com.connect.accountApp.domain.household.adapter.out.persistence.jpa.model.HouseHoldJpaEntity;
+import com.connect.accountApp.domain.household.domain.model.Household;
 import com.connect.accountApp.domain.user.adapter.out.persistence.UserMapper;
+import com.connect.accountApp.domain.user.adapter.out.persistence.jpa.model.UserJpaEntity;
+import com.connect.accountApp.domain.user.domain.model.User;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.proxy.HibernateProxy;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class ExpenseMapper {
 
+  private final UserMapper userMapper;
+  private final HouseholdMapper householdMapper;
+
   public Expense mapToDomainEntity(ExpenseJpaEntity expenseJpaEntity) {
     return Expense.builder()
-        .expenseId(expenseJpaEntity.getExpenseId())
-        .expenseAmount(expenseJpaEntity.getExpenseAmount())
-        .expenseDate(expenseJpaEntity.getExpenseDate())
-        .expenseStore(expenseJpaEntity.getExpenseStore())
-        .expenseMemo(expenseJpaEntity.getExpenseMemo())
-        .expenseCategory(expenseJpaEntity.getExpenseCategory())
-        .build();
+            .expenseId(expenseJpaEntity.getExpenseId())
+            .expenseAmount(expenseJpaEntity.getExpenseAmount())
+            .expenseDate(expenseJpaEntity.getExpenseDate())
+            .expenseStore(expenseJpaEntity.getExpenseStore())
+            .expenseMemo(expenseJpaEntity.getExpenseMemo())
+            .expenseCategory(expenseJpaEntity.getExpenseCategory())
+            .spender(getUserOfExpenseJpaEntity(expenseJpaEntity.getSpender()))
+            .household(getHouseHoldOfExpenseJpaEntity(expenseJpaEntity.getHouseHoldJpaEntity()))
+            .build();
   }
 
   public ExpenseJpaEntity mapToJpaEntity(Expense expense) {
     return ExpenseJpaEntity.builder()
-        .expenseId(expense.getExpenseId())
-        .expenseAmount(expense.getExpenseAmount())
-        .expenseDate(expense.getExpenseDate())
-        .expenseStore(expense.getExpenseStore())
-        .expenseMemo(expense.getExpenseMemo())
-        .expenseCategory(expense.getExpenseCategory())
-        .build();
+            .expenseId(expense.getExpenseId())
+            .expenseAmount(expense.getExpenseAmount())
+            .expenseDate(expense.getExpenseDate())
+            .expenseStore(expense.getExpenseStore())
+            .expenseMemo(expense.getExpenseMemo())
+            .expenseCategory(expense.getExpenseCategory())
+            .spender(getUserJpaEntityOfExpense(expense.getSpender()))
+            .houseHoldJpaEntity(getHouseHoldJpaEntityOfExpense(expense.getHousehold()))
+            .build();
+
+  }
+
+
+  private HouseHoldJpaEntity getHouseHoldJpaEntityOfExpense(Household household) {
+    if (household == null) {
+      return null;
+    }else {
+      return householdMapper.mapToJpaEntity(household);
+    }
+  }
+
+  private Household getHouseHoldOfExpenseJpaEntity(HouseHoldJpaEntity houseHoldJpaEntity) {
 
+    if (houseHoldJpaEntity == null || houseHoldJpaEntity instanceof HibernateProxy) {
+      return null;
+    }else {
+      return householdMapper.mapToDomainEntity(houseHoldJpaEntity);
+    }
   }
 
+
+  private UserJpaEntity getUserJpaEntityOfExpense(User user) {
+    if (user == null) {
+      return null;
+    }else {
+      return userMapper.mapToJpaEntity(user);
+    }
+  }
+
+  private User getUserOfExpenseJpaEntity(UserJpaEntity userJpaEntity) {
+
+    if (userJpaEntity == null || userJpaEntity instanceof HibernateProxy) {
+      return null;
+    }else {
+      return userMapper.mapToDomainEntity(userJpaEntity);
+    }
+  }
+
+
 }

src/main/java/com/connect/accountApp/domain/expense/adapter/out/persistence/ExpensePersistenceAdapter.java

@@ -36,7 +36,7 @@ public List<TotalExpenseCommand> getTotalExpense(Long householdId, LocalDateTime
       LocalDateTime endTime) {
 
     List<TotalExpenseCommand> totalExpenseQuery  = expenseQueryRepository.getTotalExpenseQuery(
-        householdId, startTime, endTime);
+        householdId, startTime.toLocalDate(), endTime.toLocalDate());
     return totalExpenseQuery;
   }
 
@@ -54,12 +54,14 @@ public TotalExpenseCommand getUserSendMoney(Long userId, LocalDate date) {
 
   @Override
   public int getHouseholdTotalExpense(Long householdId, LocalDateTime startTime, LocalDateTime endTime) {
-    return expenseQueryRepository.getHouseholdTotalExpense(householdId, startTime, endTime);
+    return 1;
+//    return expenseQueryRepository.getHouseholdTotalExpense(householdId, startTime.toLocalDate(), endTime.toLocalDate());
   }
 
   @Override
   public BigDecimal getHouseholdTotalExpenseByDate(Long householdId, LocalDateTime startTime, LocalDateTime endTime) {
-    return expenseQueryRepository.getHouseholdTotalExpenseBetweenDate(householdId, startTime, endTime);
+    return expenseQueryRepository.getHouseholdTotalExpenseBetweenDate(householdId, startTime,
+            endTime.plusDays(1).minusSeconds(1));
   }
 
   @Override
@@ -97,4 +99,9 @@ public List<DailyExpenseCommand> findSearchedExpenses(Long householdId, Searched
     return expenseQueryRepository.findSearchedExpenses(householdId, condition);
   }
 
+  @Override
+  public BigDecimal findHouseholdTotalExpenses(Long householdId, LocalDate startDate, LocalDate endDate) {
+    return expenseQueryRepository.getHouseholdTotalExpense(householdId, startDate, endDate);
+  }
+
 }