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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ out/

### VS Code ###
.vscode/

*.jar
17 changes: 14 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.5.4'
id 'io.spring.dependency-management' version '1.1.7'
}

group = 'com.booleanuk'
Expand All @@ -23,11 +23,22 @@ 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'
implementation 'org.postgresql:postgresql:42.7.7'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

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) }
}
}
9 changes: 9 additions & 0 deletions dockers/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 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" ]
23 changes: 23 additions & 0 deletions dockers/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
services:
app:
image: 'hibernate-app: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
ports:
- '5432:5432'
environment:
- POSTGRES_USER=mypostgresuser
- POSTGRES_DATABASE=mypostgresuser
- POSTGRES_PASSWORD=mypostgrespassword
Empty file.
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);
}
}
59 changes: 59 additions & 0 deletions src/main/java/com/booleanuk/api/controllers/GameController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package com.booleanuk.api.controllers;

import com.booleanuk.api.models.Game;
import com.booleanuk.api.repositories.GameRepository;
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("games")
public class GameController {

@Autowired
private GameRepository gameRepository;

@GetMapping
public ResponseEntity<List<Game>> getAll() {
return ResponseEntity.ok(this.gameRepository.findAll());
}

@PostMapping
public ResponseEntity<Game> create(@RequestBody Game game) {
return new ResponseEntity<Game>(this.gameRepository.save(game), HttpStatus.CREATED);
}

@GetMapping("/{id}")
public ResponseEntity<Game> getOne(@PathVariable int id) {
Game game = null;
game = this.gameRepository.findById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Not found"));
return ResponseEntity.ok(game);
}

@PutMapping("/{id}")
public ResponseEntity<Game> update(@PathVariable int id, @RequestBody Game game) {
Game updated = this.gameRepository.findById(id).orElseThrow(
() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Not found"));

updated.setTitle(game.getTitle());
updated.setGenre(game.getGenre());
updated.setPublisher(game.getPublisher());
updated.setDeveloper(game.getDeveloper());
updated.setReleaseYear(game.getReleaseYear());
updated.setEarlyAccess(game.isEarlyAccess());

return new ResponseEntity<Game>(this.gameRepository.save(updated), HttpStatus.CREATED);
}

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

return ResponseEntity.ok(delete);
}
}
59 changes: 59 additions & 0 deletions src/main/java/com/booleanuk/api/controllers/UserController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package com.booleanuk.api.controllers;

import com.booleanuk.api.models.User;
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;

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

@GetMapping("/{id}")
public ResponseEntity<User> getOne(@PathVariable int id) {
User user = null;
user = this.userRepository.findById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Not found"));
return ResponseEntity.ok(user);
}

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


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

updated.setEmail(user.getEmail());
updated.setFirstName(user.getFirstName());
updated.setLastName(user.getLastName());
updated.setUsername(user.getUsername());
updated.setPhone(user.getPhone());

return new ResponseEntity<User>(this.userRepository.save(updated), HttpStatus.CREATED);
}

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

return ResponseEntity.ok(delete);
}
}
53 changes: 53 additions & 0 deletions src/main/java/com/booleanuk/api/models/Game.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package com.booleanuk.api.models;

import jakarta.persistence.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Getter
@Setter
@NoArgsConstructor
@Entity
@Table(name = "games")
public class Game {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;

@Column
private String title;

@Column
private String genre;

@Column
private String publisher;

@Column
private String developer;

@Column(name = "release_year")
private int releaseYear;

@Column(name = "is_early_access")
private boolean isEarlyAccess;

public Game(int id) {
this.id = id;
}

@Override
public String toString() {
return "Game{" +
"id=" + id +
", title='" + title + '\'' +
", genre='" + genre + '\'' +
", publisher='" + publisher + '\'' +
", developer='" + developer + '\'' +
", releaseYear=" + releaseYear +
", isEarlyAccess=" + isEarlyAccess +
'}';
}
}
67 changes: 67 additions & 0 deletions src/main/java/com/booleanuk/api/models/User.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package com.booleanuk.api.models;

import jakarta.persistence.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.util.Objects;

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

@Column
private String email;

@Column
private String firstName;

@Column
private String lastName;

@Column
private String username;

@Column
private String phone;

public User(String email, String firstName, String lastName, String username, String phone) {
this.email = email;
this.firstName = firstName;
this.lastName = lastName;
this.username = username;
this.phone = phone;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
User user = (User) o;
return Objects.equals(id, user.id) && Objects.equals(email, user.email) && Objects.equals(firstName, user.firstName) && Objects.equals(lastName, user.lastName) && Objects.equals(username, user.username) && Objects.equals(phone, user.phone);
}

@Override
public int hashCode() {
return Objects.hash(id, email, firstName, lastName, username, phone);
}

@Override
public String toString() {
return "User{" +
"id=" + id +
", email='" + email + '\'' +
", firstName='" + firstName + '\'' +
", lastName='" + lastName + '\'' +
", username='" + username + '\'' +
", phone='" + phone + '\'' +
'}';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.booleanuk.api.repositories;

import com.booleanuk.api.models.Game;
import org.springframework.data.jpa.repository.JpaRepository;

public interface GameRepository extends JpaRepository<Game, Integer> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.booleanuk.api.repositories;

import com.booleanuk.api.models.User;
import org.springframework.data.jpa.repository.JpaRepository;

public interface UserRepository extends JpaRepository<User, Integer> {

}