first commit

pom.xml

@@ -30,10 +30,6 @@
 		<java.version>21</java.version>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>
@@ -58,6 +54,10 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jdbc</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/guams/review/ReViewApplication.java

@@ -1,7 +1,5 @@
 package com.guams.review;
 
-import com.guams.review.modele.Post;
-import com.guams.review.modele.User;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

src/main/java/com/guams/review/configuration/Advice.java

@@ -0,0 +1,16 @@
+package com.guams.review.configuration;
+
+import com.guams.review.exception.NotFoundException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+@ControllerAdvice
+public class Advice {
+
+    @ExceptionHandler(value = NotFoundException.class)
+    public ResponseEntity<Object> handleNotFound(NotFoundException exception) {
+        return new ResponseEntity<>(exception.getMessage(), HttpStatus.NOT_FOUND);
+    }
+}

src/main/java/com/guams/review/controller/PostController.java

@@ -1,82 +1,62 @@
 package com.guams.review.controller;
 
-import com.guams.review.modele.Post;
+import com.guams.review.exception.NotFoundException;
-import com.guams.review.modele.User;
+import com.guams.review.modele.dao.Post;
-import com.guams.review.repository.PostRepository;
-import com.guams.review.repository.UserRepository;
 import com.guams.review.service.PostService;
-import org.springframework.http.*;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.time.LocalDate;
 import java.util.List;
-import java.util.Optional;
 
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/posts")
-public class PostController
+public class PostController {
-{
+
     private final PostService postService;
-    private final PostRepository postRepository;
-    private final UserRepository userRepository;
-
-
-    public PostController(PostService postService, PostRepository postRepository, UserRepository userRepository) {
-        this.postService = postService;
-        this.postRepository = postRepository;
-        this.userRepository = userRepository;
-    }
 
     @GetMapping
-    public ResponseEntity<List<Post>> getPosts()
+    public List<Post> listPosts() {
-    {
+        return postService.list();
-        return new ResponseEntity<>(postRepository.findAll(), new HttpHeaders(), HttpStatus.OK);
     }
 
-    @GetMapping("{post-id}")
+    @GetMapping("/{id}")
-    public ResponseEntity<Post> getPost(@PathVariable("post-id") Long id)
+    public Post findPost(@PathVariable Long id) {
-    {
+        return postService.findById(id).orElseThrow(() -> new NotFoundException("Post not found"));
-        Optional<Post> post = postRepository.findById(id);
+    }
-        if (post.isPresent()) {
+
-            return new ResponseEntity<>(post.get(), new HttpHeaders(), HttpStatus.OK);
+    @PutMapping("/{id}")
-        }
+    public void updatePost(@PathVariable Long id, @RequestBody Post updatedPost) {
-        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        Post postToUpdate = postService.findById(id).orElseThrow(() -> new NotFoundException("Post not found"));
+        postService.insert(updatedPost
+                .setId(postToUpdate.getId())
+                .setIllustration(postToUpdate.getIllustration())
+                .setPublicationDate(postToUpdate.getPublicationDate()));
+    }
+
+    @PutMapping(value = "{id}/illustration", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+    public void updateIllustration(@PathVariable Long id, @RequestPart MultipartFile illustration) throws IOException {
+        Post postToUpdate = postService.findById(id).orElseThrow(() -> new NotFoundException("Post not found"));
+        postService.insert(postToUpdate.setIllustration(illustration.getBytes()));
     }
 
     @PostMapping
-    public ResponseEntity<String> getPost(@RequestBody Post post, @RequestParam Long userId)
+    public ResponseEntity<Post> addPost(@RequestBody Post postToCreate) {
-    {
+        Assert.isNull(postToCreate.getId(), "Post id must be null");
-            Optional<User> userExists = userRepository.findById(userId);
+        return new ResponseEntity<>(postService.insert(postToCreate.setPublicationDate(LocalDate.now())), HttpStatus.CREATED);
-            if (userExists.isPresent()) {
-                post.setUser(userExists.get());
-                postRepository.save(post);
-                return new ResponseEntity<>("Created", HttpStatus.CREATED);
-            }
-            return new ResponseEntity<>("Erreur", HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
-    @PutMapping("{post-id}")
+    @DeleteMapping("{id}")
-    public ResponseEntity<String> updatePost(@PathVariable("post-id") Long id, @RequestBody Post post)
+    public void deletePost(@PathVariable Long id) {
-    {
+        Post postToDelete = postService.findById(id).orElseThrow(() -> new NotFoundException("Post not found"));
-        Optional<Post> postExists = postRepository.findById(id);
+        postService.delete(postToDelete.getId());
-        if (postExists.isPresent()) {
-            Post newPost = postExists.get();
-            newPost.setTitle(post.getTitle());
-            newPost.setBody(post.getBody());
-            newPost.setImage(post.getImage());
-            postRepository.save(newPost);
-            return new ResponseEntity<>("Updated", HttpStatus.OK);
-        }
-        return new ResponseEntity<>("Erreur", HttpStatus.NOT_FOUND);
     }
 
-    @DeleteMapping("{post-id}")
-    public ResponseEntity<String> deletePost(@PathVariable("post-id") Long id)
-    {
-        Optional<Post> postExists = postRepository.findById(id);
-        if (postExists.isPresent()) {
-            postRepository.delete(postExists.get());
-            return new ResponseEntity<>("Deleted", HttpStatus.OK);
-        }
-        return new ResponseEntity<>("Erreur", HttpStatus.NOT_FOUND);
-    }
 }

src/main/java/com/guams/review/controller/UserController.java

@@ -1,81 +1,14 @@
 package com.guams.review.controller;
 
-import com.guams.review.modele.User;
-import com.guams.review.repository.UserRepository;
 import com.guams.review.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Optional;
-
 @RestController
 @RequestMapping(path = "api/users")
+@RequiredArgsConstructor
 public class UserController {
+
     private final UserService userService;
-    private final UserRepository userRepository;
-
-    @Autowired
-    public UserController(UserService userService, UserRepository userRepository) {
-        this.userService = userService;
-        this.userRepository = userRepository;
-    }
-
-    @GetMapping
-    public ResponseEntity<List<User>> getUsers() {
-        List<User> users = userService.getUsers();
-        return new ResponseEntity<>(users, new HttpHeaders(), HttpStatus.OK);
-    };
-
-    @GetMapping("/{user-id}")
-    public ResponseEntity<User> getUser(@PathVariable("user-id") Long id) {
-        Optional<User> exists = userRepository.findById(id);
-        if (exists.isPresent()) {
-            return new ResponseEntity<>(exists.get(), new HttpHeaders(), HttpStatus.OK);
-        }
-        return new ResponseEntity<>(null, new HttpHeaders(), HttpStatus.NOT_FOUND);
-    }
-
-    @PostMapping
-    public ResponseEntity<String> saveUser(@RequestBody User user) {
-        userService.saveUser(user);
-        Optional<User> exists = userService.findById(user.getId());
-        if (exists.isPresent()) {
-            return new ResponseEntity<>("Created", new HttpHeaders(), HttpStatus.CREATED);
-        }
-        return new ResponseEntity<>("Error", new HttpHeaders(), HttpStatus.INTERNAL_SERVER_ERROR);
-    }
-
-    @PutMapping("/{user-id}")
-    public ResponseEntity<String> updateUser(@PathVariable("user-id") Long id, @RequestBody User user)
-    {
-        Optional<User> exists = userService.findById(id);
-        if (exists.isPresent()) {
-            User newUser = exists.get();
-            newUser.setLogin(user.getLogin());
-            newUser.setPassword(user.getPassword());
-            newUser.setPosts(user.getPosts());
-            userService.saveUser(newUser);
-            return new ResponseEntity<>("Updated", new HttpHeaders(), HttpStatus.OK);
-        }
-        return new ResponseEntity<>("User not found", new HttpHeaders(), HttpStatus.NOT_FOUND);
-    }
-
-    @DeleteMapping("{user-id}")
-    public ResponseEntity<String> deleteUser(@PathVariable("user-id") Long id)
-    {
-        Optional<User> exists = userService.findById(id);
-        if (exists.isPresent()) {
-            userRepository.delete(exists.get());
-            return new ResponseEntity<>("Deleted", new HttpHeaders(), HttpStatus.OK);
-
-        }
-        return new ResponseEntity<>("User not found", new HttpHeaders(), HttpStatus.NOT_FOUND);
-
-    }
 
 }

src/main/java/com/guams/review/exception/NotFoundException.java

@@ -0,0 +1,7 @@
+package com.guams.review.exception;
+
+public class NotFoundException extends RuntimeException {
+  public NotFoundException(String message) {
+    super(message);
+  }
+}

src/main/java/com/guams/review/modele/Post.java

@@ -1,56 +0,0 @@
-package com.guams.review.modele;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.*;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-@Entity
-@Getter
-@Table(name = "POST")
-public class Post
-{
-    @Id()
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    @Column(name = "TITLE", nullable = false)
-    private String title;
-    @Column(name = "BODY", nullable = false)
-    private String body;
-    @Column(name = "IMAGE")
-    private String image;
-    @ManyToOne
-    @JoinColumn(name = "USER_ID", nullable = false)
-    @JsonIgnore // Pour pas avoir un json infini
-    private User user;
-
-    public Post()
-    {}
-
-
-    public Post setId(Long id) {
-        this.id = id;
-        return this;
-    }
-
-    public Post setTitle(String title) {
-        this.title = title;
-        return this;
-    }
-
-    public Post setBody(String body) {
-        this.body = body;
-        return this;
-    }
-
-    public Post setImage(String image) {
-        this.image = image;
-        return this;
-    }
-
-    public Post setUser(User user) {
-        this.user = user;
-        return this;
-    }
-}

src/main/java/com/guams/review/modele/PostRepository.java

@@ -0,0 +1,12 @@
+package com.guams.review.modele;
+
+import com.guams.review.modele.dao.Post;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PostRepository extends CrudRepository<Post, Long> {
+    List<Post> findAll();
+}

src/main/java/com/guams/review/modele/User.java

@@ -1,52 +0,0 @@
-package com.guams.review.modele;
-
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.*;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.util.List;
-
-
-@Entity
-@Getter
-@Table(name = "USERS")
-public class User {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name = "LOGIN", nullable = false, unique = true)
-    private String login;
-
-    @Column(name = "PASSWORD", nullable = false)
-    private String password;
-
-    @OneToMany(mappedBy = "user")
-    private List<Post> posts;
-
-
-    public User setId(Long id) {
-        this.id = id;
-        return this;
-    }
-
-    public User setLogin(String login) {
-        this.login = login;
-        return this;
-    }
-
-    public User setPassword(String password) {
-        this.password = password;
-        return this;
-    }
-
-    public User setPosts(List<Post> posts) {
-        this.posts = posts;
-        return this;
-    }
-}

src/main/java/com/guams/review/modele/UserRepository.java

@@ -0,0 +1,9 @@
+package com.guams.review.modele;
+
+import com.guams.review.modele.dao.User;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends CrudRepository<User, Long> {
+}

src/main/java/com/guams/review/modele/dao/Post.java

@@ -0,0 +1,32 @@
+package com.guams.review.modele.dao;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.time.LocalDate;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@Table(name = "post")
+public class Post {
+    @Id
+    Long id;
+    @Column("description")
+    String description;
+    @Column("illustration")
+    byte[] illustration;
+    @Column("title")
+    String title;
+    @Column("body")
+    String body;
+    @Column("category")
+    String category;
+    @Column("publication_date")
+    LocalDate publicationDate;
+
+}

src/main/java/com/guams/review/modele/dao/User.java

@@ -0,0 +1,27 @@
+package com.guams.review.modele.dao;
+
+
+import lombok.Getter;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+
+@Getter
+@Accessors(chain = true)
+@Table(name = "author")
+public class User {
+
+    @Id
+    Long id;
+
+    @Column("name")
+    String name;
+
+    @Column("password")
+    String password;
+
+    @Column("profile_picture")
+    byte[] profilePicture;
+}

src/main/java/com/guams/review/repository/PostRepository.java

@@ -1,9 +0,0 @@
-package com.guams.review.repository;
-
-import com.guams.review.modele.Post;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PostRepository extends JpaRepository<Post, Long> {
-}

src/main/java/com/guams/review/repository/UserRepository.java

@@ -1,12 +0,0 @@
-package com.guams.review.repository;
-
-import com.guams.review.modele.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface UserRepository extends JpaRepository<User, Long>
-{
-}

src/main/java/com/guams/review/service/PostService.java

@@ -1,19 +1,35 @@
 package com.guams.review.service;
 
 
-import com.guams.review.repository.PostRepository;
+import com.guams.review.exception.NotFoundException;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.guams.review.modele.dao.Post;
+import com.guams.review.modele.PostRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Optional;
+
 @Service
+@RequiredArgsConstructor
 public class PostService
 {
-    public PostRepository postRepository;
+    private final PostRepository postRepository;
 
-    @Autowired
+    public List<Post> list() {
-    public PostService(PostRepository postRepository)
+        return postRepository.findAll();
-    {
+    }
-        this.postRepository = postRepository;
+
+    public Optional<Post> findById(Long id) {
+        return postRepository.findById(id);
+    }
+
+    public Post insert(Post post) {
+        return postRepository.save(post);
+    }
+
+    public void delete(Long id) {
+        postRepository.deleteById(id);
     }
 
 }

src/main/java/com/guams/review/service/UserService.java

@@ -1,37 +1,16 @@
 package com.guams.review.service;
 
-import com.guams.review.modele.Post;
+import com.guams.review.modele.dao.User;
-import com.guams.review.modele.User;
+import com.guams.review.modele.UserRepository;
-import com.guams.review.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Optional;
 
 @Service
+@RequiredArgsConstructor
 public class UserService
 {
     private final UserRepository userRepository;
 
-    @Autowired
-    public UserService(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    public List<User> getUsers()
-    {
-        return userRepository.findAll();
-    }
-
-    public void saveUser(User user)
-    {
-        userRepository.save(user);
-    }
-
-    public Optional<User> findById(Long id)
-    {
-        return userRepository.findById(id);
-    }
-
 }

src/main/resources/application.properties

@@ -1,6 +1,4 @@
 spring.application.name=reView
-spring.datasource.url=jdbc:postgresql://localhost:5432/review
+spring.datasource.url=jdbc:postgresql://localhost:5432/reviewDB
 spring.datasource.username=postgres
 spring.datasource.password=Azerty1234
-spring.jpa.hibernate.ddl-auto=create-drop
-spring.jpa.show-sql=true

src/main/resources/script.sql

@@ -0,0 +1,36 @@
+drop extension if exists pgcrypto;
+drop table if exists publication;
+drop table if exists post;
+drop table if exists author;
+
+create extension if not exists pgcrypto;
+
+create table author
+(
+    id              uuid default gen_random_uuid() primary key,
+    name            varchar(255) not null,
+    password        text         not null,
+    profile_picture bytea
+);
+
+create table post
+(
+    id               serial primary key,
+    description      varchar(512) not null,
+    illustration     bytea,
+    title            varchar(50)  not null,
+    body             text         not null,
+    category         varchar(50)  not null,
+    publication_date date not null
+);
+
+create table publication
+(
+    author_fk uuid,
+    post_fk   serial,
+    foreign key (author_fk) references author (id),
+    foreign key (post_fk) references post (id)
+);
+
+-- insert into author (name, password, profile_picture)
+-- values ('John Doe', crypt('your_password', gen_salt('bf')), null);