Merge pull request #1 from Crio-Winter-of-Doing-2021/RFCT/change_db_t…

…o_postgres

Rfct/change db to postgres

cashflow/cashflow-backend/pom.xml

@@ -17,10 +17,6 @@
 		<java.version>11</java.version>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-mongodb</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
@@ -34,6 +30,16 @@
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>42.2.19</version>
+		</dependency>
+
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-boot-starter</artifactId>
@@ -87,6 +93,28 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
+		<dependency>
+			<groupId>com.jumbotail</groupId>
+			<artifactId>cashflow</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>5.4.2.Final</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>2.2.3</version>
+		</dependency>
 	</dependencies>
 
 	<build>

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/CashflowApplication.java

@@ -10,5 +10,4 @@ public static void main(String[] args) {
 		SpringApplication.run(CashflowApplication.class, args);
 	}
 
-
 }

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/controller/CashflowController.java

@@ -1,7 +1,7 @@
 package com.jumbotail.cashflow.controller;
 
-import com.jumbotail.cashflow.dto.Entity;
-import com.jumbotail.cashflow.dto.Transaction;
+import com.jumbotail.cashflow.dto.EntityDto;
+import com.jumbotail.cashflow.dto.TransactionDto;
 import com.jumbotail.cashflow.exchanges.*;
 import com.jumbotail.cashflow.services.MyUserDetailsService;
 import com.jumbotail.cashflow.services.UserService;
@@ -11,11 +11,15 @@
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.lang.reflect.Field;
+import java.util.Map;
 
 @Controller
 public class CashflowController {
@@ -32,6 +36,13 @@ public class CashflowController {
     @Autowired
     private MyUserDetailsService userDetailsService;
 
+    private String getUserName() {
+        UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication()
+                .getPrincipal();
+        String username = userDetails.getUsername();
+        return username;
+    }
+
     @PostMapping("/authenticate")
     public ResponseEntity<?> createAuthenticationToken(@RequestBody AuthenticationRequest authenticationRequest) throws Exception {
 
@@ -44,7 +55,6 @@ public ResponseEntity<?> createAuthenticationToken(@RequestBody AuthenticationRe
             throw new Exception("Incorrect username or password", e);
         }
 
-
         final UserDetails userDetails = userDetailsService
                 .loadUserByUsername(authenticationRequest.getUsername());
 
@@ -54,46 +64,101 @@ public ResponseEntity<?> createAuthenticationToken(@RequestBody AuthenticationRe
     }
 
     @PostMapping("/register")
-    ResponseEntity<?> registerUser(@Valid @RequestBody UserRegistrationRequest userRegistrationRequest) throws Exception {
+    public ResponseEntity<?> registerUser(@Valid @RequestBody UserRegistrationRequest userRegistrationRequest) {
 
         UserRegistrationResponse userRegistrationResponse = userService.registerUser(userRegistrationRequest);
 
         return ResponseEntity.ok(userRegistrationResponse);
     }
 
 
-    @PostMapping("/entity/{email}")
-    ResponseEntity<?> addEntity(@RequestBody @Valid Entity entity , @PathVariable String email ) {
+    @PostMapping("/entity")
+    ResponseEntity<?> addEntity(@RequestBody @Valid AddEntityRequest addEntityRequest ) {
 
-        AddEntityResponse addEntityResponse = userService.addEntity(entity, email);
+        AddEntityResponse addEntityResponse = userService.addEntity(addEntityRequest, getUserName());
 
         return ResponseEntity.ok(addEntityResponse);
     }
 
-    @GetMapping("/entity/{email}")
-    ResponseEntity<?> getEntities(@PathVariable String email ) {
+    @GetMapping("/entity")
+    public ResponseEntity<?> getEntities( ) {
 
-        GetEntitiesResponse getEntitiesResponse = userService.getEntities(email);
+        GetEntitiesResponse getEntitiesResponse = userService.getEntities(getUserName());
 
         return ResponseEntity.ok(getEntitiesResponse);
     }
 
-    @GetMapping("/transaction/{email}")
-    ResponseEntity<?> getTransactions(@PathVariable String email ) {
+    @GetMapping("/entity/{entityId}")
+    public ResponseEntity<?> getEntities(@PathVariable Long entityId ) {
+
+        EntityDto entity = userService.getEntity(getUserName(), entityId);
+
+        return ResponseEntity.ok(entity);
+    }
+
+    @GetMapping("/transaction")
+    public ResponseEntity<?> getTransactions( ) {
+
+        GetTransactionsResponse getTransactionsResponse = userService.getTransactions(getUserName());
+
+        return ResponseEntity.ok(getTransactionsResponse);
+    }
+
+    @GetMapping("/transaction/entity/{entityId}")
+    public ResponseEntity<?> getTransactions( @PathVariable Long entityId) {
 
-        GetTransactionsResponse getTransactionsResponse = userService.getTransactions(email);
+        GetTransactionsResponse getTransactionsResponse = userService.getTransactions(getUserName(), entityId);
 
         return ResponseEntity.ok(getTransactionsResponse);
     }
 
-    @PostMapping("/transaction/{email}")
-    ResponseEntity<?> addTransaction(@RequestBody @Valid Transaction transaction , @PathVariable String email ) {
+    @GetMapping("/transaction/{txnId}/entity/{entityId}")
+    public ResponseEntity<?> getTransaction( @PathVariable Long txnId, @PathVariable Long entityId) {
+
+        TransactionDto txn = userService.getTransaction(getUserName(), txnId, entityId);
+
+        return ResponseEntity.ok(txn);
+    }
+
+    @PostMapping("/transaction")
+    public ResponseEntity<?> addTransaction(@RequestBody @Valid AddTransactionRequest addTransactionRequest) {
 
-        AddTransactionResponse addTransactionResponse = userService.addTransaction(transaction, email);
+        AddTransactionResponse addTransactionResponse = userService.addTransaction(addTransactionRequest, getUserName());
 
         return ResponseEntity.ok(addTransactionResponse);
     }
 
+    @PatchMapping("/entity/{entityId}")
+    public ResponseEntity<?> updateEntity(@PathVariable Long entityId, @RequestBody Map<Object, Object> fields) {
+        EntityDto entity = userService.getEntity(getUserName(), entityId);
+        fields.forEach((k, v) -> {
+            Field field = ReflectionUtils.findField(EntityDto.class, (String) k);
+            field.setAccessible(true);
+            ReflectionUtils.setField(field, entity, v);
+        });
+        userService.updateEntity(getUserName(), entity);
+        return ResponseEntity.ok("Successful");
+    }
+
+    @PatchMapping("/transaction/{txnId}/entity/{entityId}")
+    public ResponseEntity<?> updateEntity(@PathVariable(name="txnId",required=true) Long txnId, @PathVariable(name="entityId",required=true) Long entityId, @RequestBody Map<Object, Object> fields) {
+        TransactionDto txn = userService.getTransaction(getUserName(), txnId, entityId);
+        fields.forEach((k, v) -> {
+            Field field = ReflectionUtils.findField(TransactionDto.class, (String) k);
+            field.setAccessible(true);
+            if(k.equals("amount") || k.equals("entityId")) {
+                ReflectionUtils.setField(field, txn, Long.valueOf("" + v));
+            }
+            else {
+                ReflectionUtils.setField(field, txn, v);
+            }
+        });
+        userService.updateTransaction(getUserName(), txn);
+        return ResponseEntity.ok("Successful");
+    }
+
+
+
 
 
 }

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/dto/Entity.java → cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/dto/EntityDto.java

@@ -10,12 +10,12 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class Entity {
-    @NotBlank
+public class EntityDto {
     @NotNull
+    private Long id;
+    @NotBlank
     private String type;
     @NotBlank
-    @NotNull
     private String name;
     private String contactNo;
     private String address;

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/dto/MyUserDetails.java

@@ -14,14 +14,12 @@
 public class MyUserDetails implements UserDetails {
     private String userName;
     private String password;
-    private boolean isActive;
     private String email;
     private List<GrantedAuthority> authorities;
 
     public MyUserDetails(UserEntity userEntity) {
-        this.userName = userEntity.getUsername();
+        this.userName = userEntity.getUserName();
         this.password = userEntity.getPassword();
-        this.isActive = userEntity.isActive();
         this.email = userEntity.getEmail();
         this.authorities = getAuthoritiesFromUserEntity(userEntity);
     }
@@ -74,6 +72,6 @@ public boolean isCredentialsNonExpired() {
 
     @Override
     public boolean isEnabled() {
-        return isActive;
+        return true;
     }
 }

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/dto/Transaction.java → cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/dto/TransactionDto.java

@@ -5,18 +5,21 @@
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
-import java.util.Date;
+import java.sql.Timestamp;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class Transaction {
+public class TransactionDto {
+    @NotNull
+    private Long id;
     @NotNull
     private Long amount;
     private String type;
     private String modeOfPayment;
     @NotNull
-    private Date timestamp;
-    private Entity entity;
+    private Timestamp timestamp;
+    private Long entityId;
     private String remarks;
+    private String status;
 }

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/exchanges/AddEntityRequest.java

@@ -0,0 +1,20 @@
+package com.jumbotail.cashflow.exchanges;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AddEntityRequest {
+
+    @NotBlank
+    private String type;
+    @NotBlank
+    private String name;
+    private String contactNo;
+    private String address;
+}

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/exchanges/AddEntityResponse.java

@@ -1,12 +1,9 @@
 package com.jumbotail.cashflow.exchanges;
 
-import com.jumbotail.cashflow.dto.Entity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/exchanges/AddTransactionRequest.java

@@ -0,0 +1,24 @@
+package com.jumbotail.cashflow.exchanges;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AddTransactionRequest {
+    @NotNull
+    private Long amount;
+    private String type;
+    private String modeOfPayment;
+    @NotNull
+    private Timestamp timestamp;
+    private Long entityId;
+    private String remarks;
+    private String status;
+}

cashflow/cashflow-backend/src/main/java/com/jumbotail/cashflow/exchanges/AddTransactionResponse.java

@@ -1,12 +1,9 @@
 package com.jumbotail.cashflow.exchanges;
 
-import com.jumbotail.cashflow.dto.Transaction;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor