Skip to content

Commit 94b947a

Browse files
authored
Merge pull request #78 from TAMULib/sprint6-staging-losing-votes
removed ignore voters setter, add validator to setup
2 parents 99afee6 + 948929e commit 94b947a

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

src/main/java/edu/tamu/app/model/FeatureProposal.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121

2222
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
2323
import com.fasterxml.jackson.annotation.JsonIdentityReference;
24-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2524
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
2625

2726
import edu.tamu.app.enums.FeatureProposalState;
2827
import edu.tamu.app.model.validation.FeatureProposalValidator;
2928

3029
@Entity
31-
@JsonIgnoreProperties(value = { "voters" }, allowGetters = true)
3230
public class FeatureProposal extends AbstractIdea {
3331

3432
@OneToMany(fetch = EAGER, cascade = { CascadeType.REFRESH, CascadeType.DETACH, CascadeType.MERGE }, mappedBy = "featureProposal")
@@ -51,7 +49,6 @@ public class FeatureProposal extends AbstractIdea {
5149

5250
public FeatureProposal() {
5351
super();
54-
this.modelValidator = new FeatureProposalValidator();
5552
setup();
5653
}
5754

@@ -77,6 +74,7 @@ public FeatureProposal(Idea idea) {
7774
}
7875

7976
private void setup() {
77+
this.modelValidator = new FeatureProposalValidator();
8078
this.ideas = new ArrayList<Idea>();
8179
this.voters = new ArrayList<User>();
8280
this.state = FeatureProposalState.IN_PROGRESS;

0 commit comments

Comments
 (0)