Please work

ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java

@@ -13,81 +13,50 @@ public class Transaction {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     // private String transactionId;
-    private Wallet sender;
-    private Wallet recipient;
-    private int transactionHash;
-    //    private String sender;
-//    private String recipient;
+    private String senderPublicKey;
+    private String recipientPublicKey;
+    private String transactionHash;
     private Float amount;
     //@OneToMany
     //private List<Integer> coins;
     //public Signature signature;
 
-//    public Transaction(String from, String to, float amount/*,List<Integer> coins*/) {
-//        this.sender = from;
-//        this.recipient = to;
-//        this.amount = amount;
-//        //this.coins=coins;
-//    }
-
-    public Transaction(){
+    public Transaction(String senderPublicKey, String recipientPublicKey, Float amount){
 
     }
 
-    public Transaction(Wallet sender, Wallet recipient, Float amount){
-        this.sender = sender;
-        this.recipient = recipient;
-        this.amount = amount;
-        this.transactionHash = (sender.toString() + recipient.toString() + amount.toString()).hashCode();
-
+    public String getSenderPublicKey() {
+        return senderPublicKey;
     }
 
-    public void transact(Wallet sender, Wallet recipient, Float amount){
-        new Transaction(sender, recipient, amount);
-
-        sender.setAmount(sender.getAmount() - amount);
-        recipient.setAmount(recipient.getAmount() + amount);
+    public String getRecipientPublicKey() {
+        return recipientPublicKey;
     }
 
+    public Float getAmount() {
+        return amount;
+    }
 
 
 
+    public void calculateAndSetHash() {
+        String transactionHash = DigestUtils.sha256Hex(senderPublicKey + recipientPublicKey + Float.toString(amount));
+        setTransactionHash(transactionHash);
+    }
 
+    public void setTransactionHash(String transactionHash) {
+        this.transactionHash = transactionHash;
+    }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//
-//    private String calculateHash() {
-//        return DigestUtils.sha256Hex(sender + recipient + Float.toString(amount));
+//    public Transaction(String from, String to, float amount/*,List<Integer> coins*/) {
+//        this.sender = from;
+//        this.recipient = to;
+//        this.amount = amount;
+//        //this.coins=coins;
 //    }
 
-    //Above commented out by Ken
+
 
 //    public void generateSignature(PrivateKey privateKey) throws NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException {
 //        String data = StringUtil.getStringFromKey(sender) + StringUtil.getStringFromKey(reciepient) + Float.toString(value)    ;

ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java

@@ -20,13 +20,13 @@ public class Wallet {
     private int id;
     private String name;
     private String publicKey;
-    private Double amount;
+    private Float amount;
 
     public Wallet() {
         generateKeyPair();
     }
 
-    public Wallet(String name, String publicKey, double amount) {
+    public Wallet(String name, String publicKey, Float amount) {
         this.name=name;
         this.publicKey=publicKey;
         this.amount=amount;
@@ -36,12 +36,12 @@ public class Wallet {
         return publicKey;
     }
 
-    public Double getAmount(){
+    public Float getAmount(){
         return amount;
     }
 
-    public void setAmount(Double x){
-        amount = amount + x;
+    public void setAmount(Float amount){
+        this.amount = amount;
     }
 
     public void generateKeyPair() {

ZipCoinRedJavaServer/src/main/java/com/zipcoin/service/TransactionService.java

@@ -1,7 +1,9 @@
 package com.zipcoin.service;
 
 import com.zipcoin.model.Transaction;
+import com.zipcoin.model.Wallet;
 import com.zipcoin.repository.TransactionRepository;
+import com.zipcoin.repository.WalletRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -11,14 +13,27 @@ import java.util.Collection;
 public class TransactionService {
 
     private TransactionRepository transactionRepository;
+    private WalletRepository walletRepository;
 
     @Autowired
-    public TransactionService(TransactionRepository transactionRepository){
+    public TransactionService(TransactionRepository transactionRepository, WalletRepository walletRepository){
         this.transactionRepository = transactionRepository;
+        this.walletRepository = walletRepository;
     }
 
     public Transaction createTransaction(Transaction transaction) {
-        return transactionRepository.saveAndFlush(transaction);
+        Wallet sending = walletRepository.findWalletByPublicKey(transaction.getSenderPublicKey());
+        Wallet receiving = walletRepository.findWalletByPublicKey(transaction.getRecipientPublicKey());
+
+        sending.setAmount(sending.getAmount() - transaction.getAmount());
+        receiving.setAmount(receiving.getAmount() + transaction.getAmount());
+
+        walletRepository.save(sending);
+        walletRepository.save(receiving);
+
+        transaction.calculateAndSetHash();
+        return transactionRepository.save(transaction);
+
     }
 
     public Collection<Transaction> getAllTransactions(){
@@ -28,4 +43,7 @@ public class TransactionService {
     public Collection<Transaction> getTransactionsByPublicKey(String publicKey) {
         return transactionRepository.findTransactionBySenderOrRecipient(publicKey, publicKey);
     }
+
+
+
 }