Skip to content

[Fix] Dutch database 저장 관련 이슈 해결 #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yeobi00 merged 1 commit into from
Dec 30, 2024
Merged

[Fix] Dutch database 저장 관련 이슈 해결 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/Dodutch_Server/domain/dutch/repository/DutchRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
public interface DutchRepository extends JpaRepository<Dutch, Long> {
List<Dutch> findByTripId(Long tripId);
Optional<Dutch> findByTripIdAndId(Long tripId, Long id);
boolean existsByTripIdAndPayerIdAndPayeeIdAndPerCost(Long tripId, Long payerId, Long payeeId, Integer perCost);
boolean existsByTripIdAndPayerIdAndPayeeId(Long tripId, Long payerId, Long payeeId);
List<Dutch> findByPayerIdOrPayeeId(Long payerId, Long payeeId);
List<Dutch> findByPayerIdOrPayeeIdOrderByCreatedAtDesc(Long payerId, Long payeeId);
void deleteByTripId(Long tripId);
}
40 changes: 19 additions & 21 deletions src/main/java/com/Dodutch_Server/domain/dutch/service/DutchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.Dodutch_Server.domain.trip.entity.TripMember;
import com.Dodutch_Server.domain.trip.repository.TripMemberRepository;
import com.Dodutch_Server.domain.trip.repository.TripRepository;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

Expand Down Expand Up @@ -126,8 +127,11 @@ public List<DutchDTO> calculateSettlement(Long tripId) {
return dutchDTOs;
}


@Transactional
public void saveSettlementToDatabase(Long tripId, List<DutchDTO> dutchDTOs) {
// 여행 프로젝트의 기존 정산 내역 삭제
dutchRepository.deleteByTripId(tripId);

Trip trip = tripRepository.findById(tripId)
.orElseThrow(() -> new IllegalArgumentException("TripId not found"));

Expand All @@ -137,26 +141,20 @@ public void saveSettlementToDatabase(Long tripId, List<DutchDTO> dutchDTOs) {
Member payee = memberRepository.findById(dutchDTO.getPayee())
.orElseThrow(() -> new IllegalArgumentException("Payee not found"));

// 중복된 Dutch 데이터가 존재하는지 확인하기
boolean isExistingDutch = dutchRepository.existsByTripIdAndPayerIdAndPayeeIdAndPerCost(
tripId, payer.getId(), payee.getId(), dutchDTO.getAmountToPay()
);

// 중복이 없을 때만 새로 저장하기
if (!isExistingDutch) {
TripMember tripMember = tripMemberRepository.findByTripIdAndMemberId(trip.getId(), payer.getId())
.orElseThrow(() -> new IllegalArgumentException("TripMember not found for payer"));

// Dutch Entity 생성 및 저장
Dutch dutch = new Dutch();
dutch.setTrip(trip);
dutch.setTripMember(tripMember);
dutch.setPayer(payer);
dutch.setPayee(payee);
dutch.setPerCost(dutchDTO.getAmountToPay());
dutch.setIsCompleted(false);
dutchRepository.save(dutch);
}
// TripMember 확인
TripMember tripMember = tripMemberRepository.findByTripIdAndMemberId(trip.getId(), payer.getId())
.orElseThrow(() -> new IllegalArgumentException("TripMember not found for payer"));

// Dutch Entity 생성 및 저장
Dutch dutch = new Dutch();
dutch.setTrip(trip);
dutch.setTripMember(tripMember);
dutch.setPayer(payer);
dutch.setPayee(payee);
dutch.setPerCost(dutchDTO.getAmountToPay());
dutch.setIsCompleted(false);
dutchRepository.save(dutch);

}
}
}
Loading