Monnethic/java-api
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'features/apiFront' into develop

Browse source
This commit is contained in:
GME 2018-11-21 21:27:02 +01:00
parent 75ba178cee a50e07535c
commit 4f794b5bca
6 changed files with 169 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/main/java/database/transaction/Transaction.java
View file

@ -3,55 +3,55 @@ package database.transaction;
import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
import java.math.BigInteger;
import java.math.BigDecimal;
@DatabaseTable(tableName = "T_TRANSACTION")
public class Transaction {
@DatabaseField
@DatabaseField(generatedId = true)
private int transactionId;
@DatabaseField(canBeNull = false)
private int userId;
@DatabaseField(canBeNull = false)
private long transactionDate;
@DatabaseField(columnName = "transactionFrom", canBeNull = false)
private String sourceAddress;
@DatabaseField(columnName = "transactionTo", canBeNull = false)
private String destAddress;
@DatabaseField(canBeNull = false)
private String transactionFrom;
@DatabaseField(canBeNull = false)
private String transactionTo;
@DatabaseField(canBeNull = false)
private String transactionHash;
@DatabaseField(canBeNull = false)
private BigInteger amount;
private Double transactionAmount;
@DatabaseField(canBeNull = false)
private String unit;
private String transactionUnit;
public Transaction() {
super();
}
public Transaction(long transactionDate, String sourceAddress, String destAddress, String transactionHash, BigInteger amount, String unit) {
public Transaction(long transactionDate, String transactionFrom, String transactionTo, String transactionHash, Double transactionAmount, String transactionUnit) {
super();
this.transactionDate = transactionDate;
this.sourceAddress = sourceAddress;
this.destAddress = destAddress;
this.transactionFrom = transactionFrom;
this.transactionTo = transactionTo;
this.transactionHash = transactionHash;
this.amount = amount;
this.unit = unit;
this.transactionAmount = transactionAmount;
this.transactionUnit = transactionUnit;
}
public String getSourceAddress() {
return sourceAddress;
public String getTransactionFrom() {
return transactionFrom;
}
public void setSourceAddress(String sourceAddress) {
this.sourceAddress = sourceAddress;
public void setTransactionFrom(String transactionFrom) {
this.transactionFrom = transactionFrom;
}
public String getDestAddress() {
return destAddress;
return transactionTo;
}
public void setDestAddress(String destAddress) {
this.destAddress = destAddress;
public void setTransactionTo(String transactionTo) {
this.transactionTo = transactionTo;
}
public String getTransactionHash() {
@ -62,12 +62,12 @@ public class Transaction {
this.transactionHash = transactionHash;
}
public BigInteger getAmount() {
return amount;
public Double getTransactionAmount() {
return transactionAmount;
}
public void setAmount(BigInteger amount) {
this.amount = amount;
public void setTransactionAmount(Double transactionAmount) {
this.transactionAmount = transactionAmount;
}
public int getTransactionId() {
@ -94,12 +94,25 @@ public class Transaction {
this.transactionDate = transactionDate;
}
public String getUnit() {
return unit;
public String getTransactionUnit() {
return transactionUnit;
}
public void setUnit(String unit) {
this.unit = unit;
public void setTransactionUnit(String transactionUnit) {
this.transactionUnit = transactionUnit;
}
@Override
public String toString() {
return "Transaction{" +
"transactionId=" + transactionId +
", userId=" + userId +
", transactionDate=" + transactionDate +
", transactionFrom='" + transactionFrom + '\'' +
", transactionTo='" + transactionTo + '\'' +
", transactionHash='" + transactionHash + '\'' +
", transactionAmount=" + transactionAmount +
", transactionUnit='" + transactionUnit + '\'' +
'}';
}
}

17
src/main/java/database/user/User.java
View file

@ -6,7 +6,7 @@ import com.j256.ormlite.table.DatabaseTable;
//Class User which represent an User in the postgresDB
@DatabaseTable(tableName = "T_USER")
public class User {
@DatabaseField
@DatabaseField(generatedId = true)
private int userId;
@DatabaseField(canBeNull = false)
private String name;
@ -127,4 +127,19 @@ public class User {
this.approved = approved;
}
@Override
public String toString() {
return "User{" +
"userId=" + userId +
", name='" + name + '\'' +
", firstname='" + firstname + '\'' +
", email='" + email + '\'' +
", password='" + password + '\'' +
", creation_date=" + creation_date +
", modification_date=" + modification_date +
", verified=" + verified +
", approved=" + approved +
", user_hash='" + user_hash + '\'' +
'}';
}
}

38
src/main/java/restImplementation/DatabaseTransactionImplementation.java Normal file
View file

@ -0,0 +1,38 @@
package restImplementation;
import database.transaction.Transaction;
import database.transaction.TransactionDao;
import java.time.Instant;
import java.util.List;
public class DatabaseTransactionImplementation {
public void saveTransaction(Transaction transaction) throws Exception{
TransactionDao transactionDao = new TransactionDao();
long now = Instant.now().toEpochMilli();
transaction.setTransactionDate(now);
transactionDao.addTransaction(transaction);
}
public Transaction getUserTransaction(int userId, String transactionHash)throws Exception{
TransactionDao transactionDao = new TransactionDao();
Transaction tx = transactionDao.getTransaction(userId,transactionHash);
if(tx != null){
return tx;
}else {
return null;
}
}
public List<Transaction> getAllUserTransactions(int userId)throws Exception{
TransactionDao transactionDao = new TransactionDao();
return transactionDao.getUserTransactions(userId);
}
public List<Transaction> getLastTenTransactions(int userId)throws Exception{
TransactionDao transactionDao = new TransactionDao();
return transactionDao.getTenLastUserTransactions(userId);
}
}

2
src/main/java/restImplementation/DatabaseUserImplementation.java
View file

@ -38,11 +38,9 @@ public class DatabaseUserImplementation {
if(BCrypt.checkpw(password, hash)){
return user1;
}else{
System.out.println("Bcrypt nope");
return null;
}
}else {
System.out.println("nope");
return null;
}
}

73
src/main/java/restService/DatabaseTransactionResource.java
View file

@ -1,4 +1,77 @@
package restService;
import database.transaction.Transaction;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import restImplementation.DatabaseTransactionImplementation;
import javax.validation.Valid;
import java.util.List;
@RestController
@RequestMapping(value = "/api/rest/transaction")
public class DatabaseTransactionResource {
@PostMapping("/save")
@ResponseStatus(HttpStatus.CREATED)
public ResponseEntity<String> saveTransaction(@Valid @RequestBody Transaction transaction){
try{
DatabaseTransactionImplementation databaseTransactionImplementation = new DatabaseTransactionImplementation();
databaseTransactionImplementation.saveTransaction(transaction);
return ResponseEntity.status(HttpStatus.OK).body("");
}catch (Exception e){
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
}
}
@GetMapping("/get")
@ResponseStatus(HttpStatus.OK)
public ResponseEntity<Transaction> getTransaction(@Valid @RequestBody Transaction transaction){
try{
DatabaseTransactionImplementation databaseTransactionImplementation = new DatabaseTransactionImplementation();
Transaction tx = databaseTransactionImplementation.getUserTransaction(transaction.getUserId(),transaction.getTransactionHash());
if(tx != null){
return ResponseEntity.status(HttpStatus.OK).body(tx);
}else {
return new ResponseEntity("Error", HttpStatus.NOT_FOUND);
}
}catch (Exception e){
return new ResponseEntity(e.getMessage(), HttpStatus.BAD_REQUEST);
}
}
@RequestMapping(value = "/getLatest", method = RequestMethod.GET, params = {"userId"}, produces = "application/json")
@ResponseStatus(HttpStatus.OK)
public ResponseEntity<List<Transaction>> getLatestTransactions(@RequestParam(value = "userId") int userId){
try{
DatabaseTransactionImplementation databaseTransactionImplementation = new DatabaseTransactionImplementation();
List<Transaction> transactionList = databaseTransactionImplementation.getLastTenTransactions(userId);
if(!transactionList.isEmpty()){
return ResponseEntity.status(HttpStatus.OK).body(transactionList);
}else {
return new ResponseEntity("Error", HttpStatus.NOT_FOUND);
}
}catch (Exception e){
return new ResponseEntity(e.getMessage(), HttpStatus.BAD_REQUEST);
}
}
@RequestMapping(value = "/getAll", method = RequestMethod.GET, params = {"userId"}, produces = "application/json")
@ResponseStatus(HttpStatus.OK)
public ResponseEntity<List<Transaction>> getAllTransactions(@RequestParam(value = "userId") int userId){
try{
DatabaseTransactionImplementation databaseTransactionImplementation = new DatabaseTransactionImplementation();
List<Transaction> transactionList = databaseTransactionImplementation.getAllUserTransactions(userId);
if(!transactionList.isEmpty()){
return ResponseEntity.status(HttpStatus.OK).body(transactionList);
}else {
return new ResponseEntity("Error", HttpStatus.NOT_FOUND);
}
}catch (Exception e){
return new ResponseEntity(e.getMessage(), HttpStatus.BAD_REQUEST);
}
}
}

2
src/main/java/restService/DatabaseUserResource.java
View file

@ -58,7 +58,7 @@ public class DatabaseUserResource {
userResponse.setUserId(response.getUserId());
return ResponseEntity.status(HttpStatus.OK).body(userResponse);
}else{
return new ResponseEntity("Error", HttpStatus.CONFLICT);
return new ResponseEntity("Error", HttpStatus.NOT_FOUND);
}
}catch (Exception e){
return new ResponseEntity(e.getMessage(), HttpStatus.CONFLICT);