Skip to content

Commit 8ed9eaf

Browse files
committed
Remove and replace submitted boolean from Feature Proposal with state
1 parent 37497b3 commit 8ed9eaf

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public class FeatureProposal extends AbstractIdea {
4242
@Fetch(value = SELECT)
4343
private List<User> voters;
4444

45-
@Column(nullable = false)
46-
private boolean submitted;
47-
4845
@Enumerated(EnumType.STRING)
4946
@Column(nullable = false)
5047
private FeatureProposalState state;
@@ -79,7 +76,6 @@ public FeatureProposal(Idea idea) {
7976
private void setup() {
8077
this.ideas = new ArrayList<Idea>();
8178
this.voters = new ArrayList<User>();
82-
this.submitted = false;
8379
this.state = FeatureProposalState.IN_PROGRESS;
8480
}
8581

@@ -134,14 +130,6 @@ public int getVotes() {
134130
return this.voters.size();
135131
}
136132

137-
public boolean isSubmitted() {
138-
return submitted;
139-
}
140-
141-
public void setSubmitted(boolean submitted) {
142-
this.submitted = submitted;
143-
}
144-
145133
public FeatureProposalState getState() {
146134
return state;
147135
}

src/main/java/edu/tamu/app/service/ProjectService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.fasterxml.jackson.databind.JsonMappingException;
1717
import com.fasterxml.jackson.databind.ObjectMapper;
1818

19+
import edu.tamu.app.enums.FeatureProposalState;
1920
import edu.tamu.app.model.FeatureProposal;
2021
import edu.tamu.app.model.repo.FeatureProposalRepo;
2122
import edu.tamu.app.model.request.FeatureRequest;
@@ -52,7 +53,7 @@ public ApiResponse getById(Long id) throws JsonParseException, JsonMappingExcept
5253
public ApiResponse submitFeatureRequest(FeatureProposal proposal) {
5354
ApiResponse response = restTemplate.postForObject(projectsUrl + "/feature", new FeatureRequest(proposal), ApiResponse.class);
5455
if (response.getMeta().getStatus().equals(ApiStatus.SUCCESS)) {
55-
proposal.setSubmitted(true);
56+
proposal.setState(FeatureProposalState.SUBMITTED);
5657
proposal = featureProposalRepo.save(proposal);
5758
simpMessagingTemplate.convertAndSend("/channel/feature-proposals/update", new ApiResponse(SUCCESS, proposal));
5859
}

0 commit comments

Comments
 (0)