Accounts4

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

manifest.yml

@@ -1,4 +1,4 @@
----
+
 #applications:
 #  - name: zipBank
 #    memory: 1G
@@ -9,3 +9,4 @@
 #    services:
 #     - zipBank
 
+

pom.xml

@@ -150,6 +150,20 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<!-- Build an executable JAR -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
+							<mainClass>com.finance.zipBank.ZipBankApplicationTests</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

src/main/java/com/finance/zipBank/Controllers/AccountsController.java

@@ -33,7 +33,7 @@ public ResponseEntity<Accounts> createAccount(@PathVariable Long userId) {
     }
     @PutMapping("API/accounts/{accountId}")
     public ResponseEntity<Accounts> updateAccount(@RequestBody Accounts account, @PathVariable Long accountId) {
-        return new ResponseEntity<>(accountsService.updateAccount(account, accountId), HttpStatus.OK);
+        return new ResponseEntity<>(accountsService.updateAccount(account), HttpStatus.OK);
     }
     @GetMapping("API/user/{userId}/accounts")
     public ResponseEntity<List<Accounts>> getAllAccountsByUserId(@PathVariable Long userId) {

src/main/java/com/finance/zipBank/Controllers/BillController.java

@@ -37,5 +37,9 @@ public class BillController {
         billService.removeBill(id);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+    @PutMapping("API/bills/update")
+    public ResponseEntity<Bill>updateBill(@RequestBody Bill bill){
+        return new ResponseEntity<>(billService.updateBill(bill),HttpStatus.OK);
+    }
 
 }

src/main/java/com/finance/zipBank/Controllers/TransactionsController.java

@@ -35,4 +35,8 @@ public ResponseEntity<Iterable<Transactions>> listTop5TransactionsByDate(@PathVa
     public ResponseEntity<Iterable<Transactions>> listTop5TransactionsForUser(@PathVariable Long userId){
         return new ResponseEntity<>(transactionsService.listTop5ForUser(userId), HttpStatus.OK);
     }
+    @GetMapping("/API/accounts/transactions/{transactionId}")
+    public ResponseEntity<Transactions> listTransactionDetails(@PathVariable Long transactionId){
+        return new ResponseEntity<>(transactionsService.listTransactionDetails(transactionId), HttpStatus.OK);
+    }
 }

src/main/java/com/finance/zipBank/Repositories/TransactionsRepo.java

@@ -12,4 +12,5 @@ public interface TransactionsRepo extends CrudRepository<Transactions, Long> {
     List<Transactions> findAllByAccountNumber (Long accountNumber);
     List<Transactions> findTop5ByAccountNumberOrderByTransactionDate (Long accountNumber);
     List<Transactions> findTop5ByUserIdOrderByTransactionDate (Long userId);
+    List<Transactions> findByTransactionId (Long transactionId);
 }

src/main/java/com/finance/zipBank/Service/AccountsService.java

@@ -1,6 +1,7 @@
 package com.finance.zipBank.Service;
 
 import com.finance.zipBank.Models.Accounts;
+import com.finance.zipBank.Models.Bill;
 import com.finance.zipBank.Models.Transactions;
 import com.finance.zipBank.Models.User;
 import com.finance.zipBank.Repositories.AccountsRepo;
@@ -26,7 +27,7 @@ public class AccountsService {
 
     public Accounts createDummyAccount(Accounts account) {
         Accounts newAccount = new Accounts();
-        newAccount.setUserId(1L);
+        newAccount.setUserId(account.getUserId());
         newAccount.setAccountName(account.getAccountName());
         newAccount.setBalance(account.getBalance());
         newAccount.setType(account.getType());
@@ -58,15 +59,15 @@ public List<Accounts> getFirstFiveAcctsById(Long userId) {
         return accountsRepo.findTop5ByUserId(userId);
     }
 
-    public Accounts updateAccount(Accounts account, Long accountId) {
-        Accounts temp = getAccountById(accountId);
-        temp.setBalance(account.getBalance());
+    public Accounts updateAccount(Accounts account) {
+
+        /*temp.setBalance(account.getBalance());
         temp.setType(account.getType());
         temp.setAccountName(account.getAccountName());
         temp.setUserId(account.getUserId());
         temp.setAccountNumber(account.getAccountNumber());
-        temp.setTransactionsList(account.getTransactionsList());
-        return accountsRepo.save(temp);
+        temp.setTransactionsList(account.getTransactionsList());*/
+        return accountsRepo.save(account);
     }
 
     public Accounts accountDeposit(Transactions transactions) {
@@ -88,6 +89,7 @@ public Accounts accountDeposit(Transactions transactions) {
     public Accounts transferRecipient(Transactions transactions) {
         Long accountId = transactions.getAccountNumber();
         Double amount = transactions.getAmount();
+
         Accounts account = getAccountById(accountId);
         if (transactions.getAmount() <= 0) {
             throw new IllegalArgumentException();
@@ -130,7 +132,6 @@ public Accounts accountWithdraw(Transactions transactions) {
         return accountsRepo.save(account);
     }
 
-
     public Boolean deleteAccountById(Long accountId) {
         accountsRepo.deleteById(accountId);
         return true;

src/main/java/com/finance/zipBank/Service/BillService.java

@@ -32,4 +32,7 @@ public Boolean removeBill(Long id){
     public Iterable<Bill>getBillsByUserId(Long id){
         return billRepository.findBillsByUserId(id);
     }
+    public Bill updateBill(Bill bill){
+         return billRepository.save(bill);
+    }
 }

src/main/java/com/finance/zipBank/Service/TransactionsService.java

@@ -49,4 +49,8 @@ public List<Transactions> listTop5ForUser(Long userId){
         return transactionsRepo.findTop5ByUserIdOrderByTransactionDate(userId);
     }
 
+    public Transactions listTransactionDetails(Long transactionId){
+        return transactionsRepo.findById(transactionId).get();
+    }
+
 }