diff --git a/src/main/java/edu/tamu/app/model/Idea.java b/src/main/java/edu/tamu/app/model/Idea.java index 1f4b18d..ae6c6f8 100644 --- a/src/main/java/edu/tamu/app/model/Idea.java +++ b/src/main/java/edu/tamu/app/model/Idea.java @@ -27,6 +27,9 @@ public class Idea extends AbstractIdea { @Column(nullable = false) private IdeaState state; + @Column(nullable = true) + private String email; + @ManyToOne(fetch = EAGER, cascade = { CascadeType.REFRESH, CascadeType.DETACH }, optional = true) @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, scope = FeatureProposal.class, property = "id") @JsonIdentityReference(alwaysAsId = true) @@ -43,8 +46,13 @@ public Idea(String title, String description) { this.state = IdeaState.WAITING_ON_REVIEW; } + public Idea(String title, String description, String email) { + this(title, description); + this.email = email; + } + public Idea(ServiceRequest serviceRequest) { - this(serviceRequest.getTitle(), serviceRequest.getDescription()); + this(serviceRequest.getTitle(), serviceRequest.getDescription(), serviceRequest.getEmail()); } public Idea(String title, String description, User author) { @@ -65,6 +73,14 @@ public void setState(IdeaState state) { this.state = state; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + public FeatureProposal getFeatureProposal() { return featureProposal; } diff --git a/src/main/java/edu/tamu/app/model/request/ServiceRequest.java b/src/main/java/edu/tamu/app/model/request/ServiceRequest.java index a75c4f8..92f6b61 100644 --- a/src/main/java/edu/tamu/app/model/request/ServiceRequest.java +++ b/src/main/java/edu/tamu/app/model/request/ServiceRequest.java @@ -6,6 +6,8 @@ public class ServiceRequest extends AbstractRequest { private Long service; + private String email; + public ServiceRequest() { super(); } @@ -15,6 +17,11 @@ public ServiceRequest(RequestType type, String title, String description, Long s this.service = service; } + public ServiceRequest(RequestType type, String title, String description, Long service, String email) { + this(type, title, description, service); + this.email = email; + } + public Long getService() { return service; } @@ -23,4 +30,12 @@ public void setService(Long service) { this.service = service; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + }