Updating User Accounts functionality that was not previously pushed

src/main/java/edu/drexel/TrainDemo/Services/UserService.java

 package edu.drexel.TrainDemo.Services;
 
-import edu.drexel.TrainDemo.models.User;
+import edu.drexel.TrainDemo.models.UserEntity;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 
@@ -8,11 +8,11 @@ import java.util.List;
 
 @Service
 public interface UserService {
-    List<User> getUsers();
-    User getUser(OAuth2User principal);
-    User getUser(long id);
-    User createUser(long id);
-    void saveUser(OAuth2User principal, User newUser);
-    void saveUser(User user, User newUser);
+    List<UserEntity> getUsers();
+    UserEntity getUser(OAuth2User principal);
+    UserEntity getUser(long id);
+    UserEntity createUser(long id, String firstName, String lastName);
+    void saveUser(OAuth2User principal, UserEntity newUser);
+    void saveUser(UserEntity user, UserEntity newUser);
     void removeUser(OAuth2User principal);
 }

src/main/java/edu/drexel/TrainDemo/Services/UserServiceImpl.java

 package edu.drexel.TrainDemo.Services;
 
-import edu.drexel.TrainDemo.models.User;
+import edu.drexel.TrainDemo.Utils;
+import edu.drexel.TrainDemo.models.UserEntity;
 import edu.drexel.TrainDemo.repositories.UserRepository;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Service
 public class UserServiceImpl implements UserService {
 
     @Autowired
@@ -18,43 +21,49 @@ public class UserServiceImpl implements UserService {
     private UserRepository userRepo;
 
     @Override
-    public List<User> getUsers() {
-        List<User> allUsers = new ArrayList<>();
+    public List<UserEntity> getUsers() {
+        List<UserEntity> allUsers = new ArrayList<>();
         this.userRepo.findAll().forEach(allUsers::add);
         return allUsers;
     }
 
     @Override
-    public User getUser(OAuth2User principal) {
-        long id = principal.getAttribute("id");
+    public UserEntity getUser(OAuth2User principal) {
+        long id = Utils.intToLong(principal.getAttribute("id"));
         return getUser(id);
     }
 
     @Override
-    public User getUser(long id) {
-        User user = this.userRepo.findById(id);
+    public UserEntity getUser(long id) {
+        UserEntity user = this.userRepo.findByExternalId(id);
 
-        // TODO: If user does not exist, then create the user.
+        // TODO: If user does not exist, then create the user. Possibly
         if (user == null) {
-            user = createUser(id);
+            //user = createUser(id, "x", "x");
+        } else {
+            System.out.println("getUser: " + user.getExternalId() + " | " + user.getFirstName() + " | " + user.getLastName());
         }
 
         return user;
     }
 
     @Override
-    public User createUser(long id) {
-        return new User("John", "Doe", id);
+    public UserEntity createUser(long id, String firstName, String lastName) {
+        UserEntity newUser = new UserEntity(firstName, lastName, id);
+        System.out.println("createUser: " + newUser.getExternalId() + " | " + newUser.getFirstName() + " | " + newUser.getLastName());
+        this.userRepo.save(newUser);
+        getUser(id);
+        return newUser;
     }
 
     @Override
-    public void saveUser(OAuth2User principal, User newUser) {
-        User oldUser = getUser(principal);
+    public void saveUser(OAuth2User principal, UserEntity newUser) {
+        UserEntity oldUser = getUser(principal);
         saveUser(oldUser, newUser);
     }
 
     @Override
-    public void saveUser(User oldUser, User newUser) {
+    public void saveUser(UserEntity oldUser, UserEntity newUser) {
         // TODO: Implement this
     }
 

src/main/java/edu/drexel/TrainDemo/Utils.java

@@ -3,6 +3,6 @@ package edu.drexel.TrainDemo;
 public class Utils {
 
     public static long intToLong(int input) {
-        return ((Number) )
+        return ((Number) (input)).longValue();
     }
 }

src/main/java/edu/drexel/TrainDemo/controllers/UserController.java

@@ -48,9 +48,9 @@ public class UserController {
     }
 
     @RequestMapping("/user/new")
-    String newUser(@AuthenticationPrincipal OAuth2User principal, @RequestParam String firstName, @RequestParam String lastName) {
+    RedirectView newUser(@AuthenticationPrincipal OAuth2User principal, @RequestParam String firstName, @RequestParam String lastName) {
         System.out.println(principal.getAttribute("id") + " | " + firstName + " | " + lastName);
         this.userService.createUser(Utils.intToLong(principal.getAttribute("id")), firstName, lastName);
-        return "index";
+        return new RedirectView("/");
     }
 }

src/main/java/edu/drexel/TrainDemo/models/UserEntity.java

@@ -10,24 +10,31 @@ public class UserEntity implements Serializable {
     static final long serialVersionUID = 42L;
 
     @Id
-    @GeneratedValue(strategy=GenerationType.AUTO)
-    private long id;
-    @Column(name = "firstName")
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "first_name")
     private String firstName;
-    @Column(name = "lastName")
+
+    @Column(name = "last_name")
     private String lastName;
-    @Column(name = "isAdmin")
-    private boolean isAdmin;
 
+    @Column(name = "is_admin")
+    private Boolean isAdmin;
+
+    @Column(name = "external_id")
+    private Long externalId;
+
+    public UserEntity(){}
 
     public UserEntity(String firstName, String lastName, long clientid) {
         this.firstName = firstName;
         this.lastName = lastName;
-        this.id = clientid;
+        this.externalId = clientid;
         this.isAdmin = false;
     }
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
@@ -43,11 +50,15 @@ public class UserEntity implements Serializable {
         return this.isAdmin;
     }
 
+    public Long getExternalId() {
+        return this.externalId;
+    }
+
     /**
      * This function is most likely only used during development and eval for looking at admin panels.
      * @param shouldBeAdmin
      */
-    public void setIsAdmin(boolean shouldBeAdmin) {
+    public void setIsAdmin(Boolean shouldBeAdmin) {
         this.isAdmin = shouldBeAdmin;
     }
 

src/main/java/edu/drexel/TrainDemo/repositories/UserRepository.java

 package edu.drexel.TrainDemo.repositories;
 
-import edu.drexel.TrainDemo.models.User;
+import edu.drexel.TrainDemo.models.UserEntity;
 import org.springframework.data.repository.CrudRepository;
 
 import java.util.List;
 
-public interface UserRepository extends CrudRepository<User, Long> {
+public interface UserRepository extends CrudRepository<UserEntity, Long> {
 
-    List<User> findByLastName(String lastName);
-    User findById(long id);
+    List<UserEntity> findByLastName(String lastName);
+    UserEntity findById(long id);
+    UserEntity findByExternalId(long externalId);
 }

src/main/resources/static/js/script.js

@@ -14,6 +14,9 @@ $.ajaxSetup({
 
 $.get("/user", function (data) {
     $("#profile-name").html(data.name);
+    if (data.name == null) {
+        $("#newAccountModal").modal("show");
+    }
     $(".unauthenticated").hide();
     $(".authenticated").show();
 }).fail(function () {

src/main/resources/templates/base.html

@@ -17,6 +17,7 @@
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.4.1/js/bootstrap.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.js"></script>
         <script type="text/javascript" src="/js/script.js"></script>
+        <script type="text/javascript" src="/js/user.js"></script>
     </th:block>
 </head>
 <body>
@@ -73,6 +74,34 @@
             </div>
         </div>
     </div>
+    <div class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" id="newAccountModal">
+        <div class="modal-dialog modal-dialog-centered" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="newAccountModalLongTitle">New Account</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <p>It seems you are a new user on the site. We need this bit of information about you as a passenger.</p>
+                    <form>
+                        <div class="form-group">
+                            <label for="fname">First Name:</label>
+                            <input type="text" class="form-control" id="fname">
+                        </div>
+                        <div class="form-group">
+                            <label for="lname">Last Name:</label>
+                            <input type="text" class="form-control" id="lname">
+                        </div>
+                        <div class="form-group">
+                            <button onclick="addUser()">Save</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 </th:block>
 </body>
 </html>
\ No newline at end of file

src/main/resources/templates/user/billing.html

@@ -32,15 +32,6 @@
                     </div>
                 </div>
                 <div class="row list-row">
-                    
-                </div>
-            </div>
-        </div>
-    </div>
-</main>
-</body>
-</html>
-
                     <div class="container address-container">
                         <form>
                             <a>Enter New Billing Info:</a>
@@ -76,3 +67,10 @@
                             </div>
                         </form>
                     </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</main>
+</body>
+</html>
\ No newline at end of file