Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

finished #34

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions application.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
server.port=8081
12 changes: 12 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@
<groupId>io.zipcoder</groupId>
<artifactId>spring-demo</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package io.zipcoder.tc_spring_poll_application.controller;

import io.zipcoder.tc_spring_poll_application.domain.Vote;
import io.zipcoder.tc_spring_poll_application.dtos.VoteResult;
import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@RestController
public class ComputeResultController {

private VoteRepository voteRepository;

@Autowired
public ComputeResultController(VoteRepository voteRepository) {
this.voteRepository = voteRepository;
}

@RequestMapping(value = "/computeresult", method = RequestMethod.GET)
public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
VoteResult voteResult = new VoteResult();
Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);

//TODO: Implement algorithm to count votes
return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package io.zipcoder.tc_spring_poll_application.controller;

import io.zipcoder.tc_spring_poll_application.domain.Poll;
import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;

import javax.validation.Valid;
import java.net.URI;

@RestController
public class PollController {

PollRepository pollRepository;

@Autowired
public PollController (PollRepository pollRepository){
this.pollRepository = pollRepository;
}

@GetMapping("/polls")
public ResponseEntity<Page<Poll>> getAllPolls (Pageable pageable){
Page<Poll> allPolls = pollRepository.findAll(pageable);
return new ResponseEntity<Page<Poll>>(allPolls,HttpStatus.OK);
}

// @RequestMapping(value="/polls", method= RequestMethod.GET)
// public ResponseEntity<Iterable<Poll>> getAllPolls() {
// Iterable<Poll> allPolls = pollRepository.findAll();
// return new ResponseEntity<>(allPolls, HttpStatus.OK);
// }


@RequestMapping(value="/polls", method=RequestMethod.POST)
public ResponseEntity<?> createPoll(@Valid @RequestBody Poll poll) {
poll = pollRepository.save(poll);

URI newPollUri = ServletUriComponentsBuilder
.fromCurrentRequest()
.path("/{id}")
.buildAndExpand(poll.getId())
.toUri();

HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.setLocation(newPollUri);


return new ResponseEntity<>(httpHeaders, HttpStatus.CREATED);
}

@RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
verifyPoll(pollId);
Poll p = pollRepository.findOne(pollId);
return new ResponseEntity<> (p, HttpStatus.OK);
}

@RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
public ResponseEntity<?> updatePoll(@Valid @RequestBody Poll poll, @PathVariable Long pollId) {
// Save the entity
verifyPoll(pollId);
Poll p = pollRepository.save(poll);
return new ResponseEntity<>(HttpStatus.OK);
}


@RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
verifyPoll(pollId);
pollRepository.delete(pollId);
return new ResponseEntity<>(HttpStatus.OK);
}

private void verifyPoll (Long pollId){

if(pollRepository.exists(pollId)) {
// all good
} else {
throw new ResourceNotFoundException("Poll not found");
}
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package io.zipcoder.tc_spring_poll_application.controller;

import io.zipcoder.tc_spring_poll_application.domain.Vote;
import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;

import javax.validation.Valid;

@RestController
public class VoteController {

private VoteRepository voteRepository;

@Autowired
public VoteController (VoteRepository voteRepository){
this.voteRepository = voteRepository;
}

@RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
public ResponseEntity<?> createVote(@PathVariable Long pollId, @Valid @RequestBody Vote vote) {
vote = voteRepository.save(vote);
HttpHeaders responseHeaders = new HttpHeaders();
responseHeaders.setLocation(ServletUriComponentsBuilder.
fromCurrentRequest().path("/{id}").buildAndExpand(vote.getId()).toUri());
return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
}


@RequestMapping(value="/polls/votes", method=RequestMethod.GET)
public Iterable<Vote> getAllVotes() {
return voteRepository.findAll();
}

@RequestMapping(value="/polls/{pollId}/votes", method=RequestMethod.GET)
public Iterable<Vote> getVote(@PathVariable Long pollId) {
return voteRepository.findVotesByPoll(pollId);
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package io.zipcoder.tc_spring_poll_application.domain;

import javax.persistence.*;

@Entity
public class Option {

@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "OPTION_ID")
private Long id;

@Column(name = "OPTION_VALUE")
private String value;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getValue() {
return value;
}

public void setValue(String value) {
this.value = value;
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package io.zipcoder.tc_spring_poll_application.domain;

import org.hibernate.validator.constraints.NotEmpty;

import javax.persistence.*;
import javax.validation.constraints.Size;
import java.util.Set;

@Entity
public class Poll {

@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "POLL_ID")
private Long id;

@Column(name = "QUESTION")
@NotEmpty
private String question;

@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "POLL_ID")
@OrderBy
@Size(min=2, max=6)
private Set<Option> options;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getQuestion() {
return question;
}

public void setQuestion(String question) {
this.question = question;
}

public Set<Option> getOptions() {
return options;
}

public void setOptions(Set<Option> options) {
this.options = options;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package io.zipcoder.tc_spring_poll_application.domain;

import javax.persistence.*;

@Entity
public class Vote {

@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "VOTE_ID")
private Long id;

@ManyToOne
@JoinColumn(name = "OPTION_ID")
Option option;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public Option getOption() {
return option;
}

public void setOption(Option option) {
this.option = option;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package io.zipcoder.tc_spring_poll_application.dtos;


public class OptionCount {
private Long optionId;
private int count;

public Long getOptionId() {
return optionId;
}

public void setOptionId(Long optionId) {
this.optionId = optionId;
}

public int getCount() {
return count;
}

public void setCount(int count) {
this.count = count;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package io.zipcoder.tc_spring_poll_application.dtos;

import java.util.Collection;

public class VoteResult {
private int totalVotes;
private Collection<OptionCount> results;

public int getTotalVotes() {
return totalVotes;
}

public void setTotalVotes(int totalVotes) {
this.totalVotes = totalVotes;
}

public Collection<OptionCount> getResults() {
return results;
}

public void setResults(Collection<OptionCount> results) {
this.results = results;
}
}
Loading