Thomas Kristiansen

build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.3.1'
-	id 'io.spring.dependency-management' version '1.1.5'
+	id 'org.springframework.boot' version '3.4.1'
+	id 'io.spring.dependency-management' version '1.1.7'
 }
 
 group = 'com.booleanuk'
@@ -13,15 +13,23 @@ java {
 	}
 }
 
+configurations {
+	compileOnly {
+		extendsFrom annotationProcessor
+	}
+}
+
 repositories {
 	mavenCentral()
 }
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	runtimeOnly 'org.postgresql:postgresql'
+	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }

src/main/java/com/booleanuk/api/controller/GameController.java

@@ -0,0 +1,50 @@
+package com.booleanuk.api.controller;
+
+import com.booleanuk.api.model.Game;
+import com.booleanuk.api.repository.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 repository;
+
+    @PostMapping
+    public ResponseEntity<Game> createGame (@RequestBody Game game) {
+        return new ResponseEntity<Game>(this.repository.save(game), HttpStatus.CREATED);
+    }
+
+    @GetMapping
+    public List<Game> getAllGames() {
+        return this.repository.findAll();
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<Game> updateGame(@PathVariable int id, @RequestBody Game game) {
+        Game updateGame = this.repository.findById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND,"Could not find game with given id"));
+
+        updateGame.setTitle(game.getTitle());
+        updateGame.setGenre(game.getGenre());
+        updateGame.setPublisher(game.getPublisher());
+        updateGame.setDeveloper(game.getDeveloper());
+        updateGame.setReleaseYear(game.getReleaseYear());
+        updateGame.setEarlyAccess(game.isEarlyAccess());
+
+        return new ResponseEntity<Game>(this.repository.save(updateGame), HttpStatus.CREATED);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Game> deleteGame(@PathVariable int id) {
+        Game deleteGame = this.repository.findById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Could not find game with given id"));
+        this.repository.delete(deleteGame);
+        return ResponseEntity.ok(deleteGame);
+    }
+}

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

@@ -2,36 +2,50 @@
 
 import com.booleanuk.api.model.User;
 import com.booleanuk.api.repository.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 javax.swing.text.html.HTML;
 import java.util.List;
 
 @RestController
 @RequestMapping("users")
 public class UserController {
-    private final UserRepository repository;
 
-    public UserController(UserRepository repository) {
-        this.repository = repository;
+    @Autowired
+    private UserRepository repository;
+
+    @PostMapping
+    public ResponseEntity<User> createUser (@RequestBody User user) {
+        System.out.println(user);
+        return new ResponseEntity<>(this.repository.save(user), HttpStatus.CREATED);
     }
 
     @GetMapping
-    public List<User> getAll() {
+    public List<User> getAllUsers() {
         return this.repository.findAll();
     }
 
-    @GetMapping("{id}")
-    public User getById(@PathVariable("id") Integer id) {
-        return this.repository.findById(id).orElseThrow();
-    }
+    @PutMapping("/{id}")
+    public ResponseEntity<User> updateUser(@PathVariable int id, @RequestBody User user) {
+        User updateUser = this.repository.findById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND,"Could not find user with given id"));
 
-    record PostUser(String email, String firstName) {}
+        updateUser.setUsername(user.getUsername());
+        updateUser.setFirstName(user.getFirstName());
+        updateUser.setLastName(user.getLastName());
+        updateUser.setEmail(user.getEmail());
+        updateUser.setPhone(user.getPhone());
 
-    @ResponseStatus(HttpStatus.CREATED)
-    @PostMapping
-    public User create(@RequestBody PostUser request) {
-        User user = new User(request.email(), request.firstName());
-        return this.repository.save(user);
+        return new ResponseEntity<User>(this.repository.save(updateUser), HttpStatus.CREATED);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<User> deleteUser(@PathVariable int id) {
+        User deleteUser = this.repository.findById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Could not find user with given id"));
+        this.repository.delete(deleteUser);
+        return ResponseEntity.ok(deleteUser);
     }
 }

src/main/java/com/booleanuk/api/model/Game.java

@@ -0,0 +1,51 @@
+package com.booleanuk.api.model;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "games")
+public class Game {
+    @Getter
+    @Setter
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+
+    @Getter
+    @Setter
+    @Column(name = "title")
+    private String title;
+
+    @Getter
+    @Setter
+    @Column(name = "genre")
+    private String genre;
+
+    @Getter
+    @Setter
+    @Column(name = "publisher")
+    private String publisher;
+
+    @Getter
+    @Setter
+    @Column(name = "developer")
+    private String developer;
+
+    @Getter
+    @Setter
+    @Column(name = "release_year")
+    private int releaseYear;
+
+    @Getter
+    @Setter
+    @Column(name = "is_early_access")
+    private boolean isEarlyAccess;
+}

src/main/java/com/booleanuk/api/model/User.java

@@ -1,87 +1,44 @@
 package com.booleanuk.api.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-
-import java.util.Objects;
+import jakarta.persistence.*;
+import lombok.*;
 
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @Entity
+@Table(name = "users")
+@ToString
 public class User {
+    @Getter
+    @Setter
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
+    @Getter
+    @Setter
+    @Column(name = "email")
     private String email;
-    private String firstName;
-    private Boolean isActive;
-
-    public User(Integer id, String email, String firstName, Boolean isActive) {
-        this.id = id;
-        this.email = email;
-        this.firstName = firstName;
-        this.isActive = isActive;
-    }
-
-    public User(String email, String firstName) {
-        this.email = email;
-        this.firstName = firstName;
-        this.isActive = false;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
 
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public Boolean getActive() {
-        return isActive;
-    }
-
-    public void setActive(Boolean active) {
-        isActive = active;
-    }
+    @Getter
+    @Setter
+    @Column(name = "firtName")
+    private String firstName;
 
-    @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(isActive, user.isActive);
-    }
+    @Getter
+    @Setter
+    @Column(name = "lastName")
+    private String lastName;
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, email, firstName, isActive);
-    }
+    @Getter
+    @Setter
+    @Column(name = "phone")
+    private String phone;
 
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", email='" + email + '\'' +
-                ", firstName='" + firstName + '\'' +
-                ", isActive=" + isActive +
-                '}';
-    }
+    @Getter
+    @Setter
+    @Column(name = "username")
+    private String username;
 }

src/main/java/com/booleanuk/api/repository/GameRepository.java

@@ -0,0 +1,7 @@
+package com.booleanuk.api.repository;
+
+import com.booleanuk.api.model.Game;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface GameRepository extends JpaRepository<Game, Integer> {
+}