back end needs to be checked

src/main/java/com/cs157a1/payMe/Controller/SignUpController.java

@@ -30,6 +30,9 @@ public String showForm(Model model, @ModelAttribute("accounts") Account account)
 		return "signup";
 	}
 
+	// value == root
+	// Model == page
+
 	@RequestMapping(value ="/signup", method = RequestMethod.POST)
 	public String addAccountToDB(@Valid @ModelAttribute("accounts")  Account account, BindingResult result) {
 		if(result.hasErrors()) {
@@ -41,4 +44,7 @@ public String addAccountToDB(@Valid @ModelAttribute("accounts")  Account account
 		}
 	}
 
+	// submit button
+	// result.error checks if form is empty
+
 }

src/main/java/com/cs157a1/payMe/Entity/Admin.java

@@ -7,22 +7,22 @@ public class Admin extends Account {
 
 	@NotNull
 	@NotBlank
-	private String authorities;
+	private int authorities;
 
 	public Admin() {
 	}
 
 	public Admin(String firstName, String lastName, String username, int payMeBalance, String password, String email,
-			String authorities) {
+			int authorities) {
 		super(firstName, lastName, username, payMeBalance, password, email);
 		this.authorities = authorities;
 	}
 
-	public String getAuthorities() {
+	public int getAuthorities() {
 		return authorities;
 	}
 
-	public void setAuthorities(String authorities) {
+	public void setAuthorities(int authorities) {
 		this.authorities = authorities;
 	}
 }

src/main/java/com/cs157a1/payMe/Entity/Card.java

@@ -1,7 +1,7 @@
 package com.cs157a1.payMe.Entity;
 
 public class Card {
-	private String cardNumber;
+	private int cardNumber;
 	private String cardName;
 	private int cvvNumber;
 
@@ -10,14 +10,14 @@ public class Card {
 	public Card() {
 	}
 
-	public Card(String cardNumber, String cardName, int cvvNumber) {
+	public Card(int cardNumber, String cardName, int cvvNumber) {
 		super();
 		this.cardNumber = cardNumber;
 		this.cardName = cardName;
 		this.cvvNumber = cvvNumber;
 	}
 
-	public Card(String cardNumber, String cardName, int cvvNumber, User user) {
+	public Card(int cardNumber, String cardName, int cvvNumber, User user) {
 		super();
 		this.cardNumber = cardNumber;
 		this.cardName = cardName;
@@ -33,11 +33,11 @@ public void setUser(User user) {
 		this.user = user;
 	}
 
-	public String getCardNumber() {
+	public int getCardNumber() {
 		return cardNumber;
 	}
 
-	public void setCardNumber(String cardNumber) {
+	public void setCardNumber(int cardNumber) {
 		this.cardNumber = cardNumber;
 	}
 

src/main/java/com/cs157a1/payMe/Entity/Comment.java

@@ -14,7 +14,12 @@ public class Comment {
 
 	private User user;
 	private Transactions transactions;
-
+
+	public Comment() {
+
+	}
+
+
 	public Comment(int commentId, String description) {
 		this.commentId = commentId;
 		this.description = description;

src/main/java/com/cs157a1/payMe/Entity/creditCard.java → src/main/java/com/cs157a1/payMe/Entity/CreditCard.java

@@ -3,24 +3,24 @@
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotBlank;
 
-public class creditCard extends Card {
+public class CreditCard extends Card {
 
 	@NotNull
 	@NotBlank
 	private float creditLimit;
 
 	CardType type;
 
-	public creditCard() {
+	public CreditCard() {
 	}
 
-	public creditCard(String cardNumber, String cardName, int cvvNumber, float creditLimit) {
+	public CreditCard(int cardNumber, String cardName, int cvvNumber, float creditLimit) {
 		super(cardNumber, cardName, cvvNumber);
 		this.creditLimit = creditLimit;
 		type = CardType.Credit;
 	}
 
-	public creditCard(String cardNumber, String cardName, int cvvNumber, float creditLimit, User user) {
+	public CreditCard(int cardNumber, String cardName, int cvvNumber, float creditLimit, User user) {
 		super(cardNumber, cardName, cvvNumber, user);
 		this.creditLimit = creditLimit;
 		type = CardType.Credit;

src/main/java/com/cs157a1/payMe/Entity/DebitCard.java

@@ -16,13 +16,13 @@ public class DebitCard extends Card {
 	public DebitCard() {
 	}
 
-	public DebitCard(String cardNumber, String cardName, int cvvNumber, float balance) {
+	public DebitCard(int cardNumber, String cardName, int cvvNumber, float balance) {
 		super(cardNumber, cardName, cvvNumber);
 		this.balance = balance;
 		type = CardType.Debit;
 	}
 
-	public DebitCard(String cardNumber, String cardName, int cvvNumber, float balance, User user) {
+	public DebitCard(int cardNumber, String cardName, int cvvNumber, float balance, User user) {
 		super(cardNumber, cardName, cvvNumber, user);
 		this.balance = balance;
 		type = CardType.Debit;

src/main/java/com/cs157a1/payMe/Entity/Transactions.java

@@ -21,9 +21,9 @@ public class Transactions {
 	@NotBlank
 	private double amount;
 
-	private User sender;
-	private User receiver;
 	private List<Comment> comments = new ArrayList<Comment>();
+	private List<User> users = new ArrayList<User>();
+
 
 	public Transactions() {
 	}
@@ -40,24 +40,14 @@ public Transactions(int transID, TransType type, double amount, List<Comment> co
 		this.type = type;
 		this.amount = amount;
 		this.comments = comments;
-		this.sender = sender;
-		this.receiver = receiver;
-	}
-
-	public User getSender() {
-		return sender;
-	}
-
-	public void setSender(User sender) {
-		this.sender = sender;
 	}
 
-	public User getReceiver() {
-		return receiver;
+	public List<User> getUsers() {
+		return users;
 	}
 
-	public void setReceiver(User receiver) {
-		this.receiver = receiver;
+	public void setUsers(List<User> users) {
+		this.users = users;
 	}
 
 	public int getTransID() {

src/main/java/com/cs157a1/payMe/Entity/User.java

@@ -11,6 +11,8 @@ public class User extends Account {
 	private double balance;
 
 	private List<User> friends = new ArrayList<User>();
+
+
 	private List<Comment> comments = new ArrayList<Comment>();
 	private List<Transactions> transactions = new ArrayList<Transactions>();
 	private Card card;

src/main/java/com/cs157a1/payMe/Model/AdminDaoImpl.java

@@ -9,52 +9,91 @@
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
 
+import com.cs157a1.payMe.Entity.Account;
 import com.cs157a1.payMe.Entity.Admin;
+import com.cs157a1.payMe.Entity.User;
+import com.cs157a1.payMe.Model.MySqlDao.AccountsRowMapper;
 
 
 @Repository("AdminDao")
 public class AdminDaoImpl implements AdminDao  {
+
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
 
+	private static class AdminsRowMapper implements RowMapper<Admin>{
+
+		@Override
+		public Admin mapRow(ResultSet rs, int rowNum) throws SQLException {
+			Admin admin = new Admin();
+			admin.setUsername(rs.getString("username"));
+			admin.setAuthorities(rs.getInt("authorities"));
+			return admin;
+		}
+	}
+
 	@Override
 	public Collection<Admin> returnAllInfo() {
-		// TODO Auto-generated method stub
-		return null;
+		final String sql = "SELECT username, authorities FROM AccessControl";
+		Collection<Admin> admins = jdbcTemplate.query(sql, new AdminsRowMapper());
+		return admins;
 	}
 
 	@Override
 	public Admin returnAdminByUsername(String username) {
-		// TODO Auto-generated method stub
-		return null;
+		final String sql = "SELECT username, authorities FROM Users where username = ?";
+		Admin admin = jdbcTemplate.queryForObject(sql, new AdminsRowMapper(), username);
+		return admin;
 	}
 
 	@Override
-	public void addAdminToDB(Admin Admin) {
-		// TODO Auto-generated method stub
+	public void addAdminToDB(Admin admin) {
+		final String acountsql = "INSERT INTO Accounts (username, password, first_name, last_name, email, enabled) VALUES (?,?,?,?,?,?)";
+		final String accessSQL = "INSERT INTO AccessControl(username, authorities) VALUES (?,?)";
+
+		String username = admin.getUsername();
+		String first_name = admin.getFirstName();
+		String last_name = admin.getLastName();
+		String password = admin.getPassword();
+		String email = admin.getEmail();
+		int enabled = 1;
 
+		jdbcTemplate.update(acountsql,new Object[] {username, password, first_name, last_name, email, enabled});
+		jdbcTemplate.update(accessSQL, new Object[] {username,1});	
 	}
 
 	@Override
 	public void deleteAdmin(String username) {
-		// TODO Auto-generated method stub
+		final String sql_admin = "DELETE FROM AccessControl WHERE username = ?";
+		final String sql_accont = "DELETE FROM Accounts WHERE username = ?";
+
+		jdbcTemplate.update(sql_accont,username);
+		jdbcTemplate.update(sql_admin,username);
 
 	}
 
 	@Override
 	public String returnPassword(String username) {
-		// TODO Auto-generated method stub
-		return null;
+		final String sql = "SELECT username, password FROM Accounts WHERE username = ?";
+		Account account = jdbcTemplate.queryForObject(sql, new AccountsRowMapper(), username);
+		return account.getPassword();
 	}
 
 	@Override
 	public int returnauthoritykey(String username) {
-		// TODO Auto-generated method stub
-		return 0;
+		final String sql = "SELECT username, authorities FROM AccessControl WHERE username = ?";
+		Admin admin = jdbcTemplate.queryForObject(sql, new AdminsRowMapper(), username);
+		return admin.getAuthorities();
 	}
 
 	@Override
-	public void updateAdmin(Admin Admin) {
-		// TODO Auto-generated method stub
-
+	public void updateAdmin(Admin admin) {
+		// todo
+		// update account
+		final String sql = "UPDATE AccessControl SET authorities = ? WHERE username = ?";
+		String username = admin.getUsername();
+		int accesscontrol = admin.getAuthorities();
+		jdbcTemplate.update(sql, new Object[] {accesscontrol, username});	
 	}
 
 }