Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,10 @@ out/

### VS Code ###
.vscode/

application.yml

build/libs/

build/libs/*.jar
build/libs/*.war
9 changes: 9 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM mcr.microsoft.com/openjdk/jdk:21-ubuntu

WORKDIR /app

COPY /build/libs/java.docker.day.2-0.0.1.jar /app/java.docker.day.2-0.0.1.jar

EXPOSE 4000

ENTRYPOINT [ "java", "-jar", "java.docker.day.2-0.0.1.jar" ]
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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.4.2'
id 'io.spring.dependency-management' version '1.1.7'
}

group = 'com.booleanuk'
Expand All @@ -23,7 +23,7 @@ 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'
}
Expand Down
21 changes: 21 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
services:
app:
image: 'docker-day-2:latest'
container_name: app
depends_on:
- db
ports:
- '4000:4000'
environment:
- SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/mypostgresuser
- SPRING_DATASOURCE_USERNAME=mypostgresuser
- SPRING_DATASOURCE_PASSWORD=mypostgrespassword
- SPRING_JPA_HIBERNATE_DDL_AUTO=update

db:
image: 'postgres:latest'
container_name: db
environment:
- POSTGRES_USER=mypostgresuser
- POSTGRES_DATABASE=mypostgresuser
- POSTGRES_PASSWORD=mypostgrespassword
11 changes: 11 additions & 0 deletions src/main/java/com/booleanuk/api/Main.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
36 changes: 36 additions & 0 deletions src/main/java/com/booleanuk/api/tweet/Tweet.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.booleanuk.api.tweet;


import com.booleanuk.api.user.User;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
import lombok.*;

@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@Entity
@Table(name = "tweets")
public class Tweet {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;

@Column(name = "message", nullable = false)
private String message;

@ManyToOne
@JoinColumn(name = "user_id", nullable = false) // FK column in "tweets" table
@JsonIgnoreProperties({"tweets"})
private User user;

public Tweet(String message, User user){
this.message = message;
this.user = user;
}

public Tweet(int id){
this.id = id;
}
}
64 changes: 64 additions & 0 deletions src/main/java/com/booleanuk/api/tweet/TweetController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package com.booleanuk.api.tweet;

import com.booleanuk.api.user.User;
import com.booleanuk.api.user.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("tweets")
public class TweetController {

@Autowired
private TweetRepository tweetRepository;
@Autowired
private UserRepository userRepository;

@GetMapping
public ResponseEntity<List<Tweet>> getAll(){
return ResponseEntity.ok(tweetRepository.findAll());
}

@GetMapping("/{id}")
public ResponseEntity<List<Tweet>> getAllTweetsFromUser(@PathVariable int userId){
User user = userRepository.findById(userId).orElseThrow(
() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Not found")
);

return ResponseEntity.ok(user.getTweets());
}

@PostMapping
public ResponseEntity<Tweet> createTweet(@RequestBody Tweet tweet){
User user = userRepository.findById(tweet.getUser().getId())
.orElseThrow(() -> new RuntimeException("User not found"));

tweet.setUser(user);

return new ResponseEntity<Tweet>(this.tweetRepository.save(tweet), HttpStatus.CREATED);
}

@PutMapping("/{id}")
public ResponseEntity<Tweet> updateTweet(@PathVariable int id, @RequestBody Tweet tweet){
Tweet tweetToUpdate = tweetRepository.findById(id).orElseThrow(
() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Not found")
);

tweetToUpdate.setMessage(tweet.getMessage());
return new ResponseEntity<Tweet>(this.tweetRepository.save(tweetToUpdate), HttpStatus.CREATED);
}

@DeleteMapping("/{id}")
public ResponseEntity<Tweet> deleteTweet(@PathVariable int id){
Tweet tweetToDelete = this.tweetRepository.findById(id).orElseThrow(
() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Not found")
);
this.tweetRepository.delete(tweetToDelete);
return ResponseEntity.ok(tweetToDelete);
}
}
6 changes: 6 additions & 0 deletions src/main/java/com/booleanuk/api/tweet/TweetRepository.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.booleanuk.api.tweet;

import org.springframework.data.jpa.repository.JpaRepository;

public interface TweetRepository extends JpaRepository<Tweet, Integer> {
}
40 changes: 40 additions & 0 deletions src/main/java/com/booleanuk/api/user/User.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.booleanuk.api.user;


import com.booleanuk.api.tweet.Tweet;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
import lombok.*;

import java.util.ArrayList;
import java.util.List;

@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@Entity
@Table(name = "users")
public class User {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;

@Column(name = "username", nullable = false, unique = true)
private String username;

@Column(name = "password")
private String password;

@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
@JsonIgnoreProperties({"user", "id"})
private List<Tweet> tweets = new ArrayList<>();

public User(String username){
this.username = username;
}

public User(int id){
this.id = id;
}
}
49 changes: 49 additions & 0 deletions src/main/java/com/booleanuk/api/user/UserController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package com.booleanuk.api.user;

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.nio.file.Path;
import java.util.List;

@RestController
@RequestMapping("users")
public class UserController {

@Autowired
private UserRepository userRepository;

@GetMapping
public ResponseEntity<List<User>> getAll(){
return ResponseEntity.ok(userRepository.findAll());
}

@PostMapping
public ResponseEntity<User> createUser(@RequestBody User user){
return new ResponseEntity<User>(this.userRepository.save(user), HttpStatus.CREATED);
}

@PutMapping("/{id}")
public ResponseEntity<User> updateUser(@PathVariable int id, @RequestBody User user){
User userToUpdate = this.userRepository.findById(id).orElseThrow(
() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Not found")
);

userToUpdate.setUsername(user.getUsername());
userToUpdate.setPassword(user.getPassword());
return new ResponseEntity<User>(this.userRepository.save(userToUpdate), HttpStatus.CREATED);
}

@DeleteMapping("/{id}")
public ResponseEntity<User> deleteUser(@PathVariable int id){
User userToDelete = this.userRepository.findById(id).orElseThrow(
() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Not found")
);

this.userRepository.delete(userToDelete);
return ResponseEntity.ok(userToDelete);
}
}
6 changes: 6 additions & 0 deletions src/main/java/com/booleanuk/api/user/UserRepository.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.booleanuk.api.user;

import org.springframework.data.jpa.repository.JpaRepository;

public interface UserRepository extends JpaRepository<User, Integer> {
}