smilyes

backend/.gitignore

@@ -22,4 +22,7 @@
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
+/.nb-gradle/
+
+
+/HackthonApp.log*

backend/src/main/java/com/onemda/onemdabackend/controller/CategoryServiceController.java

@@ -0,0 +1,30 @@
+package com.onemda.onemdabackend.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.onemda.onemdabackend.model.ServiceCategory;
+import com.onemda.onemdabackend.service.CategoryService;
+
+
+@CrossOrigin
+@RestController
+@RequestMapping("/api/onemda")
+public class CategoryServiceController {
+
+	@Autowired
+	private CategoryService categoryService;
+
+	@CrossOrigin
+	@GetMapping("/categories")
+	public List<ServiceCategory> getAllServiceCategories(){
+		System.out.println("I am here");
+		return categoryService.getAllTheServiceCategory();
+	}
+
+}

backend/src/main/java/com/onemda/onemdabackend/controller/OnemdaController.java → backend/src/main/java/com/onemda/onemdabackend/controller/InstructorFeedbackController.java

@@ -1,14 +1,15 @@
 package com.onemda.onemdabackend.controller;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.CrossOrigin;
 
 import com.onemda.onemdabackend.model.InstructorFeedback;
 import com.onemda.onemdabackend.service.InstructorFeedbackService;
@@ -17,24 +18,21 @@
 @CrossOrigin
 @RestController
 @RequestMapping("/api/onemda")
-public class OnemdaController {
+public class InstructorFeedbackController {
 
 	@Autowired
 	private InstructorFeedbackService instructorFeedbackService;
-
-	@GetMapping("/sayHello")
-	public String sayHello() {
-		return "Hello World";
-	}
 
 	@CrossOrigin
 	@PostMapping("/instructorfeedback")
 	public void postInstructorFeedback(@RequestBody InstructorFeedback instructorFeedback){
+		instructorFeedback.setSubmittedAt(new Date());
 		instructorFeedbackService.addInstructorFeedback(instructorFeedback);
 	}
 
 	@GetMapping("/instructorfeedback")
 	public List<InstructorFeedback> getInstructorFeedback(){
 		return instructorFeedbackService.getInstructorFeedback();
 	}
+
 }

backend/src/main/java/com/onemda/onemdabackend/dao/ServiceCategoryDAO.java

@@ -0,0 +1,10 @@
+package com.onemda.onemdabackend.dao;
+
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+import com.onemda.onemdabackend.model.ServiceCategory;
+
+
+public interface ServiceCategoryDAO extends MongoRepository<ServiceCategory, String>{
+
+}

backend/src/main/java/com/onemda/onemdabackend/model/Activity.java

@@ -0,0 +1,27 @@
+package com.onemda.onemdabackend.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Activity {
+
+	@JsonProperty(value = "activity_id")
+	private String activityId;
+
+	@JsonProperty(value = "activity_name")
+	private String activityName;
+
+	public String getActivityId() {
+		return activityId;
+	}
+	public void setActivityId(String activityId) {
+		this.activityId = activityId;
+	}
+	public String getActivityName() {
+		return activityName;
+	}
+	public void setActivityName(String activityName) {
+		this.activityName = activityName;
+	}
+
+
+}

backend/src/main/java/com/onemda/onemdabackend/model/InstructorFeedback.java

@@ -1,76 +1,106 @@
 package com.onemda.onemdabackend.model;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.data.mongodb.core.mapping.Document;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.onemda.onemdabackend.util.LocalDateDeserializer;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 @Document(collection = "instructorfeedback")
 public class InstructorFeedback {
-	private String instructor_id;
-	private String instructor_name;
 
-	@JsonDeserialize(using=LocalDateDeserializer.class)
-	private LocalDate session_date;
-	private String session_time;
+	@JsonProperty(value="instructor_id")
+	private String instructorId;
+
+	@JsonProperty(value="instructor_name")
+	private String instructorName;
+
+	@JsonProperty(value="session_date")
+	@JsonFormat(shape = Shape.STRING, pattern="dd-MM-yyyy")
+	private LocalDate sessionDate;
+
+	@JsonProperty(value="session_time")
+	private String sessionTime;
+
+	@JsonProperty(value="submittedAt")
+	@JsonFormat(shape = Shape.STRING, pattern="dd-MM-yyyy")
+	private Date submittedAt;
 
-	@JsonDeserialize(using=LocalDateDeserializer.class)
-	private LocalDate submittedAt;
-	private String activity_name;
-	private List<String> service_category;
+	@JsonProperty(value="activity_name")
+	private String activityName;
+
+	@JsonProperty(value="service_category")
+	private List<String> serviceCategory;
+
+	@JsonProperty(value="participants")
 	private List<Participant> participants;
-	public String getInstructor_id() {
-		return instructor_id;
+
+	public String getInstructorId() {
+		return instructorId;
 	}
-	public void setInstructor_id(String instructor_id) {
-		this.instructor_id = instructor_id;
+
+	public void setInstructorId(String instructorId) {
+		this.instructorId = instructorId;
 	}
-	public String getInstructor_name() {
-		return instructor_name;
+
+	public String getInstructorName() {
+		return instructorName;
 	}
-	public void setInstructor_name(String instructor_name) {
-		this.instructor_name = instructor_name;
+
+	public void setInstructorName(String instructorName) {
+		this.instructorName = instructorName;
 	}
 
-	public String getSession_time() {
-		return session_time;
+	public LocalDate getSessionDate() {
+		return sessionDate;
 	}
-	public void setSession_time(String session_time) {
-		this.session_time = session_time;
+
+	public void setSessionDate(LocalDate sessionDate) {
+		this.sessionDate = sessionDate;
 	}
 
-	public String getActivity_name() {
-		return activity_name;
+	public String getSessionTime() {
+		return sessionTime;
 	}
-	public void setActivity_name(String activity_name) {
-		this.activity_name = activity_name;
+
+	public void setSessionTime(String sessionTime) {
+		this.sessionTime = sessionTime;
 	}
-	public List<String> getService_category() {
-		return service_category;
+
+	public Date getSubmittedAt() {
+		return submittedAt;
 	}
-	public void setService_category(List<String> service_category) {
-		this.service_category = service_category;
+
+	public void setSubmittedAt(Date submittedAt) {
+		this.submittedAt = submittedAt;
 	}
-	public List<Participant> getParticipants() {
-		return participants;
+
+	public String getActivityName() {
+		return activityName;
 	}
-	public void setParticipants(List<Participant> participants) {
-		this.participants = participants;
+
+	public void setActivityName(String activityName) {
+		this.activityName = activityName;
 	}
-	public LocalDate getSession_date() {
-		return session_date;
+
+	public List<String> getServiceCategory() {
+		return serviceCategory;
 	}
-	public void setSession_date(LocalDate session_date) {
-		this.session_date = session_date;
+
+	public void setServiceCategory(List<String> serviceCategory) {
+		this.serviceCategory = serviceCategory;
 	}
-	public LocalDate getSubmittedAt() {
-		return submittedAt;
+
+	public List<Participant> getParticipants() {
+		return participants;
 	}
-	public void setSubmittedAt(LocalDate submittedAt) {
-		this.submittedAt = submittedAt;
+
+	public void setParticipants(List<Participant> participants) {
+		this.participants = participants;
 	}
-
-
+
 }

backend/src/main/java/com/onemda/onemdabackend/model/Participant.java

@@ -1,71 +1,62 @@
 package com.onemda.onemdabackend.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class Participant {
 
-	private String participant_id;
-	private String participant_name;
-	private String instructor_feedback;
-	private String instructor_comment;
-	private String participant_feedback;
-	/**
-	 * @return the participant_id
-	 */
-	public String getParticipant_id() {
-		return participant_id;
+	@JsonProperty(value="participant_id")
+	private String participantId;
+
+	@JsonProperty(value="participant_name")
+	private String participantName;
+
+	@JsonProperty(value="instructor_feedback")
+	private String instructorFeedback;
+
+	@JsonProperty(value="instructor_comment")
+	private String instructorComment;
+
+	@JsonProperty(value="participant_feedback")
+	private String participantFeedback;
+
+	public String getParticipantId() {
+		return participantId;
 	}
-	/**
-	 * @param participant_id the participant_id to set
-	 */
-	public void setParticipant_id(String participant_id) {
-		this.participant_id = participant_id;
+
+	public void setParticipantId(String participantId) {
+		this.participantId = participantId;
 	}
-	/**
-	 * @return the participant_name
-	 */
-	public String getParticipant_name() {
-		return participant_name;
+
+	public String getParticipantName() {
+		return participantName;
 	}
-	/**
-	 * @param participant_name the participant_name to set
-	 */
-	public void setParticipant_name(String participant_name) {
-		this.participant_name = participant_name;
+
+	public void setParticipantName(String participantName) {
+		this.participantName = participantName;
 	}
-	/**
-	 * @return the instructor_feedback
-	 */
-	public String getInstructor_feedback() {
-		return instructor_feedback;
+
+	public String getInstructorFeedback() {
+		return instructorFeedback;
 	}
-	/**
-	 * @param instructor_feedback the instructor_feedback to set
-	 */
-	public void setInstructor_feedback(String instructor_feedback) {
-		this.instructor_feedback = instructor_feedback;
+
+	public void setInstructorFeedback(String instructorFeedback) {
+		this.instructorFeedback = instructorFeedback;
 	}
-	/**
-	 * @return the instructor_comment
-	 */
-	public String getInstructor_comment() {
-		return instructor_comment;
+
+	public String getInstructorComment() {
+		return instructorComment;
 	}
-	/**
-	 * @param instructor_comment the instructor_comment to set
-	 */
-	public void setInstructor_comment(String instructor_comment) {
-		this.instructor_comment = instructor_comment;
+
+	public void setInstructorComment(String instructorComment) {
+		this.instructorComment = instructorComment;
 	}
-	/**
-	 * @return the participant_feedback
-	 */
-	public String getParticipant_feedback() {
-		return participant_feedback;
+
+	public String getParticipantFeedback() {
+		return participantFeedback;
 	}
-	/**
-	 * @param participant_feedback the participant_feedback to set
-	 */
-	public void setParticipant_feedback(String participant_feedback) {
-		this.participant_feedback = participant_feedback;
+
+	public void setParticipantFeedback(String participantFeedback) {
+		this.participantFeedback = participantFeedback;
 	}
 
 }