refactoring and minor fixes.

Author: mertakdut

BankApplicationBackend/src/main/java/com/demo/bankapp/assembler/TransactionResourceAssembler.java

@@ -9,19 +9,15 @@
 
 import com.demo.bankapp.controller.TransactionController;
 import com.demo.bankapp.model.Transaction;
-import com.demo.bankapp.request.MakeTransactionRequest;
 
 @Component
 public class TransactionResourceAssembler implements ResourceAssembler<Transaction, Resource<Transaction>> {
 
 	@Override
 	public Resource<Transaction> toResource(Transaction transaction) {
-		
-		MakeTransactionRequest mtRequest = new MakeTransactionRequest();
-		
 		return new Resource<>(transaction,
-			linkTo(methodOn(TransactionController.class).createTransaction(mtRequest)).withSelfRel()
-//			linkTo(methodOn(TransactionController.class).findAll()).withRel("transactions")
+			linkTo(methodOn(TransactionController.class).createTransaction(null)).withSelfRel(),
+			linkTo(methodOn(TransactionController.class).findAll(null)).withRel("transactions")
 		);
 	}
 

BankApplicationBackend/src/main/java/com/demo/bankapp/assembler/TransferResourceAssembler.java

@@ -9,23 +9,13 @@
 
 import com.demo.bankapp.controller.TransferController;
 import com.demo.bankapp.model.Transfer;
-import com.demo.bankapp.request.MakeTransferRequest;
 
 @Component
 public class TransferResourceAssembler implements ResourceAssembler<Transfer, Resource<Transfer>> {
 
 	@Override
 	public Resource<Transfer> toResource(Transfer transfer) {
-
-		MakeTransferRequest mtRequest = new MakeTransferRequest();
-		mtRequest.setSenderUsername(transfer.getFromUserId().toString());
-		mtRequest.setReceiverTcno(transfer.getToUserId().toString());
-		mtRequest.setCurrency(transfer.getCurrency());
-		mtRequest.setAmount(transfer.getAmount());
-
-		return new Resource<>(transfer, linkTo(methodOn(TransferController.class).makeTransfer(mtRequest)).withSelfRel()
-		// linkTo(methodOn(TransactionController.class).findAll()).withRel("transactions")
-		);
+		return new Resource<>(transfer, linkTo(methodOn(TransferController.class).createTransfer(null)).withSelfRel());
 	}
 
 }

BankApplicationBackend/src/main/java/com/demo/bankapp/assembler/UserResourceAssembler.java

@@ -9,22 +9,15 @@
 
 import com.demo.bankapp.controller.UserController;
 import com.demo.bankapp.model.User;
-import com.demo.bankapp.request.CreateNewUserRequest;
 
 @Component
 public class UserResourceAssembler implements ResourceAssembler<User, Resource<User>> {
 
 	@Override
 	public Resource<User> toResource(User user) {
-		
-		CreateNewUserRequest cnuRequest = new CreateNewUserRequest();
-		cnuRequest.setUsername(user.getUsername());
-		cnuRequest.setTcno(user.getTcno());
-		cnuRequest.setPassword(user.getPassword());
-		
 		return new Resource<>(user,
-			linkTo(methodOn(UserController.class).createNewUser(cnuRequest)).withSelfRel(),
-			linkTo(methodOn(UserController.class).findAll()).withRel("users")
-		);
+				linkTo(methodOn(UserController.class).createNewUser(null)).withSelfRel(),
+				linkTo(methodOn(UserController.class).findAll()).withRel("users"),
+				linkTo(methodOn(UserController.class).login(null)).withRel("login"));
 	}
 }

BankApplicationBackend/src/main/java/com/demo/bankapp/assembler/WealthResourceAssembler.java

@@ -1,25 +1,21 @@
 package com.demo.bankapp.assembler;
 
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+
 import org.springframework.hateoas.Resource;
 import org.springframework.hateoas.ResourceAssembler;
 import org.springframework.stereotype.Component;
 
+import com.demo.bankapp.controller.WealthController;
 import com.demo.bankapp.model.Wealth;
 
 @Component
 public class WealthResourceAssembler implements ResourceAssembler<Wealth, Resource<Wealth>> {
 
 	@Override
-	public Resource<Wealth> toResource(Wealth user) {
-
-		// CreateNewUserRequest cnuRequest = new CreateNewUserRequest();
-		// cnuRequest.setUsername(user.getUsername());
-		// cnuRequest.setTcno(user.getTcno());
-		// cnuRequest.setPassword(user.getPassword());
-
-		return new Resource<>(user
-		// linkTo(methodOn(UserController.class).createNewUser(cnuRequest)).withSelfRel(),
-		// linkTo(methodOn(UserController.class).findAll()).withRel("users")
-		);
+	public Resource<Wealth> toResource(Wealth wealth) {
+		return new Resource<>(wealth,
+		 linkTo(methodOn(WealthController.class).retrieveWealth(null)).withSelfRel());
 	}
 }

BankApplicationBackend/src/main/java/com/demo/bankapp/controller/TransferController.java

@@ -42,7 +42,7 @@ public class TransferController {
 	TransferResourceAssembler assembler;
 
 	@PostMapping("/create")
-	public Resource<Transfer> makeTransfer(@RequestBody MakeTransferRequest request) {
+	public Resource<Transfer> createTransfer(@RequestBody MakeTransferRequest request) {
 
 		if (request == null || request.getCurrency() == null || request.getCurrency().equals("")) {
 			throw new BadRequestException();
@@ -87,7 +87,7 @@ public Resource<Transfer> makeTransfer(@RequestBody MakeTransferRequest request)
 	}
 
 	private BigDecimal getTryEquivalent(Map<String, Double> currencyRates, String currency, BigDecimal amount) {
-		BigDecimal transferCurrRate = new BigDecimal(currencyRates.get(currency));
+		BigDecimal transferCurrRate = BigDecimal.valueOf(currencyRates.get(currency));
 		return amount.divide(transferCurrRate, 9, RoundingMode.HALF_UP);
 	}
 
@@ -98,7 +98,7 @@ private void checkDailyTransferLimitExceedition(Map<String, Double> currencyRate
 		BigDecimal rate;
 		BigDecimal tryEquivalent;
 		for (Transfer transfer : last24HourTransfers) {
-			rate = new BigDecimal(currencyRates.get(transfer.getCurrency()));
+			rate = BigDecimal.valueOf(currencyRates.get(transfer.getCurrency()));
 			tryEquivalent = transfer.getAmount().divide(rate, 9, RoundingMode.HALF_UP);
 
 			transferTryEquivalent = transferTryEquivalent.add(tryEquivalent);

BankApplicationBackend/src/main/java/com/demo/bankapp/controller/UserController.java

@@ -56,7 +56,7 @@ public Resource<User> createNewUser(@RequestBody CreateNewUserRequest request) {
 			throw new BadRequestException("Invalid TC No.");
 		}
 
-		User user = userService.addNewUser(request);
+		User user = userService.createNewUser(new User(request.getUsername(), request.getPassword(), request.getTcno()));
 		wealthService.newWealthRecord(user.getId());
 
 		return assembler.toResource(user);

BankApplicationBackend/src/main/java/com/demo/bankapp/service/abstractions/IUserService.java

@@ -3,7 +3,6 @@
 import java.util.List;
 
 import com.demo.bankapp.model.User;
-import com.demo.bankapp.request.CreateNewUserRequest;
 import com.demo.bankapp.request.LoginRequest;
 
 public interface IUserService {
@@ -14,7 +13,7 @@ public interface IUserService {
 
 	User findByTcno(String tcno);
 
-	User addNewUser(CreateNewUserRequest request);
+	User createNewUser(User user);
 
 	User login(LoginRequest request);
 

BankApplicationBackend/src/main/java/com/demo/bankapp/service/concretions/UserService.java

@@ -9,7 +9,6 @@
 import com.demo.bankapp.exception.UserNotFoundException;
 import com.demo.bankapp.model.User;
 import com.demo.bankapp.repository.UserRepository;
-import com.demo.bankapp.request.CreateNewUserRequest;
 import com.demo.bankapp.request.LoginRequest;
 import com.demo.bankapp.service.abstractions.IUserService;
 
@@ -25,13 +24,12 @@ public List<User> findAll() {
 	}
 
 	@Override
-	public User addNewUser(CreateNewUserRequest request) {
-		User user = new User(request.getUsername(), request.getPassword(), request.getTcno());
+	public User createNewUser(User user) {
 		return repository.save(user);
 	}
 
 	@Override
-	public User login(LoginRequest request) throws UserNotFoundException {
+	public User login(LoginRequest request) {
 
 		User user = findByUserName(request.getUsername());
 

BankApplicationBackend/src/main/java/com/demo/bankapp/service/concretions/WealthService.java

@@ -22,6 +22,22 @@ public class WealthService implements IWealthService {
 	@Autowired
 	private WealthRepository repository;
 
+	@Override
+	public void newWealthRecord(Long userId) {
+
+		Map<String, BigDecimal> wealthMap = new HashMap<>();
+
+		Map<String, Double> currencyMap = getCurrencyRates();
+		for (Map.Entry<String, Double> entry : currencyMap.entrySet()) {
+			wealthMap.put(entry.getKey(), BigDecimal.ZERO);
+		}
+
+		addInitialBalance(wealthMap);
+
+		Wealth userWealth = new Wealth(userId, wealthMap);
+		repository.save(userWealth);
+	}
+
 	@Override
 	public void makeWealthExchange(Long userId, String currency, BigDecimal amount, boolean isBuying) {
 
@@ -32,7 +48,7 @@ public void makeWealthExchange(Long userId, String currency, BigDecimal amount,
 			throw new BadRequestException("Invalid currency.");
 		}
 
-		BigDecimal rate = new BigDecimal(getCurrencyRates().get(currency));
+		BigDecimal rate = BigDecimal.valueOf(getCurrencyRates().get(currency));
 		BigDecimal tryEquivalent = amount.divide(rate, 9, RoundingMode.HALF_UP);
 
 		if (isBuying) {
@@ -81,22 +97,6 @@ public void makeWealthTransaction(Long userId, String currency, BigDecimal amoun
 		repository.save(userWealth);
 	}
 
-	@Override
-	public void newWealthRecord(Long userId) {
-
-		Map<String, BigDecimal> wealthMap = new HashMap<>();
-
-		Map<String, Double> currencyMap = getCurrencyRates();
-		for (Map.Entry<String, Double> entry : currencyMap.entrySet()) {
-			wealthMap.put(entry.getKey(), BigDecimal.ZERO);
-		}
-
-		addInitialBalance(wealthMap);
-
-		Wealth userWealth = new Wealth(userId, wealthMap);
-		repository.save(userWealth);
-	}
-
 	@Override
 	public Wealth findWealth(Long userId) {
 		return repository.findById(userId).orElseThrow(() -> new UserNotFoundException());
@@ -114,7 +114,7 @@ private void addInitialBalance(Map<String, BigDecimal> wealthMap) {
 		String currency = "TRY";
 
 		BigDecimal currentAmount = wealthMap.get(currency);
-		BigDecimal amountToAdd = new BigDecimal(13000);
+		BigDecimal amountToAdd = new BigDecimal(130000);
 		BigDecimal finalAmount = currentAmount.add(amountToAdd);
 
 		wealthMap.put(currency, finalAmount);

BankApplicationFrontend/src/components/MoneyBar/MoneyBar.js

@@ -74,17 +74,25 @@ class MoneyBar extends React.Component {
         if (this.state.ownedCurrencies == null) {
             return null;
         } else if (Object.keys(this.state.ownedCurrencies).length === 0) {
-            return <Alert className="text-center" variant="primary">Possessions make you rich? Your richness is life, forever.</Alert>
+            return <AlertBar barMessage={'Possessions make you rich? Your richness is life, forever.'} />
         } else {
             const barMessage = Object.keys(this.state.ownedCurrencies).map((keyName, index, array) => (
                 <NumberFormat key={keyName} value={this.state.ownedCurrencies[keyName]} displayType={'text'} thousandSeparator={true}
                     suffix={" " + keyName + ((array.length - 1) != index ? ", " : ".")} />))
 
-            return <Alert className="text-center" variant="primary">
-                {barMessage}
-            </Alert>
+            return <AlertBar prefix={'You have'} barMessage={barMessage} />
         }
     }
 }
 
+class AlertBar extends React.Component {
+    render() {
+        return (
+            <Alert className="text-center" variant="primary">
+                {this.props.prefix} {this.props.barMessage}
+            </Alert>
+        )
+    }
+}
+
 export default connect(mapStateToProps, mapDispatchToProps)(MoneyBar);

BankApplicationFrontend/src/components/PopupDialog/PopupDialog.js

@@ -31,18 +31,16 @@ class PopupDialog extends React.Component {
     render() {
 
         return (
-            <div>
-                <Modal show={this.props.usingAsWidget ? true : this.props.show} onHide={this.props.onClose}>
-                    <Modal.Header closeButton>
-                        <Modal.Title>{this.props.titleEnum == 0 ? "Error" : this.props.titleEnum == 1 ? "Warning" : "Success"}</Modal.Title>
-                    </Modal.Header>
-                    <Modal.Body>{this.props.message}</Modal.Body>
-                    <Modal.Footer>
-                        {this.props.callback ? <Button variant="secondary" onClick={this.props.onClose}>No</Button> : null}
-                        <Button variant="primary" onClick={this.onCloseDialog}>{this.props.callback ? 'Yes' : 'Okay'}</Button>
-                    </Modal.Footer>
-                </Modal>
-            </div>
+            <Modal show={this.props.show} onHide={this.props.onClose}>
+                <Modal.Header closeButton>
+                    <Modal.Title>{this.props.titleEnum == 0 ? "Error" : this.props.titleEnum == 1 ? "Warning" : "Success"}</Modal.Title>
+                </Modal.Header>
+                <Modal.Body>{this.props.message}</Modal.Body>
+                <Modal.Footer>
+                    {this.props.callback ? <Button variant="secondary" onClick={this.props.onClose}>No</Button> : null}
+                    <Button variant="primary" onClick={this.onCloseDialog}>{this.props.callback ? 'Yes' : 'Okay'}</Button>
+                </Modal.Footer>
+            </Modal>
         );
     }
 }