Fredrik Haupt

.gitignore

@@ -35,3 +35,7 @@ out/
 
 ### VS Code ###
 .vscode/
+
+.application.yml
+
+.Dockers

Dockers/Dockerfile

@@ -0,0 +1,9 @@
+FROM eclipse-temurin:21
+
+WORKDIR /app
+
+COPY java.docker.day.2-0.0.1-SNAPSHOT.jar /app/java.docker.day.2-0.0.1-SNAPSHOT.jar
+
+EXPOSE 4000
+
+ENTRYPOINT ["java", "-jar", "java.docker.day.2-0.0.1-SNAPSHOT.jar"]

Dockers/docker-compose.yml

@@ -0,0 +1,23 @@
+services:
+  app:
+    image: 'my-forum-box:latest'
+    container_name: app
+    depends_on:
+      - db
+    ports:
+      - '4000:4000'
+    environment:
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/postgres
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=mypassword
+      - SPRING_JPA_HIBERNATE_DDL_AUTO=update
+
+  db:
+    image: 'postgres:latest'
+    container_name: db
+    ports:
+      - '5432:5432'
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_DATABASE=postgres
+      - POSTGRES_PASSWORD=mypassword

build.gradle

@@ -1,12 +1,17 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.1.4'
-	id 'io.spring.dependency-management' version '1.1.3'
+	id 'org.springframework.boot' version '3.3.3'
+	id 'io.spring.dependency-management' version '1.1.6'
 }
 
 group = 'com.booleanuk'
-version = '0.0.1'
-sourceCompatibility = '17'
+version = '0.0.1-SNAPSHOT'
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
+}
 
 configurations {
 	compileOnly {
@@ -23,11 +28,27 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
-	implementation 'org.postgresql:postgresql:42.6.0'
+	runtimeOnly 'org.postgresql:postgresql'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+tasks.named('bootBuildImage') {
+	builder = 'paketobuildpacks/builder-jammy-base:latest'
 }
 
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+jar {
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	manifest {
+		attributes 'Main-Class': 'com.booleanuk.api.Main'
+	}
+
+	from {
+		configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+	}
+}

src/main/java/com/booleanuk/api/Main.java

@@ -0,0 +1,11 @@
+package com.booleanuk.api;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Main {
+    public static void main(String[] args) {
+        SpringApplication.run(Main.class, args);
+    }
+}

src/main/java/com/booleanuk/api/controllers/CommentController.java

@@ -0,0 +1,94 @@
+package com.booleanuk.api.controllers;
+
+import com.booleanuk.api.models.Comment;
+import com.booleanuk.api.models.Post;
+import com.booleanuk.api.models.User;
+import com.booleanuk.api.repositories.CommentRepository;
+import com.booleanuk.api.repositories.PostRepository;
+import com.booleanuk.api.repositories.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("users/{userId}/posts/{postId}/comments")
+public class CommentController {
+    @Autowired
+    private CommentRepository commentRepository;
+    @Autowired
+    private UserRepository userRepository;
+    @Autowired
+    private PostRepository postRepository;
+
+    @PostMapping
+    public ResponseEntity<Comment> create(@RequestBody Comment comment, @PathVariable int postId, @PathVariable int userId){
+        User user = this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        Post post = this.postRepository.findById(postId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No post with that id")
+        );
+        comment.setUser(user);
+        comment.setPost(post);
+        return new ResponseEntity<>(this.commentRepository.save(comment), HttpStatus.CREATED);
+    }
+
+    @GetMapping
+    public List<Comment> getAll(@PathVariable int postId, @PathVariable int userId){
+        this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        this.postRepository.findById(postId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No post with that id")
+        );
+        return this.commentRepository.findAll();
+    }
+
+    @GetMapping("{id}")
+    public ResponseEntity<Comment> getOne(@PathVariable int userId, @PathVariable int postId, @PathVariable int id){
+        this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        this.postRepository.findById(postId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No post with that id")
+        );
+        Comment comment = this.commentRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No comment with that id")
+        );
+        return ResponseEntity.ok(comment);
+    }
+
+    @PutMapping("{id}")
+    public ResponseEntity<Comment> update(@RequestBody Comment comment, @PathVariable int userId, @PathVariable int postId, @PathVariable int id){
+        this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        this.postRepository.findById(postId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No post with that id")
+        );
+        Comment commentToUpdate = this.commentRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No comment with that id")
+        );
+        commentToUpdate.setContent(comment.getContent());
+        return new ResponseEntity<>(this.commentRepository.save(commentToUpdate), HttpStatus.CREATED);
+    }
+
+    @DeleteMapping("{id}")
+    public ResponseEntity<Comment> delete(@PathVariable int userId, @PathVariable int postId, @PathVariable int id){
+        this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        this.postRepository.findById(postId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No post with that id")
+        );
+        Comment comment = this.commentRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No comment with that id")
+        );
+        this.commentRepository.delete(comment);
+        return ResponseEntity.ok(comment);
+    }
+}

src/main/java/com/booleanuk/api/controllers/PostController.java

@@ -0,0 +1,73 @@
+package com.booleanuk.api.controllers;
+
+import com.booleanuk.api.models.Post;
+import com.booleanuk.api.models.User;
+import com.booleanuk.api.repositories.PostRepository;
+import com.booleanuk.api.repositories.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("users/{userId}/posts")
+public class PostController {
+    @Autowired
+    private PostRepository postRepository;
+    @Autowired
+    private UserRepository userRepository;
+
+    @PostMapping
+    public ResponseEntity<Post> create(@RequestBody Post post, @PathVariable int userId){
+        User user = this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        post.setUser(user);
+
+        return new ResponseEntity<>(this.postRepository.save(post), HttpStatus.CREATED);
+    }
+
+    @GetMapping
+    public List<Post> getAll(@PathVariable int userId){
+        this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        return this.postRepository.findAll();
+    }
+
+    @GetMapping("{id}")
+    public ResponseEntity<Post> getOne(@PathVariable int id, @PathVariable int userId){
+        this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        Post post = this.postRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No post with that id")
+        );
+        return ResponseEntity.ok(post);
+    }
+
+    @PutMapping("{id}")
+    public ResponseEntity<Post> update(@PathVariable int id, @RequestBody Post post, @PathVariable int userId){
+        this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        Post postToUpdate = this.postRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No post with that id")
+        );
+        postToUpdate.setContent(post.getContent());
+        postToUpdate.setLikes(post.getLikes());
+        return new ResponseEntity<>(this.postRepository.save(postToUpdate), HttpStatus.CREATED);
+    }
+
+    @DeleteMapping("{id}")
+    public ResponseEntity<Post> delete(@PathVariable int id){
+        Post post = this.postRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No post with that id")
+        );
+        this.postRepository.delete(post);
+        return ResponseEntity.ok(post);
+    }
+}

src/main/java/com/booleanuk/api/controllers/UserController.java

@@ -0,0 +1,72 @@
+package com.booleanuk.api.controllers;
+
+import com.booleanuk.api.models.User;
+import com.booleanuk.api.repositories.PostRepository;
+import com.booleanuk.api.repositories.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("users")
+public class UserController {
+    @Autowired
+    private UserRepository userRepository;
+
+    @PostMapping
+    public ResponseEntity<User> create(@RequestBody User user){
+        return new ResponseEntity<>(this.userRepository.save(user), HttpStatus.CREATED);
+    }
+
+    @GetMapping
+    public List<User> getAll(){
+        return this.userRepository.findAll();
+    }
+
+    @GetMapping("{id}")
+    public ResponseEntity<User> getOne(@PathVariable int id){
+        User user = this.userRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        return ResponseEntity.ok(user);
+    }
+
+    @PutMapping("{id}")
+    public ResponseEntity<User> update(@PathVariable int id, @RequestBody User user) {
+        User userToUpdate = this.userRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        userToUpdate.setUserName(user.getUserName());
+        return new ResponseEntity<>(this.userRepository.save(userToUpdate), HttpStatus.CREATED);
+    }
+
+    @PutMapping("{id}/{userId}")
+    public ResponseEntity<User> addFriend(@PathVariable int id, @PathVariable int userId) {
+
+        User userToUpdate = this.userRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        User friend = this.userRepository.findById(userId).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        List<User> friends = userToUpdate.getUsers();
+        friends.add(friend);
+        userToUpdate.setUsers(friends);
+        return new ResponseEntity<>(this.userRepository.save(userToUpdate), HttpStatus.CREATED);
+    }
+
+
+    @DeleteMapping("{id}")
+    public ResponseEntity<User> delete(@PathVariable int id){
+        User user = this.userRepository.findById(id).orElseThrow(
+                () -> new ResponseStatusException(HttpStatus.NOT_FOUND, "No user with that id")
+        );
+        this.userRepository.delete(user);
+        return ResponseEntity.ok(user);
+    }
+
+}

src/main/java/com/booleanuk/api/models/Comment.java

@@ -0,0 +1,37 @@
+package com.booleanuk.api.models;
+
+import com.fasterxml.jackson.annotation.JsonIncludeProperties;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "Comments")
+public class Comment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+
+    @Column
+    private String content;
+
+    @ManyToOne
+    @JoinColumn(name = "user_id")
+    @JsonIncludeProperties(value = {"userName"})
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "post_id")
+    @JsonIncludeProperties(value = {"content", "likes"})
+    private Post post;
+
+    public Comment(int id){
+        this.id = id;
+    }
+}