From d63523889af21fbcefcdddefc378d9e8ce2a1097 Mon Sep 17 00:00:00 2001
From: Kibret Tecle <kibrettecle@zipcoders-MacBook-Pro-5.local>
Date: Thu, 5 Apr 2018 23:32:12 -0400
Subject: [PATCH 1/3] Saving

---
 .../controller/PollController.java            | 64 +++++++++++++++++++
 .../controller/VoteController.java            | 33 ++++++++++
 .../domain/Option.java                        | 34 ++++++++++
 .../domain/Poll.java                          | 45 +++++++++++++
 .../domain/Vote.java                          | 33 ++++++++++
 .../repositories/OptionRepository.java        |  7 ++
 .../repositories/PollRepository.java          |  7 ++
 .../repositories/VoteRepository.java          |  7 ++
 .../QuickPollApplicationTest.java             |  2 +-
 9 files changed, 231 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
new file mode 100644
index 0000000..d1ca5f0
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,64 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+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.inject.Inject;
+import java.net.URI;
+
+@RestController
+public class PollController {
+
+    @Inject
+    private PollRepository pollRepository;
+
+    @Autowired
+    PollController(PollRepository pollRepository) {
+        this.pollRepository = pollRepository;
+    }
+
+    @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(@RequestBody Poll poll) {
+        poll = pollRepository.save(poll);
+        HttpHeaders responseHeaders = new HttpHeaders();
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        responseHeaders.setLocation(newPollUri);
+        return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
+
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        Poll p = pollRepository.findOne(pollId);
+        return new ResponseEntity<> (p, HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
+        // Save the entity
+        Poll p = pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
new file mode 100644
index 0000000..89273e6
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,33 @@
+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;
+
+@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, @RequestBody Vote
+            vote) {
+        vote = voteRepository.save(vote);
+        // Set the headers for the newly created resource
+        HttpHeaders responseHeaders = new HttpHeaders();
+        responseHeaders.setLocation(ServletUriComponentsBuilder.
+                fromCurrentRequest().path("/{id}").buildAndExpand(vote.getId()).toUri());
+        return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
+    }
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
new file mode 100644
index 0000000..5df374b
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,34 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Option {
+
+    @Id
+    @GeneratedValue
+    @Column(name= "OPTION_ID")
+    private Long id;
+    @Column(name = "OPTION_VALUE")
+    private String value;
+
+
+    public long getId() {
+        return id;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
new file mode 100644
index 0000000..172175a
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,45 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+import java.util.Set;
+
+@Entity
+public class Poll {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    private Long id;
+    @Column(name = "QUESTION")
+    private String question;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "POLL_ID")
+    @OrderBy
+    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;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
new file mode 100644
index 0000000..4ac5696
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,33 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Vote {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "VOTE_ID")
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    private 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;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
new file mode 100644
index 0000000..c266856
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import org.springframework.data.repository.CrudRepository;
+
+public interface OptionRepository extends CrudRepository<Option, Long>{
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
new file mode 100644
index 0000000..bb1b087
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import org.springframework.data.repository.CrudRepository;
+
+public interface PollRepository extends CrudRepository<Poll, Long> {
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
new file mode 100644
index 0000000..9ff0236
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.repository.CrudRepository;
+
+public interface VoteRepository extends CrudRepository<Vote,Long>{
+}
diff --git a/src/test/java/io/zipcoder/tc_spring_poll_application/QuickPollApplicationTest.java b/src/test/java/io/zipcoder/tc_spring_poll_application/QuickPollApplicationTest.java
index d8b9b3d..be29158 100644
--- a/src/test/java/io/zipcoder/tc_spring_poll_application/QuickPollApplicationTest.java
+++ b/src/test/java/io/zipcoder/tc_spring_poll_application/QuickPollApplicationTest.java
@@ -1,4 +1,4 @@
 package io.zipcoder.tc_spring_poll_application;
 
-public class QuickPollApplicationTest {
+public class  QuickPollApplicationTest {
 }
\ No newline at end of file

From 32ff83e2a777c66b8ee9c3959afcfb8adb47a72c Mon Sep 17 00:00:00 2001
From: Kibret Tecle <kibrettecle@zipcoders-MacBook-Pro-5.local>
Date: Mon, 9 Apr 2018 08:30:35 -0400
Subject: [PATCH 2/3] saving

---
 .../controller/PollController.java                    |  2 ++
 .../controller/VoteController.java                    | 10 ++++++++++
 .../repositories/VoteRepository.java                  | 11 ++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
index d1ca5f0..0f539af 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -32,6 +32,8 @@ public ResponseEntity<Iterable<Poll>> getAllPolls() {
     @RequestMapping(value = "/polls", method = RequestMethod.POST)
     public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
         poll = pollRepository.save(poll);
+
+        // Set the location header for the newly created resource
         HttpHeaders responseHeaders = new HttpHeaders();
         URI newPollUri = ServletUriComponentsBuilder
                 .fromCurrentRequest()
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
index 89273e6..07bb56b 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -29,5 +29,15 @@ public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote
                 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> getAllVotes(@PathVariable Long pollId) {
+        return voteRepository. findVotesByPoll(pollId);
+    }
+
 
 }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
index 9ff0236..b0beaa1 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -1,7 +1,16 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
-public interface VoteRepository extends CrudRepository<Vote,Long>{
+public interface VoteRepository extends CrudRepository<Vote, Long> {
+    @Query(value = "SELECT v.* " +
+            "FROM Option o, Vote v " +
+            "WHERE o.POLL_ID = ?1 " +
+            "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
+    public Iterable<Vote> findVotesByPoll(Long pollId);
+
+
 }
+

From 05be509132ceb2c04ef990d134988fe537c7bce9 Mon Sep 17 00:00:00 2001
From: Kibret Tecle <kibrettecle@zipcoders-MacBook-Pro-5.local>
Date: Mon, 9 Apr 2018 09:29:46 -0400
Subject: [PATCH 3/3] saving

---
 .../controller/ComputeResultController.java   | 32 +++++++++++++++++++
 .../dtos/OptionCount.java                     | 23 +++++++++++++
 .../dtos/VoteResult.java                      | 23 +++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
new file mode 100644
index 0000000..920c245
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -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);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
new file mode 100644
index 0000000..4578190
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
@@ -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;
+        }
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
new file mode 100644
index 0000000..28973f5
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
@@ -0,0 +1,23 @@
+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;
+    }
+}
\ No newline at end of file