Skip to content

Commit 448fddc

Browse files
committed
reshapged the urls.
1 parent e786a00 commit 448fddc

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public Resource<Transaction> toResource(Transaction transaction) {
2020
MakeTransactionRequest mtRequest = new MakeTransactionRequest();
2121

2222
return new Resource<>(transaction,
23-
linkTo(methodOn(TransactionController.class).makeTransaction(mtRequest)).withSelfRel()
23+
linkTo(methodOn(TransactionController.class).createTransaction(mtRequest)).withSelfRel()
2424
// linkTo(methodOn(TransactionController.class).findAll()).withRel("transactions")
2525
);
2626
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
@RestController
2727
@RequestMapping(value = "/transaction", produces = { MediaType.APPLICATION_JSON_VALUE })
28-
@CrossOrigin(origins = "*") // TODO: Replace with FE domain.
28+
@CrossOrigin(origins = "*")
2929
public class TransactionController {
3030

3131
@Autowired
@@ -40,8 +40,8 @@ public class TransactionController {
4040
@Autowired
4141
WealthService userWealthService;
4242

43-
@PostMapping("/make")
44-
public Resource<Transaction> makeTransaction(@RequestBody MakeTransactionRequest request) {
43+
@PostMapping("/create")
44+
public Resource<Transaction> createTransaction(@RequestBody MakeTransactionRequest request) {
4545

4646
if (request == null) {
4747
throw new BadRequestException();
@@ -76,8 +76,8 @@ public Resource<Transaction> makeTransaction(@RequestBody MakeTransactionRequest
7676
return assembler.toResource(transaction);
7777
}
7878

79-
@PostMapping("/findAllByUsername")
80-
public List<Resource<Transaction>> findAllByUsername(@RequestBody FindAllByUserRequest request) {
79+
@PostMapping("/find/all")
80+
public List<Resource<Transaction>> findAll(@RequestBody FindAllByUserRequest request) {
8181

8282
if (request == null) {
8383
throw new BadRequestException();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
@RestController
2828
@RequestMapping(value = "/transfer", produces = { MediaType.APPLICATION_JSON_VALUE })
29-
@CrossOrigin(origins = "*") // TODO: Replace with FE domain.
29+
@CrossOrigin(origins = "*")
3030
public class TransferController {
3131

3232
@Autowired
@@ -41,7 +41,7 @@ public class TransferController {
4141
@Autowired
4242
TransferResourceAssembler assembler;
4343

44-
@PostMapping("/make")
44+
@PostMapping("/create")
4545
public Resource<Transfer> makeTransfer(@RequestBody MakeTransferRequest request) {
4646

4747
if (request == null || request.getCurrency() == null || request.getCurrency().equals("")) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
@RestController
2626
@RequestMapping(value = "/user", produces = { MediaType.APPLICATION_JSON_VALUE })
27-
@CrossOrigin(origins = "*") // TODO: Replace with FE domain.
27+
@CrossOrigin(origins = "*")
2828
public class UserController {
2929

3030
@Autowired
@@ -36,12 +36,12 @@ public class UserController {
3636
@Autowired
3737
private UserResourceAssembler assembler;
3838

39-
@GetMapping("/findAll")
39+
@GetMapping("/find/all")
4040
public List<Resource<User>> findAll() {
4141
return userService.findAll().stream().map(assembler::toResource).collect(Collectors.toList());
4242
}
4343

44-
@PostMapping("/new")
44+
@PostMapping("/create")
4545
public Resource<User> createNewUser(@RequestBody CreateNewUserRequest request) {
4646

4747
if (request == null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@RestController
2121
@RequestMapping(value = "/wealth", produces = { MediaType.APPLICATION_JSON_VALUE })
22-
@CrossOrigin(origins = "*") // TODO: Replace with FE domain.
22+
@CrossOrigin(origins = "*")
2323
public class WealthController {
2424

2525
@Autowired

BankApplicationBackend/src/main/java/com/demo/bankapp/model/Transaction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public class Transaction {
2121
private Date transactionTime;
2222

2323
private Transaction() {
24-
2524
}
2625

2726
public Transaction(Long userId, boolean isBought, String currency, BigDecimal amount) {

BankApplicationBackend/src/main/java/com/demo/bankapp/model/User.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public class User {
1616
private String tcno;
1717

1818
private User() {
19-
2019
}
2120

2221
public User(String username, String password, String tcno) {

BankApplicationFrontend/src/components/pages/CurrencyPage/CurrencyPage.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ class CurrencyPage extends React.Component {
2828

2929
render() {
3030
return (
31-
<div>
32-
<CurrencyList currencies={this.state.currencies} />
33-
</div>
31+
<CurrencyList currencies={this.state.currencies} />
3432
)
3533
}
3634
}

BankApplicationFrontend/src/config/constants.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,17 @@ export const ERROR_TCNOLENGTH = 'Length of TC No must be 11. Currently it is: ';
1414
// URLs
1515
export const BASEURL_EXCHANGERATES = 'https://api.exchangeratesapi.io';
1616
export const URL_EXCHANGERATES = '/latest?base=TRY';
17-
export const URL_RETRIEVEHISTORY = 'transaction/findAllByUsername';
17+
// User
1818
export const URL_LOGIN = 'user/login';
19-
export const URL_REGISTER = 'user/new';
20-
export const URL_MAKETRANSFER = 'transfer/make';
21-
export const URL_RETRIEVEALLUSERS = 'user/findAll';
19+
export const URL_REGISTER = 'user/create';
20+
export const URL_RETRIEVEALLUSERS = 'user/find/all';
21+
// Transaction
22+
export const URL_MAKETRANSACTION = 'transaction/create';
23+
export const URL_RETRIEVEHISTORY = 'transaction/find/all';
24+
// Transfer
25+
export const URL_MAKETRANSFER = 'transfer/create';
26+
// Wealth
2227
export const URL_RETRIEVEWEALTH = 'wealth/retrieve';
23-
export const URL_MAKETRANSACTION = 'transaction/make';
2428

2529
// Local storage keys
2630
export const LSKEY_USERNAME = 'username';

0 commit comments

Comments
 (0)