Dustin Vidrine Senior Java Candidate Assessment (card 0013)

src/main/java/com/bravo/user/App.java

@@ -3,10 +3,15 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.util.UUID;
+
 @SpringBootApplication
 public class App {
 
     public static void main(String[] args) {
+
         SpringApplication.run(App.class, args);
     }
+
+
 }

src/main/java/com/bravo/user/controller/PaymentController.java

@@ -0,0 +1,36 @@
+package com.bravo.user.controller;
+
+import com.bravo.user.annotation.SwaggerController;
+import com.bravo.user.dao.model.Payment;
+import com.bravo.user.dao.model.User;
+import com.bravo.user.dao.repository.PaymentRepository;
+import com.bravo.user.service.PaymentService;
+import com.bravo.user.service.UserService;
+import com.bravo.user.validator.UserValidator;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@SwaggerController
+@RequestMapping(value = "/payments")
+public class PaymentController{
+
+    @Autowired
+    private PaymentService paymentService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private UserValidator userValidator;
+
+    @GetMapping(value = "/retrieve/{userId}/")
+    @ResponseBody
+    public List<Payment> getUserPayments(@PathVariable String userId) {
+        userValidator.validateId(userId);
+        return paymentService.getUserPayments(userId);
+    }
+
+
+
+}

src/main/java/com/bravo/user/dao/model/Payment.java

@@ -2,10 +2,8 @@
 
 import java.time.LocalDateTime;
 import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+
 import lombok.Data;
 
 @Entity
@@ -15,6 +13,7 @@ public class Payment {
 
   @Id
   @Column(name = "id")
+  @GeneratedValue(strategy = GenerationType.IDENTITY) // Auto increments ID upon creation
   private String id;
 
   @Column(name = "user_id", nullable = false)
@@ -37,4 +36,52 @@ public Payment(){
     this.id = UUID.randomUUID().toString();
     this.updated = LocalDateTime.now();
   }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public String getCardNumber() {
+    return cardNumber;
+  }
+
+  public void setCardNumber(String cardNumber) {
+    this.cardNumber = cardNumber;
+  }
+
+  public Integer getExpiryMonth() {
+    return expiryMonth;
+  }
+
+  public void setExpiryMonth(Integer expiryMonth) {
+    this.expiryMonth = expiryMonth;
+  }
+
+  public Integer getExpiryYear() {
+    return expiryYear;
+  }
+
+  public void setExpiryYear(Integer expiryYear) {
+    this.expiryYear = expiryYear;
+  }
+
+  public LocalDateTime getUpdated() {
+    return updated;
+  }
+
+  public void setUpdated(LocalDateTime updated) {
+    this.updated = updated;
+  }
 }

src/main/java/com/bravo/user/dao/model/Profile.java

@@ -2,14 +2,11 @@
 
 import java.time.LocalDateTime;
 import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+
 import lombok.Data;
 
 @Entity
-@Data
 @Table(name = "profile")
 public class Profile {
 
@@ -37,4 +34,52 @@ public Profile(){
     this.id = UUID.randomUUID().toString();
     this.updated = LocalDateTime.now();
   }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public String getPictureUrl() {
+    return pictureUrl;
+  }
+
+  public void setPictureUrl(String pictureUrl) {
+    this.pictureUrl = pictureUrl;
+  }
+
+  public LocalDateTime getUpdated() {
+    return updated;
+  }
+
+  public void setUpdated(LocalDateTime updated) {
+    this.updated = updated;
+  }
 }

src/main/java/com/bravo/user/dao/model/User.java

@@ -4,19 +4,11 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
+
 import lombok.Data;
 
 @Entity
-@Data
 @Table(name = "user")
 public class User {
 
@@ -40,11 +32,11 @@ public class User {
   private LocalDateTime updated;
 
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  @JoinColumn(name = "id")
+  @JoinColumn(name = "address_id")
   private List<Address> addresses;
 
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  @JoinColumn(name = "id")
+  @JoinColumn(name ="payment_id")
   private List<Payment> payments;
 
   @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, optional = false)
@@ -64,4 +56,76 @@ public User(final UserSaveDto user){
     this.lastName = user.getLastName();
     this.phoneNumber = user.getPhoneNumber();
   }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  public String getMiddleName() {
+    return middleName;
+  }
+
+  public void setMiddleName(String middleName) {
+    this.middleName = middleName;
+  }
+
+  public String getLastName() {
+    return lastName;
+  }
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  public String getPhoneNumber() {
+    return phoneNumber;
+  }
+
+  public void setPhoneNumber(String phoneNumber) {
+    this.phoneNumber = phoneNumber;
+  }
+
+  public LocalDateTime getUpdated() {
+    return updated;
+  }
+
+  public void setUpdated(LocalDateTime updated) {
+    this.updated = updated;
+  }
+
+  public List<Address> getAddresses() {
+    return addresses;
+  }
+
+  public void setAddresses(List<Address> addresses) {
+    this.addresses = addresses;
+  }
+
+  public List<Payment> getPayments() {
+    return payments;
+  }
+
+  public void setPayments(List<Payment> payments) {
+    this.payments = payments;
+  }
+
+  public Profile getProfile() {
+    return profile;
+  }
+
+  public void setProfile(Profile profile) {
+    this.profile = profile;
+  }
 }

src/main/java/com/bravo/user/dao/repository/PaymentRepository.java

@@ -0,0 +1,14 @@
+package com.bravo.user.dao.repository;
+
+import com.bravo.user.dao.model.Payment;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PaymentRepository extends JpaRepository<Payment,String> {
+
+    // Finds All Payments linked to the User ID provided
+    List<Payment> findAllByUserId(String userId);
+}

src/main/java/com/bravo/user/service/PaymentService.java

@@ -0,0 +1,27 @@
+package com.bravo.user.service;
+
+import com.bravo.user.dao.model.Payment;
+import com.bravo.user.dao.repository.PaymentRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PaymentService {
+
+    @Autowired
+    private PaymentRepository paymentRepository;
+
+    @Autowired
+    private UserService userService;
+
+
+    public List<Payment> getUserPayments(String userId) {
+        return paymentRepository.findAllByUserId(userId);
+    }
+
+    public Payment savePayment(Payment payment) {
+        return paymentRepository.save(payment);
+    }
+}

src/main/java/com/bravo/user/service/UserService.java

@@ -43,10 +43,11 @@ public UserReadDto create(final UserSaveDto request){
   }
 
   public UserReadDto retrieve(final String id){
-    Optional<User> optional = userRepository.findById(id);
-    User user = getUser(id, optional);
+    User user = userRepository.findById(id).get();
+
 
     LOGGER.info("found user '{}'", id);
+    System.out.println(user.toString());
     return resourceMapper.convertUser(user);
   }
 
@@ -130,4 +131,6 @@ private User getUser(final String id, final Optional<User> user){
     }
     return user.get();
   }
+
+
 }

src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     password: ${DB_PASSWORD:password}
     username: ${DB_USERNAME:sa}
     url: ${DB_URL:jdbc:h2:mem:testdb}
-  h2.console.enabled: false
+  h2.console.enabled: true
   jpa:
     database-platform: ${DB_DIALECT:org.hibernate.dialect.H2Dialect}
     properties.hibernate: