Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions src/main/java/com/revature/project1/Entities/Account.java
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
package com.revature.project1.Entities;

import jakarta.persistence.*;
@Entity
@Table(name = "Account")

@Entity
@Table(name = "accounts")
public class Account {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "account_id")
private int account_id;

@Column(name = "username")
private String username;

@Column(name = "password")
private String password;

public Account() {}
@OneToOne (mappedBy = "account")
private User user;

public Account(int account_id, String username, String password) {
this.account_id = account_id;
this.username = username;
this.password = password;
}
@ManyToOne
@JoinColumn(name = "role_id", referencedColumnName = "role_id")
private Role role;

public Account() {}

public int getAccount_id() {
return account_id;
Expand All @@ -45,4 +48,20 @@ public String getPassword() {
public void setPassword(String password) {
this.password = password;
}

public User getUser() {
return user;
}

public void setUser(User user) {
this.user = user;
}

public Role getRole() {
return role;
}

public void setRole(Role role) {
this.role = role;
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/revature/project1/Entities/Address.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public Address() {

@Id
@GeneratedValue (strategy = GenerationType.IDENTITY)
@Column(name = "address_id")
@Column(name = "address_id", nullable = false)
private Long addressId;

@OneToOne(mappedBy = "address")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/revature/project1/Entities/Loan.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import jakarta.persistence.*;

@Entity

@Table(name = "loans")
public class Loan {

@Id
Expand All @@ -14,7 +14,7 @@ public class Loan {
@Column(name = "amount_requested")
private Long amountRequested;

@Column(name = "loan_update")
@Column(name = "last_update")
private String lastUpdate;

@Column(name = "status_reason")
Expand Down
29 changes: 16 additions & 13 deletions src/main/java/com/revature/project1/Entities/Role.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package com.revature.project1.Entities;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.persistence.*;

import java.util.ArrayList;
import java.util.List;

@Entity
@Table (name = "Role")
@Table (name = "roles")
public class Role{
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -18,12 +16,10 @@ public class Role{
@Column(name = "role_name")
private String roleName;

public Role(){}
@OneToMany(mappedBy = "role", cascade = CascadeType.ALL)
private List<Account> accounts = new ArrayList<>();

public Role(Long id, String roleName){
this.id = id;
this.roleName = roleName;
}
public Role(){}

public Long getId() {
return id;
Expand All @@ -38,5 +34,12 @@ public void setId(Long id) {
public void setRoleName(String roleName) {
this.roleName = roleName;
}


public List<Account> getRoles() {
return accounts;
}

public void setRoles(List<Account> accounts) {
this.accounts = accounts;
}
}
12 changes: 12 additions & 0 deletions src/main/java/com/revature/project1/Entities/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ public class User {
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
private List<Loan> Loans = new ArrayList<>();

@OneToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "account_id")
private Account account;

public User() {}

public Long getIdUser() {
Expand Down Expand Up @@ -96,4 +100,12 @@ public List<Loan> getLoans() {
public void setLoans(List<Loan> loans) {
Loans = loans;
}

public Account getAccount() {
return account;
}

public void setAccount(Account account) {
this.account = account;
}
}