Merge pull request #18 from CodeURJC-DAW-2021-22/feature/apigraph

Add graph data to API

Author: OscarArranz

backend/src/main/java/com/youdemy/controller/UserController.java

@@ -2,6 +2,7 @@
 
 import com.youdemy.model.Course;
 import com.youdemy.model.CourseBoughtTimes;
+import com.youdemy.service.CourseBoughtTimesService;
 import com.youdemy.service.CourseService;
 import com.youdemy.service.OrderPService;
 import com.youdemy.service.UserService;
@@ -38,7 +39,7 @@ public class UserController {
 	private PasswordEncoder passwordEncoder;
 
 	@Autowired
-	private CourseService courseService;
+	private CourseBoughtTimesService courseBoughtTimesService;
 
 	@ModelAttribute
 	public void addAttributes(Model model, HttpServletRequest request) {
@@ -108,14 +109,8 @@ public String showUserInfo(Model model, @PathVariable long id, HttpServletReques
 			}
 
 			if (model.getAttribute("teacher").equals(true)) {
-				ArrayList<Course> teacherCourses = (ArrayList<Course>) courseService.findByAuthor(user);
-				ArrayList<CourseBoughtTimes> coursesBoughtTimes = new ArrayList<>();
-
-				teacherCourses.forEach(course -> {
-					CourseBoughtTimes courseBoughtTimes = new CourseBoughtTimes(course.getTitle(), orderPService.countByCourse(course.getId()));
-
-					coursesBoughtTimes.add(courseBoughtTimes);
-				});
+				ArrayList<CourseBoughtTimes> coursesBoughtTimes =
+						new ArrayList<>(courseBoughtTimesService.getCourseBoughtTimes(user));
 
 				model.addAttribute("coursesBoughtTimes", coursesBoughtTimes);
 			}

backend/src/main/java/com/youdemy/controller/api/UserRestController.java

@@ -2,14 +2,22 @@
 
 import java.net.URI;
 import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.youdemy.model.Course;
+import com.youdemy.model.CourseBoughtTimes;
+import com.youdemy.service.CourseBoughtTimesService;
+import com.youdemy.service.CourseService;
+import com.youdemy.service.OrderPService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -35,6 +43,12 @@ public class UserRestController {
 
 	@Autowired
 	private UserService userService;
+
+	@Autowired
+	private CourseService courseService;
+
+	@Autowired
+	private CourseBoughtTimesService courseBoughtTimesService;
 
 	@Autowired
 	private PasswordEncoder passwordEncoder;
@@ -75,7 +89,6 @@ public ResponseEntity<User> registerNewUser(@RequestBody User user) {
 		if(user.getName().isBlank() || userService.existByEmail(user.getEmail())){
 			return new ResponseEntity<>(null, HttpStatus.NOT_ACCEPTABLE);
 		} else {
-			
 			user.setEncodedPassword(passwordEncoder.encode(user.getEncodedPassword()));
 			userService.save(user);
 			URI location = fromCurrentRequest().path("/{id}").buildAndExpand(user.getId()).toUri();
@@ -91,10 +104,25 @@ public ResponseEntity<User> deleteUser(@PathVariable long id) {
 			return new ResponseEntity<>(null, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);
-		}	
+		}
+	}
+
+	@RequestMapping("/{id}/graph")
+	public ResponseEntity<List<CourseBoughtTimes>> graph(@PathVariable long id) {
+		if (userService.exist(id)) {
+			User user = userService.findById(id).get();
+
+			if (user.getRoles().contains("TEACHER")) {
+				ArrayList<CourseBoughtTimes> coursesBoughtTimes =
+						new ArrayList<>(courseBoughtTimesService.getCourseBoughtTimes(user));
+				URI location = fromCurrentRequest().path("/{id}").buildAndExpand(user.getId()).toUri();
+
+				return ResponseEntity.created(location).body(coursesBoughtTimes);
+			}
+		}
+
+		return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);
 	}
-	
-			
 
 }
 

backend/src/main/java/com/youdemy/service/CourseBoughtTimesService.java

@@ -0,0 +1,34 @@
+package com.youdemy.service;
+
+import com.youdemy.model.Course;
+import com.youdemy.model.CourseBoughtTimes;
+import com.youdemy.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class CourseBoughtTimesService {
+
+    @Autowired
+    private CourseService courseService;
+
+    @Autowired
+    private OrderPService orderPService;
+
+    public List<CourseBoughtTimes> getCourseBoughtTimes(User user) {
+        ArrayList<Course> teacherCourses = (ArrayList<Course>) courseService.findByAuthor(user);
+        ArrayList<CourseBoughtTimes> coursesBoughtTimes = new ArrayList<>();
+
+        teacherCourses.forEach(course -> {
+            CourseBoughtTimes courseBoughtTimes = new CourseBoughtTimes(course.getTitle(), orderPService.countByCourse(course.getId()));
+
+            coursesBoughtTimes.add(courseBoughtTimes);
+        });
+
+        return coursesBoughtTimes;
+    }
+
+}

backend/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.mustache.suffix=.html
 spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.username=postgres
-spring.datasource.password=1234
+spring.datasource.password=pass
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.datasource.hikari.auto-commit=false
 spring.mustache.cache=false

backend/target/classes/application.properties

@@ -1,7 +1,8 @@
 spring.mustache.suffix=.html
-spring.datasource.url=jdbc:postgresql://172.17.0.2/youdemydb
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.username=postgres
-spring.datasource.password=password
+spring.datasource.password=pass
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.datasource.hikari.auto-commit=false
 spring.mustache.cache=false
@@ -14,7 +15,7 @@ spring.jpa.properties.hibernate.format_sql=true
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
-server.port = 8443
+server.port = ${PORT:8080}
 server.ssl.key-store = classpath:keystore.jks
 server.ssl.key-store-password = password
 server.ssl.key-password = secret