From 1ea79fbda4ab5d40a7902c0d778f5cabf4f34ce4 Mon Sep 17 00:00:00 2001
From: grata <aramis.grata@bluewin.ch>
Date: Thu, 27 Apr 2023 09:55:31 +0200
Subject: [PATCH] Added reading data from database using springboot

---
 .idea/misc.xml                                |  1 +
 pom.xml                                       |  5 ++
 .../ch/progetto152/controller/Controller.java | 10 +--
 .../controller/UserController.java            | 66 +++++++++++++++++++
 src/main/java/ch/progetto152/entity/User.java | 37 +++--------
 .../repository/UserRepository.java            | 10 +++
 .../ch/progetto152/services/UserService.java  | 14 +++-
 .../progetto152/services/WaypointService.java |  2 +
 src/main/resources/application.properties     |  3 +-
 9 files changed, 112 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/ch/progetto152/controller/UserController.java
 create mode 100644 src/main/java/ch/progetto152/repository/UserRepository.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fcd71ce..c6eabde 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/pom.xml b/pom.xml
index 8a001cb..4169aa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>javax.persistence-api</artifactId>
+			<version>2.2.3</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/ch/progetto152/controller/Controller.java b/src/main/java/ch/progetto152/controller/Controller.java
index e558288..e9dbba5 100644
--- a/src/main/java/ch/progetto152/controller/Controller.java
+++ b/src/main/java/ch/progetto152/controller/Controller.java
@@ -19,26 +19,26 @@ import java.util.List;
 @RequestMapping(value = "api/progetto152", produces = MediaType.APPLICATION_JSON_VALUE)
 public class Controller {
 
-    private static final String location = "location";
-    private static final String waypoint = "waypoint";
+    private static final String location1 = "location";
+    private static final String waypoint1 = "waypoint";
 
     @Autowired
     private UserService userService;
 
 
-    @GetMapping(value= location, produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value= location1, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<List<Location>> getLocations() {
         List<Location> locations = LocationService.getLocations();
         return new ResponseEntity<>(locations, HttpStatus.OK);
     }
 
-    @GetMapping(value= waypoint, produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value= waypoint1, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<List<Waypoints>> getWaypoints() {
         List<Waypoints> waypoints = WaypointService.getWaypoints();
         return new ResponseEntity<>(waypoints, HttpStatus.OK);
     }
 
-    @PostMapping(value= location, produces = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value= location1, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> createLocation(@RequestBody Location location) {
         LocationService.createLocation(location);
         return new ResponseEntity<>(HttpStatus.CREATED);
diff --git a/src/main/java/ch/progetto152/controller/UserController.java b/src/main/java/ch/progetto152/controller/UserController.java
new file mode 100644
index 0000000..a75c4e2
--- /dev/null
+++ b/src/main/java/ch/progetto152/controller/UserController.java
@@ -0,0 +1,66 @@
+package ch.progetto152.controller;
+
+
+import ch.progetto152.entity.User;
+import ch.progetto152.services.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/users")
+public class UserController {
+
+
+    private final UserService userService;
+
+    @Autowired
+    public UserController(UserService userService) {
+        this.userService = userService;
+    }
+
+    @GetMapping("/get/all")
+    public ResponseEntity<List<User>> getAllUsers() {
+        List<User> users = userService.getAllUsers();
+        return new ResponseEntity<>(users, HttpStatus.OK);
+    }
+
+    @GetMapping("/get/{id}")
+    public ResponseEntity<User> getUserById(@PathVariable("id") Long id) {
+        User user = userService.getUserByIdService(id);
+        if (user != null) {
+            return new ResponseEntity<>(user, HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
+    @PostMapping("/create/{id}")
+    public ResponseEntity<User> createUser(@RequestBody User user) {
+        User createdUser = userService.createUser(user);
+        return new ResponseEntity<>(createdUser, HttpStatus.CREATED);
+    }
+
+    @PutMapping("/put/{id}")
+    public ResponseEntity<User> updateUser(@PathVariable("id") Long id, @RequestBody User user) {
+        User updatedUser = userService.updateUser(id, user);
+        if (updatedUser != null) {
+            return new ResponseEntity<>(updatedUser, HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
+    @DeleteMapping("/delete/{id}")
+    public ResponseEntity<Void> deleteUser(@PathVariable("id") Long id) {
+        boolean deleted = userService.deleteUser(id);
+        if (deleted) {
+            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        } else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+}
diff --git a/src/main/java/ch/progetto152/entity/User.java b/src/main/java/ch/progetto152/entity/User.java
index 39b2d11..87157a3 100644
--- a/src/main/java/ch/progetto152/entity/User.java
+++ b/src/main/java/ch/progetto152/entity/User.java
@@ -1,13 +1,20 @@
 package ch.progetto152.entity;
 
 import jakarta.persistence.*;
+import lombok.*;
 
 import java.util.Objects;
 
 @Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+@Table
 public class User {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private int id;
     @Basic
@@ -20,35 +27,9 @@ public class User {
     @Column(name = "password")
     private String password;
 
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
+    public User(String name, String username, String password) {
         this.name = name;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
         this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
         this.password = password;
     }
 
diff --git a/src/main/java/ch/progetto152/repository/UserRepository.java b/src/main/java/ch/progetto152/repository/UserRepository.java
new file mode 100644
index 0000000..afcbd26
--- /dev/null
+++ b/src/main/java/ch/progetto152/repository/UserRepository.java
@@ -0,0 +1,10 @@
+package ch.progetto152.repository;
+
+import ch.progetto152.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Integer> {
+
+}
diff --git a/src/main/java/ch/progetto152/services/UserService.java b/src/main/java/ch/progetto152/services/UserService.java
index dff14a2..d4d6bdc 100644
--- a/src/main/java/ch/progetto152/services/UserService.java
+++ b/src/main/java/ch/progetto152/services/UserService.java
@@ -2,6 +2,8 @@ package ch.progetto152.services;
 
 
 import ch.progetto152.entity.User;
+import ch.progetto152.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -9,8 +11,16 @@ import java.util.List;
 @Service
 public class UserService {
 
+    private final UserRepository userRepository;
+
+    @Autowired
+    public UserService(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
     public List<User> getAllUsers() {
-        return null;
+        System.out.println(userRepository.findAll());
+        return userRepository.findAll();
     }
 
     public User getUserByIdService(Long id) {
@@ -18,7 +28,7 @@ public class UserService {
     }
 
     public User createUser(User user) {
-        return null;
+        return userRepository.save(user);
     }
 
     public User updateUser(Long id, User user) {
diff --git a/src/main/java/ch/progetto152/services/WaypointService.java b/src/main/java/ch/progetto152/services/WaypointService.java
index 4b41fb0..f737f67 100644
--- a/src/main/java/ch/progetto152/services/WaypointService.java
+++ b/src/main/java/ch/progetto152/services/WaypointService.java
@@ -1,9 +1,11 @@
 package ch.progetto152.services;
 
 import ch.progetto152.entity.Waypoints;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+@Service
 public class WaypointService {
     public static List<Waypoints> getWaypoints() {
         return null;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5543e77..7b5d1a9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,5 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/Progetto152
 spring.datasource.username=root
-spring.datasource.password=Eragon05
\ No newline at end of file
+spring.datasource.password=Admin123
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
\ No newline at end of file