Merge pull request #409 from UPbrella/dev

v1.2.1 release-dev
UPbrella · Dec 18, 2023 · fbc2aad · fbc2aad
2 parents 918c183 + 7d6940f
commit fbc2aad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/main/java/upbrella/be/rent/entity/History.java b/src/main/java/upbrella/be/rent/entity/History.java
@@ -57,12 +57,23 @@ public class History {
 
     public void refund(User user, LocalDateTime refundedAt) {
 
+        if (this.refundedAt != null || this.refundedBy != null) {
+            this.refundedAt = null;
+            this.refundedBy = null;
+            return;
+        }
+
         this.refundedAt = refundedAt;
         this.refundedBy = user;
     }
 
     public void paid(User user, LocalDateTime paidAt) {
 
+        if (this.paidAt != null || this.paidBy != null) {
+            this.paidAt = null;
+            this.paidBy = null;
+            return;
+        }
         this.paidBy = user;
         this.paidAt = paidAt;
     }

diff --git a/src/test/java/upbrella/be/rent/service/RentServiceTest.java b/src/test/java/upbrella/be/rent/service/RentServiceTest.java
@@ -10,7 +10,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
-import org.springframework.transaction.annotation.Transactional;
 import upbrella.be.config.FixtureBuilderFactory;
 import upbrella.be.config.FixtureFactory;
 import upbrella.be.rent.dto.response.HistoryInfoDto;
@@ -20,7 +19,6 @@
 import upbrella.be.rent.dto.response.RentalHistoryResponse;
 import upbrella.be.rent.entity.ConditionReport;
 import upbrella.be.rent.entity.History;
-import upbrella.be.rent.exception.ExistingUmbrellaForRentException;
 import upbrella.be.rent.exception.NonExistingHistoryException;
 import upbrella.be.rent.exception.NotAvailableUmbrellaException;
 import upbrella.be.rent.exception.NotRefundedException;
@@ -342,28 +340,35 @@ class checkRefundTest {
         void success() {
 
             // given
+            History historyForRefund = History.builder()
+                    .id(33L)
+                    .rentedAt(LocalDateTime.of(1000, 12, 3, 4, 24))
+                    .umbrella(foundUmbrella)
+                    .user(userToRent)
+                    .rentStoreMeta(foundStoreMeta)
+                    .build();
+
             long loginedUserId = 7L;
             given(userService.findUserById(loginedUserId))
                     .willReturn(userToRent);
             given(rentRepository.findById(33L))
-                    .willReturn(Optional.of(history));
-            given(rentRepository.save(history))
-                    .willReturn(history);
+                    .willReturn(Optional.of(historyForRefund));
+
 
             // when
             rentService.checkRefund(33L, loginedUserId);
 
             //then
-            assertAll(() -> assertThat(history.getRefundedBy())
+            assertAll(() -> assertThat(historyForRefund.getRefundedBy())
                             .isEqualTo(userToRent),
-                    () -> assertThat(history.getRefundedAt())
+                    () -> assertThat(historyForRefund.getRefundedAt())
                             .isBeforeOrEqualTo(LocalDateTime.now()),
                     () -> then(userService).should(times(1))
                             .findUserById(loginedUserId),
                     () -> then(rentRepository).should(times(1))
                             .findById(33L),
                     () -> then(rentRepository).should(times(1))
-                            .save(history)
+                            .save(historyForRefund)
             );
         }