officer/egovframe-msa-edu
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 fixed reservation service

Browse Source
This commit is contained in:
shinmj
2021-10-29 16:23:23 +09:00
parent fb1a95ebb1
commit 0fbecedef4
10 changed files with 126 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/reserve-check-service/src/main/java/org/egovframe/cloud/reservechecksevice/api/reserve/ReserveApiController.java
View File

@@ -168,7 +168,7 @@ public class ReserveApiController {
public Mono<Integer> countInventory(@PathVariable Long reserveItemId,
@RequestParam(name = "startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
@RequestParam(name = "endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) {
return reserveService.countInventory(reserveItemId,startDate.atTime(1,1), endDate.atTime(1,1));
return reserveService.countInventory(reserveItemId,startDate.atTime(0,0), endDate.atTime(23, 59));
}
}

5
backend/reserve-check-service/src/main/java/org/egovframe/cloud/reservechecksevice/domain/reserve/Reserve.java
View File

@@ -197,7 +197,10 @@ public class Reserve extends BaseEntity {
* @return
*/
public Reserve conversionReserveQty() {
this.reserveQty = (this.reserveQty * -1);
if (this.reserveQty != null) {
this.reserveQty = (this.reserveQty * -1);
}
return this;
}
}

5
backend/reserve-check-service/src/main/java/org/egovframe/cloud/reservechecksevice/domain/reserve/ReserveRepositoryImpl.java
View File

@@ -2,7 +2,9 @@ package org.egovframe.cloud.reservechecksevice.domain.reserve;
import static org.springframework.data.relational.core.query.Criteria.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
@@ -174,6 +176,7 @@ public class ReserveRepositoryImpl implements ReserveRepositoryCustom{
.matching(Query.query(where("reserve_item_id").is(reserveItemId)
.and ("reserve_start_date").lessThanOrEquals(endDate)
.and("reserve_end_date").greaterThanOrEquals(startDate)
.and("reserve_status_id").not(ReserveStatus.CANCEL.getKey())
))
.all();
}
@@ -194,6 +197,7 @@ public class ReserveRepositoryImpl implements ReserveRepositoryCustom{
.and ("reserve_start_date").lessThanOrEquals(endDate)
.and("reserve_end_date").greaterThanOrEquals(startDate)
.and("reserve_id").not(reserveId)
.and("reserve_status_id").not(ReserveStatus.CANCEL.getKey())
))
.all();
}
@@ -214,6 +218,7 @@ public class ReserveRepositoryImpl implements ReserveRepositoryCustom{
.and ("reserve_start_date").lessThanOrEquals(endDate)
.and("reserve_end_date").greaterThanOrEquals(startDate)
.and("reserve_id").not(reserveId)
.and("reserve_status_id").not(ReserveStatus.CANCEL.getKey())
))
.count();
}

40
backend/reserve-check-service/src/main/java/org/egovframe/cloud/reservechecksevice/service/reserve/ReserveService.java
View File

@@ -1,5 +1,6 @@
package org.egovframe.cloud.reservechecksevice.service.reserve;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
@@ -534,17 +535,16 @@ public class ReserveService extends ReactiveAbstractService {
if (!Category.EDUCATION.isEquals(reserve1.getCategoryId())) {
return Mono.just(reserve1);
}
// return reserveItemServiceClient.updateInventory(reserve.getReserveItemId(), reserve.getReserveQty())
// .transform(CircuitBreakerOperator.of(circuitBreakerRegistry.circuitBreaker(RESERVE_ITEM_CIRCUIT_BREAKER_NAME)))
// .onErrorResume(throwable -> Mono.just(false))
// .flatMap(isSuccess -> {
// if (isSuccess) {
// return Mono.just(reserve);
// }
// //재고 업데이트에 실패했습니다.
// return Mono.error(new BusinessMessageException(getMessage("msg.inventory_failed")));
// });
return null;
return reserveItemServiceClient.updateInventory(reserve.getReserveItemId(), reserve.getReserveQty())
.transform(CircuitBreakerOperator.of(circuitBreakerRegistry.circuitBreaker(RESERVE_ITEM_CIRCUIT_BREAKER_NAME)))
.onErrorResume(throwable -> Mono.just(false))
.flatMap(isSuccess -> {
if (isSuccess) {
return Mono.just(reserve);
}
//재고 업데이트에 실패했습니다.
return Mono.error(new BusinessMessageException(getMessage("msg.inventory_failed")));
});
});
}
@@ -561,6 +561,7 @@ public class ReserveService extends ReactiveAbstractService {
.transform(CircuitBreakerOperator.of(circuitBreakerRegistry.circuitBreaker(RESERVE_ITEM_CIRCUIT_BREAKER_NAME)))
.onErrorResume(throwable -> Mono.empty())
.zipWith(getMaxByReserveDate(reserveItemId, startDate, endDate))
.log("countinventory")
.flatMap(tuple -> Mono.just(tuple.getT1().getTotalQty() - tuple.getT2()));
}
@@ -607,20 +608,33 @@ public class ReserveService extends ReactiveAbstractService {
}
long between = ChronoUnit.DAYS.between(startDate, endDate);
if (between == 0) {
return reserveFlux.map(reserve -> {
if (startDate.isAfter(reserve.getReserveStartDate())
|| startDate.isBefore(reserve.getReserveEndDate())
|| startDate.isEqual(reserve.getReserveStartDate()) || startDate.isEqual(reserve.getReserveEndDate())) {
return reserve.getReserveQty();
}
return 0;
}).reduce(0, (x1, x2) -> x1 + x2);
}
return Flux.fromStream(IntStream.iterate(0, i -> i + 1)
.limit(between)
.mapToObj(i -> startDate.plusDays(i)))
.flatMap(localDateTime ->
reserveFlux.map(findReserve -> {
if (localDateTime.isAfter(findReserve.getReserveStartDate())
|| localDateTime.isBefore(findReserve.getReserveEndDate())) {
|| localDateTime.isBefore(findReserve.getReserveEndDate())
|| localDateTime.isEqual(findReserve.getReserveStartDate()) || localDateTime.isEqual(findReserve.getReserveEndDate())) {
return findReserve.getReserveQty();
}
return 0;
}).reduce(0, (x1, x2) -> x1 + x2))
.groupBy(integer -> integer)
.flatMap(group -> group.reduce((x1,x2) -> x1 > x2?x1:x2))
.last();
.last(0);
}
}

39
backend/reserve-check-service/src/test/java/org/egovframe/cloud/reservechecksevice/api/ReserveApiControllerTest.java
View File

@@ -34,6 +34,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.web.reactive.server.WebTestClient;
@@ -58,6 +59,9 @@ public class ReserveApiControllerTest {
@Autowired
private WebTestClient webTestClient;
@Autowired
private R2dbcEntityTemplate entityTemplate;
private static final String API_URL = "/api/v1/reserves";
private UserResponseDto user;
@@ -527,4 +531,39 @@ public class ReserveApiControllerTest {
;
}
@Test
public void 물품재고조회_성공() throws Exception {
BDDMockito.when(reserveItemServiceClient.findById(ArgumentMatchers.anyLong()))
.thenReturn(Mono.just(ReserveItemResponseDto.builder().reserveItem(reserveItem).build()));
Reserve inventoryreserve = Reserve.builder()
.reserveId("1")
.reserveItemId(reserveItem.getReserveItemId())
.reserveQty(50)
.reservePurposeContent("test")
.reserveStatusId("request")
.reserveStartDate(LocalDateTime.of(2021, 9, 9, 0, 0))
.reserveEndDate(LocalDateTime.of(2021, 9, 9, 0, 0))
.userId(user.getUserId())
.userEmail("user@email.com")
.userContactNo("contact")
.build();
inventoryreserve.setReserveItem(reserveItem);
inventoryreserve.setUser(user);
Reserve saved = reserveRepository.insert(inventoryreserve).block();
assertNotNull(saved);
Integer responseBody = webTestClient.get()
.uri("/api/v1/reserves/" + reserveItem.getReserveItemId()
+ "/inventories?startDate=2021-09-09&endDate=2021-09-09")
.exchange()
.expectStatus().isOk()
.expectBody(Integer.class)
.returnResult().getResponseBody();
assertThat(responseBody).isEqualTo(50);
}
}

3
backend/reserve-request-service/src/main/java/org/egovframe/cloud/reserverequestservice/api/ReserveApiController.java
View File

@@ -84,7 +84,8 @@ public class ReserveApiController {
@PostMapping("/api/v1/requests")
@ResponseStatus(HttpStatus.CREATED)
public Mono<ReserveResponseDto> save(@RequestBody Mono<ReserveSaveRequestDto> saveRequestDtoMono) {
return saveRequestDtoMono.flatMap(saveRequestDto -> {
return saveRequestDtoMono
.flatMap(saveRequestDto -> {
if (Category.EDUCATION.isEquals(saveRequestDto.getCategoryId())) {
return reserveService.saveForEvent(saveRequestDto);
}

1
backend/reserve-request-service/src/main/java/org/egovframe/cloud/reserverequestservice/domain/ReserveRepositoryImpl.java
View File

@@ -78,6 +78,7 @@ public class ReserveRepositoryImpl implements ReserveRepositoryCustom {
.matching(Query.query(where("reserve_item_id").is(reserveItemId)
.and ("reserve_start_date").lessThanOrEquals(endDate)
.and("reserve_end_date").greaterThanOrEquals(startDate)
.and("reserve_status_id").not(ReserveStatus.CANCEL.getKey())
))
.count();
}

18
backend/reserve-request-service/src/main/java/org/egovframe/cloud/reserverequestservice/service/ReserveService.java
View File

@@ -278,20 +278,34 @@ public class ReserveService extends ReactiveAbstractService {
}
long between = ChronoUnit.DAYS.between(startDate, endDate);
if (between == 0) {
return reserveFlux.map(reserve -> {
if (startDate.isAfter(reserve.getReserveStartDate())
|| startDate.isBefore(reserve.getReserveEndDate())
|| startDate.isEqual(reserve.getReserveStartDate()) || startDate.isEqual(reserve.getReserveEndDate())) {
return reserve.getReserveQty();
}
return 0;
}).reduce(0, (x1, x2) -> x1 + x2);
}
return Flux.fromStream(IntStream.iterate(0, i -> i + 1)
.limit(between)
.mapToObj(i -> startDate.plusDays(i)))
.flatMap(localDateTime ->
reserveFlux.map(findReserve -> {
if (localDateTime.isAfter(findReserve.getReserveStartDate())
|| localDateTime.isBefore(findReserve.getReserveEndDate())) {
|| localDateTime.isBefore(findReserve.getReserveEndDate())
|| localDateTime.isEqual(findReserve.getReserveStartDate()) || localDateTime.isEqual(findReserve.getReserveEndDate())
) {
return findReserve.getReserveQty();
}
return 0;
}).reduce(0, (x1, x2) -> x1 + x2))
.groupBy(integer -> integer)
.flatMap(group -> group.reduce((x1,x2) -> x1 > x2?x1:x2))
.last();
.last(0);
}
/**

1
backend/reserve-request-service/src/test/java/org/egovframe/cloud/reserverequestservice/api/ReserveApiControllerTest.java
View File

@@ -3,6 +3,7 @@ package org.egovframe.cloud.reserverequestservice.api;
import static org.assertj.core.api.Assertions.*;
import java.time.LocalDateTime;
import java.time.ZoneId;
import org.egovframe.cloud.common.domain.Role;
import org.egovframe.cloud.reserverequestservice.api.dto.ReserveResponseDto;