From 69265ebca3884d0ba356c3bb91f3e2d979f84a6b Mon Sep 17 00:00:00 2001 From: Anthony Massaad Date: Thu, 2 Nov 2023 17:46:22 -0400 Subject: [PATCH 01/10] inital commit for templates --- pom.xml | 10 +++++ .../opinionowl/controllers/APIController.java | 44 +++++++++++++++++++ .../controllers/PageController.java | 38 ++++++++++++++++ .../resources/templates/answerSurvey.html | 11 +++++ .../resources/templates/createSurvey.html | 11 +++++ src/main/resources/templates/index.html | 30 +++++++++++++ .../resources/templates/viewResponse.html | 11 +++++ 7 files changed, 155 insertions(+) create mode 100644 src/main/java/com/opinionowl/opinionowl/controllers/APIController.java create mode 100644 src/main/java/com/opinionowl/opinionowl/controllers/PageController.java create mode 100644 src/main/resources/templates/answerSurvey.html create mode 100644 src/main/resources/templates/createSurvey.html create mode 100644 src/main/resources/templates/index.html create mode 100644 src/main/resources/templates/viewResponse.html diff --git a/pom.xml b/pom.xml index ff89545..610266b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,11 +27,21 @@ h2 runtime + org.springframework.boot spring-boot-starter-test test + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java new file mode 100644 index 0000000..706e01c --- /dev/null +++ b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java @@ -0,0 +1,44 @@ +package com.opinionowl.opinionowl.controllers; + +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@RestController +@RequestMapping("/api/v1") +public class APIController { + + // @Autowired + // SurveyRepository sRepo; + + @GetMapping("/getAllSurveys") + public List getAllSurveys() { + // change Integer to a list of Survey Entities + List surveys = new ArrayList<>(); + surveys.add(1); + surveys.add(2); + return surveys; + } + + @PostMapping("/postSurveyResponses") + public void postSurveyResponses(HttpServletResponse response) throws IOException { + // change Integer to a list of Survey Entities + // handle save of data + // redirect to home + response.sendRedirect("/"); + } + + @PostMapping("/createSurvey") + public void createSurvey(HttpServletResponse response) throws IOException { + // change Integer to a list of Survey Entities + // handle save of data + // redirect to home + response.sendRedirect("/"); + } +} diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java new file mode 100644 index 0000000..8186d58 --- /dev/null +++ b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java @@ -0,0 +1,38 @@ +package com.opinionowl.opinionowl.controllers; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +@Controller +public class PageController { + + // @Autowired + // SurveyRepository sRepo; + + @GetMapping("/") + public String getHomePage(Model model) { + // mocking survey results + return "index"; + } + + @GetMapping("/createSurvey") + public String getCreateSurveyPage(Model model) { + return "createSurvey"; + } + + @GetMapping("/answerSurvey") + public String getAnswerSurveyPage(Model model) { + return "answerSurvey"; + } + + @GetMapping("/viewResponse") + public String getViewResponsePage(Model model) { + return "viewResponse"; + } +} diff --git a/src/main/resources/templates/answerSurvey.html b/src/main/resources/templates/answerSurvey.html new file mode 100644 index 0000000..0c35e4d --- /dev/null +++ b/src/main/resources/templates/answerSurvey.html @@ -0,0 +1,11 @@ + + + + Created AddressBook + + + + +

Answer Survey

+ + \ No newline at end of file diff --git a/src/main/resources/templates/createSurvey.html b/src/main/resources/templates/createSurvey.html new file mode 100644 index 0000000..43a8d1c --- /dev/null +++ b/src/main/resources/templates/createSurvey.html @@ -0,0 +1,11 @@ + + + + Created AddressBook + + + + +

Create Survey

+ + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..6b92cf9 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,30 @@ + + + + Created AddressBook + + + + +

Welcome To OpinionOwl

+

+ +
+

Surveys Available

+ +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/viewResponse.html b/src/main/resources/templates/viewResponse.html new file mode 100644 index 0000000..81cf6aa --- /dev/null +++ b/src/main/resources/templates/viewResponse.html @@ -0,0 +1,11 @@ + + + + Created AddressBook + + + + +

View Response

+ + \ No newline at end of file From 1bf353bed3fdca27ac658afc0f443493be36d784 Mon Sep 17 00:00:00 2001 From: anthony-massaad Date: Thu, 2 Nov 2023 22:23:19 -0400 Subject: [PATCH 02/10] added basic templates for all pages. Finish create survey basic form building. --- .../opinionowl/controllers/APIController.java | 30 ++- .../controllers/PageController.java | 4 +- src/main/resources/application.properties | 3 +- src/main/resources/static/images/owl.png | Bin 0 -> 11515 bytes .../resources/templates/answerSurvey.html | 2 +- .../resources/templates/createSurvey.html | 202 +++++++++++++++++- .../resources/templates/fragments/footer.html | 1 + .../resources/templates/fragments/header.html | 6 + src/main/resources/templates/index.html | 53 +++-- 9 files changed, 259 insertions(+), 42 deletions(-) create mode 100644 src/main/resources/static/images/owl.png create mode 100644 src/main/resources/templates/fragments/footer.html create mode 100644 src/main/resources/templates/fragments/header.html diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java index 706e01c..ffeb9aa 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java @@ -1,11 +1,14 @@ package com.opinionowl.opinionowl.controllers; +import com.fasterxml.jackson.databind.ObjectMapper; // You might need to import this class +import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.io.BufferedReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -17,15 +20,6 @@ public class APIController { // @Autowired // SurveyRepository sRepo; - @GetMapping("/getAllSurveys") - public List getAllSurveys() { - // change Integer to a list of Survey Entities - List surveys = new ArrayList<>(); - surveys.add(1); - surveys.add(2); - return surveys; - } - @PostMapping("/postSurveyResponses") public void postSurveyResponses(HttpServletResponse response) throws IOException { // change Integer to a list of Survey Entities @@ -35,10 +29,26 @@ public void postSurveyResponses(HttpServletResponse response) throws IOException } @PostMapping("/createSurvey") - public void createSurvey(HttpServletResponse response) throws IOException { + public void createSurvey(HttpServletRequest request, HttpServletResponse response) throws IOException { // change Integer to a list of Survey Entities // handle save of data // redirect to home + // Read the JSON data from the request + System.out.println("Hit create Survey"); + BufferedReader reader = request.getReader(); + System.out.println(reader); + StringBuilder jsonBuilder = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + jsonBuilder.append(line); + } + + String jsonData = jsonBuilder.toString(); + + ObjectMapper objectMapper = new ObjectMapper(); +// SurveyData surveyData = objectMapper.readValue(jsonData, SurveyData.class); + + response.sendRedirect("/"); } } diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java index 8186d58..25c6219 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java @@ -4,6 +4,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; import java.util.ArrayList; import java.util.HashMap; @@ -27,7 +28,8 @@ public String getCreateSurveyPage(Model model) { } @GetMapping("/answerSurvey") - public String getAnswerSurveyPage(Model model) { + public String getAnswerSurveyPage(@RequestParam(value = "surveyId") Long surveyId, Model model) { + model.addAttribute("surveyId", surveyId); return "answerSurvey"; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b13789..0e621e4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,2 @@ - +spring.thymeleaf.prefix=classpath:/templates/ +spring.thymeleaf.suffix=.html \ No newline at end of file diff --git a/src/main/resources/static/images/owl.png b/src/main/resources/static/images/owl.png new file mode 100644 index 0000000000000000000000000000000000000000..b2135ad9876e52a3cd2990159967d808d4332650 GIT binary patch literal 11515 zcmXYXWl$Wx*ER0$?oM%sEl%-W+@X}>P$<5O6)gn{l%flZ%OV9zkrtQY4vV`MclU?i z|9xk2Ztgv~=T1Ikl1V1fIzUx?92y)XBqV%wHDx^{BoxpKOt4U27_EV`PcL1Lj+TLn z>PIaPVf6ns3=iS|H9<5VA*BC&A@t{Lq(>Oii+%c^eQ`WRFdsI5K0iMT5+l`_u!YGI zJ^vJVYSMUyQ$2UTe;Nt6Un#kn%Xykk$kC#Cyg7;1Vd>3v|JRo?TOaW|*1Qy=p8j6+ z;$VF-0;OD!@%doLSXO9iWU#TSOp${!?|W>dm(xcxP__Zuemmr9xh8bJ$?0XPgx-2U zeWXa+wz*-wr04M_k5)$u&y0U@+c>ch0!E@mc3EuH$l6q5@jAo&7zoF+r zm*M^Mim%$Bx+|k;ryUYr-)`E{!Jz%;xa>Emg~1Pk@nb$HqX`JnxYxb-pNP_l+1*w_ zahgFZxO5Wv@oXJhg`krX0oVPp)7JVCKcf~p))|lhi`o}{iB!fp65jS==EX2uV-G+~{#q3Y-65f-+aIw02M) z*IqB7YN5xA(vz&t-{UOeuHO5aTMa(7;3>=cRP7#nh4YRlo_xX6inWzOF|ryhXPQ?x z+G2qvpOk*5;|n4mn_U}TDz?9{({N^KZof=&%Z+5jq06j>0OTXC69;1AzZ9u1g>6s> zM0Ps6#Ug)g>~@O}CnGAS@{cB*`xRN*m=wlh6-Y(y|C3&mvM$L(-|^M`L=ahsgsZwL zM7<1YaF~EaRi$mcJ3T@Wm|_ieZ?_1F`|3Gdst|KmqxD7#r>X8M!ELGHtFO8^bG6A- zJZe)mQeR^hO+2b7e)9S1Z<$~euy7i!@a)T^6iTm}<}fHL{3y_^hhyZW^0#d1iXU5b zGEGf!mPoHx6nRWSS74d=P>uZ~J|gsWRX+KRr9a=frWI*oZg@QCkqLiilqwuVsA| zygvS4q|Sl7+vT-WI@VR-C4(~ZGCbmjCVGhVP2R_gJ%9V1jLy>3#SX-TP}xt6+dn@V z6IJsjZX@Cx`h-juPY2pg$+rrv5*LFpvhB#`gip>>@fbz z5J45*NTx>WEP4_k;7B;#S#^V8aq%*}Qq0{!A5rNn_z{AHt(3>10>zC4ohgSzXr3wm zw9MriU<=JpqCmm5`Ob;LM)zV0-lbCSFOMK6>EViqeuer?{0{JOIXLi}yheq^Meo->T11$9h)1vtfPXHyyi3XN zlfUeSKM|&&jUB0Gs*CCFex`YAt}~!%yxx~$6_{~1XZvdw9}`z#3m`KUcASO19a!M`>MdFf^X|>L_vd5=bm3oY?+~ z(BqjNp97ZW8n||hFTJ6LE^~`rIl}2yL)uF8R#P}vXQfD>!qkvuJpW|!V79pWpOZ@VWTz^? zHL~9)&)xhRv%foK{9Fxp9}7x!$Q>Y!SW6-nN4_@1E2tiz%^gs1ulSP+Y)tqd)>|^{ z_>n%;v=7Vp#(UAO=Us$uX0@sE7Ju8jC?wBoC-r}3f09d3$)AB{TX6lSVL#tVBIjW^b^_quY`@$sk9$VQ;9>2w` z3Oh&dfBGn%XqswD{>E`!ym*<-^+I6&NmT(v$;NFp+LDh-m>202ikE8zSKx0Uv6J

X6)Gz5sVDpM@sLbq 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 T;Nki5MHoq41*lx9XdU){4E8cN literal 0 HcmV?d00001 diff --git a/src/main/resources/templates/answerSurvey.html b/src/main/resources/templates/answerSurvey.html index 0c35e4d..1714a43 100644 --- a/src/main/resources/templates/answerSurvey.html +++ b/src/main/resources/templates/answerSurvey.html @@ -6,6 +6,6 @@ -

Answer Survey

+

Responding to Survey:

\ No newline at end of file diff --git a/src/main/resources/templates/createSurvey.html b/src/main/resources/templates/createSurvey.html index 43a8d1c..d9067aa 100644 --- a/src/main/resources/templates/createSurvey.html +++ b/src/main/resources/templates/createSurvey.html @@ -1,11 +1,199 @@ - + Created AddressBook - - - -

Create Survey

- - \ No newline at end of file + + + +
+

Create a Survey

+
+ + + +
+ +
+

Form Title

+
+ + +
+ +
+
+
+ + + diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html new file mode 100644 index 0000000..28d587d --- /dev/null +++ b/src/main/resources/templates/fragments/footer.html @@ -0,0 +1 @@ +

© 2023 OpinionOwl. All rights reserved.

diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html new file mode 100644 index 0000000..abcdf23 --- /dev/null +++ b/src/main/resources/templates/fragments/header.html @@ -0,0 +1,6 @@ +
+ +
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 6b92cf9..34c5201 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,30 +1,39 @@ - + Created AddressBook - - - -

Welcome To OpinionOwl

-

- -
-

Surveys Available

- +
+
+ + From 85b9be9ad07eaa180fd19b66b618b350f32e4510 Mon Sep 17 00:00:00 2001 From: Anthony Massaad Date: Fri, 3 Nov 2023 15:56:15 -0400 Subject: [PATCH 03/10] fixed create survey, survey saved to database repo, home page shows all available surveys --- pom.xml | 5 ++ .../opinionowl/controllers/APIController.java | 74 +++++++++++++++---- .../controllers/PageController.java | 21 +++++- .../opinionowl/models/QuestionType.java | 15 +++- .../opinionowl/repos/SurveyRepository.java | 3 + .../resources/templates/answerSurvey.html | 9 ++- .../resources/templates/createSurvey.html | 31 ++++---- src/main/resources/templates/index.html | 18 ++--- 8 files changed, 124 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index ea04300..a8c1904 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,11 @@ org.projectlombok lombok + + org.json + json + LATEST + diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java index ffeb9aa..f02a564 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java @@ -1,17 +1,22 @@ package com.opinionowl.opinionowl.controllers; import com.fasterxml.jackson.databind.ObjectMapper; // You might need to import this class +import com.opinionowl.opinionowl.models.LongAnswerQuestion; +import com.opinionowl.opinionowl.models.RadioChoiceQuestion; +import com.opinionowl.opinionowl.models.RangeQuestion; +import com.opinionowl.opinionowl.models.Survey; +import com.opinionowl.opinionowl.repos.SurveyRepository; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import java.io.BufferedReader; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import java.util.*; @RestController @RequestMapping("/api/v1") @@ -19,6 +24,8 @@ public class APIController { // @Autowired // SurveyRepository sRepo; + @Autowired + SurveyRepository surveyRepo; @PostMapping("/postSurveyResponses") public void postSurveyResponses(HttpServletResponse response) throws IOException { @@ -28,27 +35,62 @@ public void postSurveyResponses(HttpServletResponse response) throws IOException response.sendRedirect("/"); } + @GetMapping("/getSurveyData") + public Survey getSurveyData(@RequestParam(value = "surveyId") Long surveyId) throws IOException { + Optional surveyO = surveyRepo.findById(surveyId); + if (surveyO.isPresent()) { + Survey survey = surveyO.get(); + System.out.println("Survey found:\n"); + System.out.println(survey); + return survey; + } else { + System.out.println("ERROR: Survey could not be found"); + System.exit(1); + } + return null; + } + @PostMapping("/createSurvey") - public void createSurvey(HttpServletRequest request, HttpServletResponse response) throws IOException { - // change Integer to a list of Survey Entities - // handle save of data - // redirect to home - // Read the JSON data from the request - System.out.println("Hit create Survey"); + public int createSurvey(HttpServletRequest request, HttpServletResponse response) throws IOException { + System.out.println("createSurvey() API"); + // read the json sent by the client BufferedReader reader = request.getReader(); - System.out.println(reader); + // create a string format of the json from the reader StringBuilder jsonBuilder = new StringBuilder(); String line; while ((line = reader.readLine()) != null) { jsonBuilder.append(line); } - String jsonData = jsonBuilder.toString(); + System.out.println("JSONDATA: " + jsonData); + // Parse the JSON data using Jackson ObjectMapper + //create the objects as java objects ObjectMapper objectMapper = new ObjectMapper(); -// SurveyData surveyData = objectMapper.readValue(jsonData, SurveyData.class); + HashMap surveyData = objectMapper.readValue(jsonData, new TypeReference>() {}); + // Extract specific data from the parsed JSON + String title = (String) surveyData.get("title"); + List textQuestions = (List) surveyData.get("textQuestions"); + HashMap> radioQuestions = (HashMap>) surveyData.get("radioQuestions"); + HashMap> numericRanges = (HashMap>) surveyData.get("numericRanges"); + Survey survey = new Survey(title); + // add all the question types to the survey + for (String questionTitle : textQuestions) { + survey.addQuestion(new LongAnswerQuestion(questionTitle, 50)); + } - response.sendRedirect("/"); + for (String questionTitle : radioQuestions.keySet()) { + String[] radioQuestionsArr = new String[radioQuestions.get(questionTitle).size()]; + survey.addQuestion(new RadioChoiceQuestion(questionTitle, radioQuestions.get(questionTitle).toArray(radioQuestionsArr))); + } + + for (String questionTitle : numericRanges.keySet()) { + List ranges = numericRanges.get(questionTitle); + survey.addQuestion(new RangeQuestion(questionTitle, ranges.get(0), ranges.get(1), 1)); + } + surveyRepo.save(survey); + System.out.println("survey generated\n\n" + survey); + return 200; } } diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java index 25c6219..0033929 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java @@ -1,5 +1,7 @@ package com.opinionowl.opinionowl.controllers; +import com.opinionowl.opinionowl.models.Survey; +import com.opinionowl.opinionowl.repos.SurveyRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -9,16 +11,18 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Optional; @Controller public class PageController { - // @Autowired - // SurveyRepository sRepo; + @Autowired + SurveyRepository surveyRepo; @GetMapping("/") public String getHomePage(Model model) { - // mocking survey results + List surveys = surveyRepo.findAll(); + model.addAttribute("surveys", surveys); return "index"; } @@ -29,7 +33,16 @@ public String getCreateSurveyPage(Model model) { @GetMapping("/answerSurvey") public String getAnswerSurveyPage(@RequestParam(value = "surveyId") Long surveyId, Model model) { - model.addAttribute("surveyId", surveyId); + Optional surveyO = surveyRepo.findById(surveyId); + if (surveyO.isPresent()) { + Survey survey = surveyO.get(); + System.out.println("Survey found:\n"); + System.out.println(survey); + model.addAttribute("survey", survey); + } else { + System.out.println("ERROR: Survey could not be found"); + System.exit(1); + } return "answerSurvey"; } diff --git a/src/main/java/com/opinionowl/opinionowl/models/QuestionType.java b/src/main/java/com/opinionowl/opinionowl/models/QuestionType.java index b655f43..5b11c9f 100644 --- a/src/main/java/com/opinionowl/opinionowl/models/QuestionType.java +++ b/src/main/java/com/opinionowl/opinionowl/models/QuestionType.java @@ -1,10 +1,19 @@ package com.opinionowl.opinionowl.models; +import lombok.Getter; + /** * An Enum to keep track of the different question types. */ + +@Getter public enum QuestionType { - LONG_ANSWER, - RADIO_CHOICE, - RANGE + LONG_ANSWER("Long Answer"), + RADIO_CHOICE("Radio Choice"), + RANGE("Range"); + + private final String type; + QuestionType(String type) { + this.type = type; + } } diff --git a/src/main/java/com/opinionowl/opinionowl/repos/SurveyRepository.java b/src/main/java/com/opinionowl/opinionowl/repos/SurveyRepository.java index 99c686f..0a39e8f 100644 --- a/src/main/java/com/opinionowl/opinionowl/repos/SurveyRepository.java +++ b/src/main/java/com/opinionowl/opinionowl/repos/SurveyRepository.java @@ -4,6 +4,7 @@ import org.springframework.data.repository.CrudRepository; import java.util.List; +import java.util.Optional; /** * The repository in charge of managing the CRUD operations for Survey Entity. @@ -11,4 +12,6 @@ public interface SurveyRepository extends CrudRepository { // Essentially performs SELECT * FROM survey List findAll(); + + Survey findById(long Id); } diff --git a/src/main/resources/templates/answerSurvey.html b/src/main/resources/templates/answerSurvey.html index 1714a43..f51f9a7 100644 --- a/src/main/resources/templates/answerSurvey.html +++ b/src/main/resources/templates/answerSurvey.html @@ -6,6 +6,13 @@ -

Responding to Survey:

+
+

Survey#:

+
+
+ +
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/createSurvey.html b/src/main/resources/templates/createSurvey.html index d9067aa..fa7d584 100644 --- a/src/main/resources/templates/createSurvey.html +++ b/src/main/resources/templates/createSurvey.html @@ -6,7 +6,7 @@ -
+

Create a Survey

@@ -15,7 +15,7 @@

Create a Survey

-

Form Title

+

Form Title

@@ -23,11 +23,12 @@

Form Title

-
+
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 1d223a2..8eef2f2 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,7 +1,7 @@ - Created AddressBook + OpinionOwl diff --git a/src/main/resources/templates/viewResponse.html b/src/main/resources/templates/viewResponse.html index 81cf6aa..e26f3ad 100644 --- a/src/main/resources/templates/viewResponse.html +++ b/src/main/resources/templates/viewResponse.html @@ -1,7 +1,7 @@ - Created AddressBook + OpinionOwl | Responses From eb9df155f5a6886f001933e8db53203fe7b34496 Mon Sep 17 00:00:00 2001 From: anthony-massaad Date: Sat, 4 Nov 2023 17:53:41 -0400 Subject: [PATCH 05/10] comments and JavaDoc added --- .../opinionowl/controllers/APIController.java | 56 +++++++++++-------- .../controllers/PageController.java | 30 +++++++++- 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java index f02a564..fb6cde8 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java @@ -8,50 +8,62 @@ import com.opinionowl.opinionowl.repos.SurveyRepository; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.type.TypeReference; import java.io.BufferedReader; import java.io.IOException; import java.util.*; +/** + * Version 1 of the API layer for Opinion Owl + */ @RestController @RequestMapping("/api/v1") public class APIController { - // @Autowired - // SurveyRepository sRepo; @Autowired SurveyRepository surveyRepo; + /** + *

Api call to handle the survey answers by a user.

+ *
+ * Api route: api/v1/postSurveyResponses + * @param response HttpServletResponse server side response + * @throws IOException + */ @PostMapping("/postSurveyResponses") public void postSurveyResponses(HttpServletResponse response) throws IOException { - // change Integer to a list of Survey Entities - // handle save of data + // handle save of survey data // redirect to home response.sendRedirect("/"); } - @GetMapping("/getSurveyData") - public Survey getSurveyData(@RequestParam(value = "surveyId") Long surveyId) throws IOException { - Optional surveyO = surveyRepo.findById(surveyId); - if (surveyO.isPresent()) { - Survey survey = surveyO.get(); - System.out.println("Survey found:\n"); - System.out.println(survey); - return survey; - } else { - System.out.println("ERROR: Survey could not be found"); - System.exit(1); - } - return null; - } - + /** + *

API Call to post a generated survey by the user. A survey generated JSON is required from the client

+ *
+ * Example of a JSON: + * 
+     * json = {
+     *     title: "title",
+     *     textQuestions: ["question 1", "question 2"],
+     *     radioQuestions: {
+     *         "question 1": ["radio 1", "radio 2"],
+     *         "question 2": ["radio 1", "radio 2", "radio 3"]
+     *     },
+     *     numericRanges: {
+     *         "question 1": [1, 11],
+     *         "question 2": [1, 5]
+     *     }
+     * }
+     *
+ * @param request HttpServletRequest request from the client + * @return 200 if api was a success + * @throws IOException + */ @PostMapping("/createSurvey") - public int createSurvey(HttpServletRequest request, HttpServletResponse response) throws IOException { + public int createSurvey(HttpServletRequest request) throws IOException { System.out.println("createSurvey() API"); // read the json sent by the client BufferedReader reader = request.getReader(); diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java index 588b137..70b641e 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java @@ -7,18 +7,24 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; - -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Optional; +/** + * Route controller for Opinion Owl pages + */ @Controller public class PageController { @Autowired SurveyRepository surveyRepo; + /** + *

Home route that gets all the surveys in the database, sends it to the model and directs the user to the home page

+ * @param model Model, the client Model + * @return String, the html template + */ @GetMapping("/") public String getHomePage(Model model) { List surveys = surveyRepo.findAll(); @@ -26,18 +32,35 @@ public String getHomePage(Model model) { return "index"; } + /** + *

Route for the create survey page

+ * @param model Model, the client Model + * @return String ,the html template + */ @GetMapping("/createSurvey") public String getCreateSurveyPage(Model model) { return "createSurvey"; } + /** + *

Route to direct the client to the answer survey page, given a survey id to pass the Survey object to the Model

+ *
+ * Example call: /answerSurvey?surveyId=1 + * @param surveyId Long, the ID associated with a survey + * @param model Model, the client Model + * @return String, the html template + */ @GetMapping("/answerSurvey") public String getAnswerSurveyPage(@RequestParam(value = "surveyId") Long surveyId, Model model) { + // find the survey by id Optional surveyO = surveyRepo.findById(surveyId); if (surveyO.isPresent()) { + // was able to obtain a survey from the database by id, and grab it from the Optional Object Survey survey = surveyO.get(); System.out.println("Survey found:"); System.out.println(survey); + // cast the order of the questions to the associtate subclass they belong to + // Cast in hashmaps as List q = survey.getQuestions(); HashMap longAnswerQuestions = new HashMap<>(); HashMap radioChoiceQuestions = new HashMap<>(); @@ -55,6 +78,7 @@ public String getAnswerSurveyPage(@RequestParam(value = "surveyId") Long surveyI rangeQuestionQuestions.put(questionNumber, (RangeQuestion) question); } } + // send the Model the data necessary for the page model.addAttribute("surveyId", survey.getId()); model.addAttribute("surveyTitle", title); model.addAttribute("numberOfQuestions", numQuestions); @@ -62,6 +86,8 @@ public String getAnswerSurveyPage(@RequestParam(value = "surveyId") Long surveyI model.addAttribute("radioChoiceQuestions", radioChoiceQuestions); model.addAttribute("rangeQuestionQuestions", rangeQuestionQuestions); } else { + // could not find survey, Error + // TODO: Redirect the user to a Error boundary page, or maybe the home page instead with a Toast message System.out.println("ERROR: Survey could not be found"); System.exit(1); } From 056eec98e4342f3d276071cb644fdb21b7d7a825 Mon Sep 17 00:00:00 2001 From: anthony-massaad Date: Sat, 4 Nov 2023 18:01:55 -0400 Subject: [PATCH 06/10] removed dependency in pom --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index a8c1904..ea04300 100644 --- a/pom.xml +++ b/pom.xml @@ -44,11 +44,6 @@ org.projectlombok lombok - - org.json - json - LATEST - From 32db9ba314d68324a3c0354cdceb33505c855a1f Mon Sep 17 00:00:00 2001 From: anthony-massaad Date: Sat, 4 Nov 2023 18:07:36 -0400 Subject: [PATCH 07/10] added no args constructor for the controllers --- .../com/opinionowl/opinionowl/controllers/APIController.java | 2 ++ .../com/opinionowl/opinionowl/controllers/PageController.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java index fb6cde8..19812aa 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java @@ -8,6 +8,7 @@ import com.opinionowl.opinionowl.repos.SurveyRepository; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import lombok.NoArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.fasterxml.jackson.core.type.TypeReference; @@ -21,6 +22,7 @@ */ @RestController @RequestMapping("/api/v1") +@NoArgsConstructor public class APIController { @Autowired diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java index 70b641e..ca77778 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java @@ -2,6 +2,7 @@ import com.opinionowl.opinionowl.models.*; import com.opinionowl.opinionowl.repos.SurveyRepository; +import lombok.NoArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -15,6 +16,7 @@ * Route controller for Opinion Owl pages */ @Controller +@NoArgsConstructor public class PageController { @Autowired From 5fc46e0148ec21c9d586ec23b008be66fc57f7c1 Mon Sep 17 00:00:00 2001 From: anthony-massaad Date: Sat, 4 Nov 2023 18:21:45 -0400 Subject: [PATCH 08/10] merged main to branch for up to date version. Updated code to match recent changes --- .../opinionowl/controllers/APIController.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java index 19812aa..cb41639 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/APIController.java @@ -1,11 +1,9 @@ package com.opinionowl.opinionowl.controllers; import com.fasterxml.jackson.databind.ObjectMapper; // You might need to import this class -import com.opinionowl.opinionowl.models.LongAnswerQuestion; -import com.opinionowl.opinionowl.models.RadioChoiceQuestion; -import com.opinionowl.opinionowl.models.RangeQuestion; -import com.opinionowl.opinionowl.models.Survey; +import com.opinionowl.opinionowl.models.*; import com.opinionowl.opinionowl.repos.SurveyRepository; +import com.opinionowl.opinionowl.repos.UserRepository; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.NoArgsConstructor; @@ -28,6 +26,11 @@ public class APIController { @Autowired SurveyRepository surveyRepo; + + @Autowired + private UserRepository userRepository; + + /** *

Api call to handle the survey answers by a user.

*
@@ -88,20 +91,23 @@ public int createSurvey(HttpServletRequest request) throws IOException { HashMap> radioQuestions = (HashMap>) surveyData.get("radioQuestions"); HashMap> numericRanges = (HashMap>) surveyData.get("numericRanges"); - Survey survey = new Survey(title); + AppUser user = new AppUser("username", "password"); + userRepository.save(user); + Survey survey = new Survey(user, title); + user.addSurvey(survey); // add all the question types to the survey for (String questionTitle : textQuestions) { - survey.addQuestion(new LongAnswerQuestion(questionTitle, 50)); + survey.addQuestion(new LongAnswerQuestion(survey, questionTitle, 50)); } for (String questionTitle : radioQuestions.keySet()) { String[] radioQuestionsArr = new String[radioQuestions.get(questionTitle).size()]; - survey.addQuestion(new RadioChoiceQuestion(questionTitle, radioQuestions.get(questionTitle).toArray(radioQuestionsArr))); + survey.addQuestion(new RadioChoiceQuestion(survey, questionTitle, radioQuestions.get(questionTitle).toArray(radioQuestionsArr))); } for (String questionTitle : numericRanges.keySet()) { List ranges = numericRanges.get(questionTitle); - survey.addQuestion(new RangeQuestion(questionTitle, ranges.get(0), ranges.get(1), 1)); + survey.addQuestion(new RangeQuestion(survey, questionTitle, ranges.get(0), ranges.get(1), 1)); } surveyRepo.save(survey); System.out.println("survey generated\n\n" + survey); From ffcaaeba871446688a36b96c1a08604299cfce31 Mon Sep 17 00:00:00 2001 From: anthony-massaad Date: Sat, 4 Nov 2023 20:06:35 -0400 Subject: [PATCH 09/10] addressed PR review. added scripts folder for javascript files --- .../resources/static/scripts/createSurvey.js | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 src/main/resources/static/scripts/createSurvey.js diff --git a/src/main/resources/static/scripts/createSurvey.js b/src/main/resources/static/scripts/createSurvey.js new file mode 100644 index 0000000..2ec8be9 --- /dev/null +++ b/src/main/resources/static/scripts/createSurvey.js @@ -0,0 +1,168 @@ +let counter = 0; +let numOfQuestions = 0; + +const formTitle = $(".form-title"); +const survey = $("#survey"); +const addTextQuestion = $("#add-text"); +const addRadioChoice = $("#add-radio-choice"); +const addNumericRange = $("#add-numeric-range"); +const submitButton = $("#create-survey"); +submitButton.attr("disabled", true); +const generateUniqueID = () => { + counter++; + return `unique-${counter}-${Math.floor(Math.random() * 1000)}`; +}; + +/** + * + * @param {string} radioQuestionContainer + * @param {string} uniqueName + */ +const addMoreRadioOptions = (radioQuestionContainer, uniqueName) => { + const uniqueId = generateUniqueID(); + $(radioQuestionContainer).append(` +
+ + + `); +}; + +/** + * + * @param {string} tableRowId + */ +const removeTableRow = (tableRowId) => { + $(tableRowId).remove(); + decrementNumOfQuestion(); +}; + +const incrementNumOfQuestions = () => { + numOfQuestions++; + submitButton.removeAttr('disabled'); +}; + +const decrementNumOfQuestion = () => { + numOfQuestions--; + if (numOfQuestions === 0){ + submitButton.attr("disabled", true); + } +}; + +addTextQuestion.click((e) => { + e.preventDefault(); + const rowId = generateUniqueID(); + const question = ` + + + + + `; + survey.append(question); + incrementNumOfQuestions(); +}); + +addRadioChoice.click((e) => { + e.preventDefault(); + const rowId = generateUniqueID(); + const radioQuestionContainer = generateUniqueID(); + const uniqueName = generateUniqueID(); + const question = ` + + + + + `; + survey.append(question); + incrementNumOfQuestions(); +}); + +addNumericRange.click((e) => { + e.preventDefault(); + const rowId = generateUniqueID(); + const question = ` + + + + + `; + survey.append(question); + incrementNumOfQuestions(); +}); + +submitButton.click((e) => { + e.preventDefault(); + const dataDictionary = {}; + dataDictionary["radioQuestions"] = {}; + dataDictionary["numericRanges"] = {}; + dataDictionary["title"] = formTitle.text(); + // Iterate over table rows with the class 'text-questions' + const textQuestions = [] + $('.text-questions label').each(function () { + textQuestions.push($(this).text()) + }).get(); + dataDictionary["textQuestions"] = textQuestions; + + $('.radio-questions').each(function() { + const title = $(this).find('.title').text(); + const radioQuestions = []; + const radioQuestionContainer = $(this).find('div'); + $(radioQuestionContainer).find('label:not(.title)').each(function () { + radioQuestions.push($(this).text()); + }); + dataDictionary["radioQuestions"][title] = radioQuestions; + }); + + $('.numeric-questions').each(function() { + const title = $(this).find(".title").text(); + const ranges = []; + $(this).find("span").each(function() { + ranges.push(parseInt($(this).text())); + }) + dataDictionary["numericRanges"][title] = ranges; + }); + + console.log(dataDictionary); + + // send post using ajax + const dataJson = JSON.stringify(dataDictionary); + $.ajax({ + type: $("#survey-container").attr("method"), + url: '/api/v1/createSurvey', + data: dataJson, + contentType: 'application/json', + success: function(res) { + // Handle the success response (optional) + console.log('Survey created successfully'); + if (res === 200) window.location.href = "/"; + // You can add code to redirect to the home page if needed + }, + error: function(xhr, status, error) { + // Handle the error response (optional) + console.error('Error creating survey:', error); + } + }); +}); \ No newline at end of file From 1462fda0adf725299b6d99cd9f99428f2d12fc5e Mon Sep 17 00:00:00 2001 From: anthony-massaad Date: Sat, 4 Nov 2023 20:09:30 -0400 Subject: [PATCH 10/10] ditto --- .../controllers/PageController.java | 6 +- .../resources/static/scripts/createSurvey.js | 5 +- .../resources/templates/createSurvey.html | 171 +----------------- 3 files changed, 6 insertions(+), 176 deletions(-) diff --git a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java index ca77778..dec9210 100644 --- a/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java +++ b/src/main/java/com/opinionowl/opinionowl/controllers/PageController.java @@ -72,11 +72,11 @@ public String getAnswerSurveyPage(@RequestParam(value = "surveyId") Long surveyI for (int i = 0; i { data: dataJson, contentType: 'application/json', success: function(res) { - // Handle the success response (optional) + // success handling console.log('Survey created successfully'); if (res === 200) window.location.href = "/"; - // You can add code to redirect to the home page if needed }, error: function(xhr, status, error) { - // Handle the error response (optional) + // error handling console.error('Error creating survey:', error); } }); diff --git a/src/main/resources/templates/createSurvey.html b/src/main/resources/templates/createSurvey.html index 6716ef3..ff98185 100644 --- a/src/main/resources/templates/createSurvey.html +++ b/src/main/resources/templates/createSurvey.html @@ -24,175 +24,6 @@

Form Title

- +
+ + + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+ 0 + + 11 +