Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 0 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand All @@ -85,22 +80,4 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>


</project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import dev.kamalhm.reactivepostgres.dto.CreateBalanceWebRequest;
import dev.kamalhm.reactivepostgres.entity.Balance;
import dev.kamalhm.reactivepostgres.repository.BalanceRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
Expand All @@ -13,15 +11,17 @@

@RestController
@RequestMapping(value = "/api/balance")
@RequiredArgsConstructor
@Slf4j
public class BalanceController {

private final BalanceRepository balanceRepository;

public BalanceController(BalanceRepository balanceRepository) {
this.balanceRepository = balanceRepository;
}

@PostMapping
public Mono<Balance> createBalance(@RequestBody CreateBalanceWebRequest request) {
final Balance balance = new Balance(request.getMemberId(), request.getBalance());
final Balance balance = new Balance(request.memberId(), request.balance());
return balanceRepository.save(balance);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import dev.kamalhm.reactivepostgres.entity.Member;
import dev.kamalhm.reactivepostgres.repository.MemberRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
Expand All @@ -19,12 +17,14 @@

@RestController
@RequestMapping(value = "/api/member")
@RequiredArgsConstructor
@Slf4j
public class MemberController {

private final MemberRepository memberRepository;

public MemberController(MemberRepository memberRepository) {
this.memberRepository = memberRepository;
}

@GetMapping
public Flux<Member> getAll() {
return memberRepository.findAll();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import dev.kamalhm.reactivepostgres.dto.CreateTransactionWebRequest;
import dev.kamalhm.reactivepostgres.entity.Balance;
import dev.kamalhm.reactivepostgres.service.TransactionalService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
Expand All @@ -14,12 +12,14 @@

@RestController
@RequestMapping("/api/transaction")
@RequiredArgsConstructor
@Slf4j
public class TransactionController {

private final TransactionalService transactionalService;

public TransactionController(TransactionalService transactionalService) {
this.transactionalService = transactionalService;
}

@PostMapping
@Transactional
public Mono<Balance> createTransaction(@RequestBody CreateTransactionWebRequest request) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package dev.kamalhm.reactivepostgres.dto;

import lombok.Data;

@Data
public class CreateBalanceWebRequest {

private Long memberId;
private Long balance;
public record CreateBalanceWebRequest(Long memberId, Long balance) {
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
package dev.kamalhm.reactivepostgres.dto;

import lombok.Data;

@Data
public class CreateTransactionWebRequest {

private Long from;
private Long to;
private Long amount;
public record CreateTransactionWebRequest(Long from, Long to, Long amount) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@

import java.util.Random;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2;

@RequiredArgsConstructor
@Service
@Slf4j
public class TransactionalService {

private final BalanceRepository balanceRepository;

public TransactionalService(BalanceRepository balanceRepository) {
this.balanceRepository = balanceRepository;
}

@Transactional
public Mono<Balance> doTransaction(CreateTransactionWebRequest request) {
Long amount = request.getAmount();
Long amount = request.amount();

return Mono.zip(balanceRepository.findByMemberId(request.getFrom()),
balanceRepository.findByMemberId(request.getTo()))
return Mono.zip(balanceRepository.findByMemberId(request.from()),
balanceRepository.findByMemberId(request.to()))
.flatMap(balanceTuple -> executeTransaction(balanceTuple, amount));
}

Expand All @@ -42,7 +42,6 @@ private Mono<Balance> increaseBalance(Balance toBalance, Long amount) {
}

private Mono<Balance> increaseBalance(Balance toBalance, Long amount, Double randomValue) {
log.info("random value {}", randomValue);
if (randomValue < 0.5) {
return Mono.error(new RuntimeException("randomized error"));
}
Expand Down Expand Up @@ -72,5 +71,4 @@ private Mono<Balance> deductBalance(Balance fromBalance, Long amount) {
return balanceRepository.save(updatedBalance);
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import dev.kamalhm.reactivepostgres.repository.MemberRepository;
import io.r2dbc.spi.ConnectionFactories;
import io.r2dbc.spi.ConnectionFactory;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -22,7 +21,6 @@

@SpringBootTest
@AutoConfigureWebTestClient
@Slf4j
@ActiveProfiles(profiles = "test")
class MemberControllerTest {

Expand Down Expand Up @@ -63,7 +61,6 @@ private void insertData() {
memberRepository.deleteAll()
.thenMany(memberFlux)
.flatMap(memberRepository::save)
.doOnNext(member -> log.info("inserted {}", member))
.blockLast();
}

Expand Down