From df86c496226758f1c49ba120f52748d5bd650509 Mon Sep 17 00:00:00 2001 From: Emanuels Zaurins Date: Thu, 21 Aug 2025 12:41:07 +0200 Subject: [PATCH 1/2] tracking --- src/main/java/com/booleanuk/Main.java | 13 +++ .../library/controllers/AuthController.java | 101 ++++++++++++++++++ .../library/controllers/BookController.java | 92 ++++++++++++++++ .../com/booleanuk/library/models/Book.java | 42 ++++++++ .../com/booleanuk/library/models/ERole.java | 7 ++ .../com/booleanuk/library/models/Role.java | 23 ++++ .../com/booleanuk/library/models/User.java | 48 +++++++++ .../library/payload/request/LoginRequest.java | 15 +++ .../payload/request/SignupRequest.java | 29 +++++ .../payload/response/BookListResponse.java | 8 ++ .../payload/response/BookResponse.java | 6 ++ .../payload/response/ErrorResponse.java | 19 ++++ .../library/payload/response/JwtResponse.java | 25 +++++ .../payload/response/MessageResponse.java | 14 +++ .../library/payload/response/Response.java | 14 +++ .../library/repository/BookRepository.java | 7 ++ .../library/repository/RoleRepository.java | 11 ++ .../library/repository/UserRepository.java | 15 +++ .../library/security/WebSecurityConfig.java | 68 ++++++++++++ .../security/jwt/AuthEntryPointJwt.java | 24 +++++ .../library/security/jwt/AuthTokenFilter.java | 54 ++++++++++ .../library/security/jwt/JwtUtils.java | 63 +++++++++++ .../security/services/UserDetailsImpl.java | 59 ++++++++++ .../services/UserDetailsServiceImpl.java | 26 +++++ 24 files changed, 783 insertions(+) create mode 100644 src/main/java/com/booleanuk/Main.java create mode 100644 src/main/java/com/booleanuk/library/controllers/AuthController.java create mode 100644 src/main/java/com/booleanuk/library/controllers/BookController.java create mode 100644 src/main/java/com/booleanuk/library/models/Book.java create mode 100644 src/main/java/com/booleanuk/library/models/ERole.java create mode 100644 src/main/java/com/booleanuk/library/models/Role.java create mode 100644 src/main/java/com/booleanuk/library/models/User.java create mode 100644 src/main/java/com/booleanuk/library/payload/request/LoginRequest.java create mode 100644 src/main/java/com/booleanuk/library/payload/request/SignupRequest.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/BookListResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/BookResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/ErrorResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/JwtResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/MessageResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/Response.java create mode 100644 src/main/java/com/booleanuk/library/repository/BookRepository.java create mode 100644 src/main/java/com/booleanuk/library/repository/RoleRepository.java create mode 100644 src/main/java/com/booleanuk/library/repository/UserRepository.java create mode 100644 src/main/java/com/booleanuk/library/security/WebSecurityConfig.java create mode 100644 src/main/java/com/booleanuk/library/security/jwt/AuthEntryPointJwt.java create mode 100644 src/main/java/com/booleanuk/library/security/jwt/AuthTokenFilter.java create mode 100644 src/main/java/com/booleanuk/library/security/jwt/JwtUtils.java create mode 100644 src/main/java/com/booleanuk/library/security/services/UserDetailsImpl.java create mode 100644 src/main/java/com/booleanuk/library/security/services/UserDetailsServiceImpl.java diff --git a/src/main/java/com/booleanuk/Main.java b/src/main/java/com/booleanuk/Main.java new file mode 100644 index 00000000..ee0f8fff --- /dev/null +++ b/src/main/java/com/booleanuk/Main.java @@ -0,0 +1,13 @@ +package com.booleanuk; + +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); + } + +} diff --git a/src/main/java/com/booleanuk/library/controllers/AuthController.java b/src/main/java/com/booleanuk/library/controllers/AuthController.java new file mode 100644 index 00000000..dc5b36f0 --- /dev/null +++ b/src/main/java/com/booleanuk/library/controllers/AuthController.java @@ -0,0 +1,101 @@ +package com.booleanuk.library.controllers; + +import com.booleanuk.library.models.ERole; +import com.booleanuk.library.models.Role; +import com.booleanuk.library.models.User; +import com.booleanuk.library.payload.request.LoginRequest; +import com.booleanuk.library.payload.request.SignupRequest; +import com.booleanuk.library.payload.response.JwtResponse; +import com.booleanuk.library.payload.response.MessageResponse; +import com.booleanuk.library.repository.RoleRepository; +import com.booleanuk.library.repository.UserRepository; +import com.booleanuk.library.security.jwt.JwtUtils; +import com.booleanuk.library.security.services.UserDetailsImpl; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.web.bind.annotation.*; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@CrossOrigin(origins = "*", maxAge = 3600) +@RestController +@RequestMapping("auth") +public class AuthController { + @Autowired + AuthenticationManager authenticationManager; + + @Autowired + UserRepository userRepository; + + @Autowired + RoleRepository roleRepository; + + @Autowired + PasswordEncoder encoder; + + @Autowired + JwtUtils jwtUtils; + + @PostMapping("/signin") + public ResponseEntity authenticateUser(@Valid @RequestBody LoginRequest loginRequest) { + // If using a salt for password use it here + Authentication authentication = authenticationManager + .authenticate(new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getPassword())); + SecurityContextHolder.getContext().setAuthentication(authentication); + String jwt = jwtUtils.generateJwtToken(authentication); + + UserDetailsImpl userDetails = (UserDetailsImpl) authentication.getPrincipal(); + List roles = userDetails.getAuthorities().stream().map((item) -> item.getAuthority()) + .collect(Collectors.toList()); + return ResponseEntity + .ok(new JwtResponse(jwt, userDetails.getId(), userDetails.getUsername(), userDetails.getEmail(), roles)); + } + + @PostMapping("/signup") + public ResponseEntity registerUser(@Valid @RequestBody SignupRequest signupRequest) { + if (userRepository.existsByUsername(signupRequest.getUsername())) { + return ResponseEntity.badRequest().body(new MessageResponse("Error: Username is already taken")); + } + if (userRepository.existsByEmail(signupRequest.getEmail())) { + return ResponseEntity.badRequest().body(new MessageResponse("Error: Email is already in use!")); + } + // Create a new user add salt here if using one + User user = new User(signupRequest.getUsername(), signupRequest.getEmail(), encoder.encode(signupRequest.getPassword())); + Set strRoles = signupRequest.getRole(); + Set roles = new HashSet<>(); + + if (strRoles == null) { + Role userRole = roleRepository.findByName(ERole.ROLE_USER).orElseThrow(() -> new RuntimeException("Error: Role is not found")); + roles.add(userRole); + } else { + strRoles.forEach((role) -> { + switch (role) { + case "admin": + Role adminRole = roleRepository.findByName(ERole.ROLE_ADMIN).orElseThrow(() -> new RuntimeException("Error: Role is not found")); + roles.add(adminRole); + break; + case "mod": + Role modRole = roleRepository.findByName(ERole.ROLE_MODERATOR).orElseThrow(() -> new RuntimeException("Error: Role is not found")); + roles.add(modRole); + break; + default: + Role userRole = roleRepository.findByName(ERole.ROLE_USER).orElseThrow(() -> new RuntimeException("Error: Role is not found")); + roles.add(userRole); + break; + } + }); + } + user.setRoles(roles); + userRepository.save(user); + return ResponseEntity.ok((new MessageResponse("User registered successfully"))); + } +} \ No newline at end of file diff --git a/src/main/java/com/booleanuk/library/controllers/BookController.java b/src/main/java/com/booleanuk/library/controllers/BookController.java new file mode 100644 index 00000000..594c95cb --- /dev/null +++ b/src/main/java/com/booleanuk/library/controllers/BookController.java @@ -0,0 +1,92 @@ +package com.booleanuk.library.controllers; + +import com.booleanuk.library.models.Book; +import com.booleanuk.library.repository.BookRepository; +import com.booleanuk.library.payload.response.BookListResponse; +import com.booleanuk.library.payload.response.BookResponse; +import com.booleanuk.library.payload.response.ErrorResponse; +import com.booleanuk.library.payload.response.Response; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("books") +public class BookController { + @Autowired + private BookRepository bookRepository; + + @GetMapping + public ResponseEntity getAllBooks() { + BookListResponse bookListResponse = new BookListResponse(); + bookListResponse.set(this.bookRepository.findAll()); + return ResponseEntity.ok(bookListResponse); + } + + @PostMapping + public ResponseEntity> createBook(@RequestBody Book book) { + BookResponse bookResponse = new BookResponse(); + try { + bookResponse.set(this.bookRepository.save(book)); + } catch (Exception e) { + ErrorResponse error = new ErrorResponse(); + error.set("Bad request"); + return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); + } + return new ResponseEntity<>(bookResponse, HttpStatus.CREATED); + } + + @GetMapping("/{id}") + public ResponseEntity> getBookById(@PathVariable int id) { + Book book = this.bookRepository.findById(id).orElse(null); + if (book == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + BookResponse bookResponse = new BookResponse(); + bookResponse.set(book); + return ResponseEntity.ok(bookResponse); + } + + @PutMapping("/{id}") + public ResponseEntity> updateBook(@PathVariable int id, @RequestBody Book book) { + Book bookToUpdate = this.bookRepository.findById(id).orElse(null); + if (bookToUpdate == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + bookToUpdate.setTitle(book.getTitle()); + bookToUpdate.setAuthor(book.getAuthor()); + bookToUpdate.setPublisher(book.getPublisher()); + bookToUpdate.setYear(book.getYear()); + bookToUpdate.setGenre(book.getGenre()); + + try { + bookToUpdate = this.bookRepository.save(bookToUpdate); + } catch (Exception e) { + ErrorResponse error = new ErrorResponse(); + error.set("Bad request"); + return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); + } + BookResponse bookResponse = new BookResponse(); + bookResponse.set(bookToUpdate); + return new ResponseEntity<>(bookResponse, HttpStatus.CREATED); + } + + @DeleteMapping("/{id}") + public ResponseEntity> deleteBook(@PathVariable int id) { + Book bookToDelete = this.bookRepository.findById(id).orElse(null); + if (bookToDelete == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + this.bookRepository.delete(bookToDelete); + BookResponse bookResponse = new BookResponse(); + bookResponse.set(bookToDelete); + return ResponseEntity.ok(bookResponse); + } +} diff --git a/src/main/java/com/booleanuk/library/models/Book.java b/src/main/java/com/booleanuk/library/models/Book.java new file mode 100644 index 00000000..a8529c5f --- /dev/null +++ b/src/main/java/com/booleanuk/library/models/Book.java @@ -0,0 +1,42 @@ +package com.booleanuk.library.models; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "books") +public class Book { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @Column(name = "title") + private String title; + + @Column(name = "author") + private String author; + + @Column(name = "publisher") + private String publisher; + + @Column(name = "year") + private int year; + + @Column(name = "genre") + private String genre; + + public Book(String title, String author, String publisher, int year, String genre) { + this.title = title; + this.author = author; + this.publisher = publisher; + this.year = year; + this.genre = genre; + } + + public Book(int id) { + this.id = id; + } +} diff --git a/src/main/java/com/booleanuk/library/models/ERole.java b/src/main/java/com/booleanuk/library/models/ERole.java new file mode 100644 index 00000000..1c9e8b33 --- /dev/null +++ b/src/main/java/com/booleanuk/library/models/ERole.java @@ -0,0 +1,7 @@ +package com.booleanuk.library.models; + +public enum ERole { + ROLE_USER, + ROLE_MODERATOR, + ROLE_ADMIN +} diff --git a/src/main/java/com/booleanuk/library/models/Role.java b/src/main/java/com/booleanuk/library/models/Role.java new file mode 100644 index 00000000..c25da648 --- /dev/null +++ b/src/main/java/com/booleanuk/library/models/Role.java @@ -0,0 +1,23 @@ +package com.booleanuk.library.models; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +@Entity +@Table(name = "roles") +public class Role { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @Enumerated(EnumType.STRING) + @Column(length = 20) + private ERole name; + + public Role(ERole name) { + this.name = name; + } +} diff --git a/src/main/java/com/booleanuk/library/models/User.java b/src/main/java/com/booleanuk/library/models/User.java new file mode 100644 index 00000000..c229d48f --- /dev/null +++ b/src/main/java/com/booleanuk/library/models/User.java @@ -0,0 +1,48 @@ +package com.booleanuk.library.models; + +import jakarta.persistence.*; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashSet; +import java.util.Set; + +@NoArgsConstructor +@Data +@Entity +@Table(name = "users", + uniqueConstraints = { + @UniqueConstraint(columnNames = "username"), + @UniqueConstraint(columnNames = "email") + }) +public class User { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @NotBlank + @Size(max = 20) + private String username; + + @NotBlank + @Size(max = 50) + @Email + private String email; + + @NotBlank + @Size(max = 120) + private String password; + + @ManyToMany(fetch = FetchType.LAZY) + @JoinTable(name = "user_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id")) + private Set roles = new HashSet<>(); + + public User(String username, String email, String password) { + this.username = username; + this.email = email; + this.password = password; + } +} diff --git a/src/main/java/com/booleanuk/library/payload/request/LoginRequest.java b/src/main/java/com/booleanuk/library/payload/request/LoginRequest.java new file mode 100644 index 00000000..16517685 --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/request/LoginRequest.java @@ -0,0 +1,15 @@ +package com.booleanuk.library.payload.request; + +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class LoginRequest { + @NotBlank + private String username; + + @NotBlank + private String password; +} diff --git a/src/main/java/com/booleanuk/library/payload/request/SignupRequest.java b/src/main/java/com/booleanuk/library/payload/request/SignupRequest.java new file mode 100644 index 00000000..b8b516dc --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/request/SignupRequest.java @@ -0,0 +1,29 @@ +package com.booleanuk.library.payload.request; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +import java.util.Set; + +@Getter +@Setter +public class SignupRequest { + @NotBlank + @Size(min = 3, max = 20) + private String username; + + @NotBlank + @Size(max = 50) + @Email + private String email; + + private Set role; + + @NotBlank + @Size(min = 6, max = 40) + private String password; + +} diff --git a/src/main/java/com/booleanuk/library/payload/response/BookListResponse.java b/src/main/java/com/booleanuk/library/payload/response/BookListResponse.java new file mode 100644 index 00000000..c53cbce5 --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/BookListResponse.java @@ -0,0 +1,8 @@ +package com.booleanuk.library.payload.response; + +import com.booleanuk.library.models.Book; + +import java.util.List; + +public class BookListResponse extends Response> { +} diff --git a/src/main/java/com/booleanuk/library/payload/response/BookResponse.java b/src/main/java/com/booleanuk/library/payload/response/BookResponse.java new file mode 100644 index 00000000..553720e4 --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/BookResponse.java @@ -0,0 +1,6 @@ +package com.booleanuk.library.payload.response; + +import com.booleanuk.library.models.Book; + +public class BookResponse extends Response { +} diff --git a/src/main/java/com/booleanuk/library/payload/response/ErrorResponse.java b/src/main/java/com/booleanuk/library/payload/response/ErrorResponse.java new file mode 100644 index 00000000..775cb151 --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/ErrorResponse.java @@ -0,0 +1,19 @@ +package com.booleanuk.library.payload.response; + +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.HashMap; +import java.util.Map; + +@Getter +@NoArgsConstructor +public class ErrorResponse extends Response> { + public void set(String message) { + this.status = "error"; + + Map reply = new HashMap<>(); + reply.put("message", message); + this.data = reply; + } +} diff --git a/src/main/java/com/booleanuk/library/payload/response/JwtResponse.java b/src/main/java/com/booleanuk/library/payload/response/JwtResponse.java new file mode 100644 index 00000000..a36cc2dc --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/JwtResponse.java @@ -0,0 +1,25 @@ +package com.booleanuk.library.payload.response; + +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +public class JwtResponse { + private String token; + private String type = "Bearer"; + private int id; + private String username; + private String email; + private List roles; + + public JwtResponse(String token, int id, String username, String email, List roles) { + this.token = token; + this.id = id; + this.username = username; + this.email = email; + this.roles = roles; + } +} diff --git a/src/main/java/com/booleanuk/library/payload/response/MessageResponse.java b/src/main/java/com/booleanuk/library/payload/response/MessageResponse.java new file mode 100644 index 00000000..9fd7c722 --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/MessageResponse.java @@ -0,0 +1,14 @@ +package com.booleanuk.library.payload.response; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MessageResponse { + private String message; + + public MessageResponse(String message) { + this.message = message; + } +} diff --git a/src/main/java/com/booleanuk/library/payload/response/Response.java b/src/main/java/com/booleanuk/library/payload/response/Response.java new file mode 100644 index 00000000..bac89c9d --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/Response.java @@ -0,0 +1,14 @@ +package com.booleanuk.library.payload.response; + +import lombok.Getter; + +@Getter +public class Response { + protected String status; + protected T data; + + public void set(T data) { + this.status = "success"; + this.data = data; + } +} diff --git a/src/main/java/com/booleanuk/library/repository/BookRepository.java b/src/main/java/com/booleanuk/library/repository/BookRepository.java new file mode 100644 index 00000000..1c6ddca7 --- /dev/null +++ b/src/main/java/com/booleanuk/library/repository/BookRepository.java @@ -0,0 +1,7 @@ +package com.booleanuk.library.repository; + +import com.booleanuk.library.models.Book; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BookRepository extends JpaRepository { +} diff --git a/src/main/java/com/booleanuk/library/repository/RoleRepository.java b/src/main/java/com/booleanuk/library/repository/RoleRepository.java new file mode 100644 index 00000000..bd91b0cb --- /dev/null +++ b/src/main/java/com/booleanuk/library/repository/RoleRepository.java @@ -0,0 +1,11 @@ +package com.booleanuk.library.repository; + +import com.booleanuk.library.models.ERole; +import com.booleanuk.library.models.Role; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface RoleRepository extends JpaRepository { + Optional findByName(ERole name); +} diff --git a/src/main/java/com/booleanuk/library/repository/UserRepository.java b/src/main/java/com/booleanuk/library/repository/UserRepository.java new file mode 100644 index 00000000..8ee6d209 --- /dev/null +++ b/src/main/java/com/booleanuk/library/repository/UserRepository.java @@ -0,0 +1,15 @@ +package com.booleanuk.library.repository; + +import com.booleanuk.library.models.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface UserRepository extends JpaRepository { + Optional findByUsername(String username); + + Boolean existsByUsername(String username); + Boolean existsByEmail(String email); +} diff --git a/src/main/java/com/booleanuk/library/security/WebSecurityConfig.java b/src/main/java/com/booleanuk/library/security/WebSecurityConfig.java new file mode 100644 index 00000000..26b2f0fa --- /dev/null +++ b/src/main/java/com/booleanuk/library/security/WebSecurityConfig.java @@ -0,0 +1,68 @@ +package com.booleanuk.library.security; + +import com.booleanuk.library.security.jwt.AuthEntryPointJwt; +import com.booleanuk.library.security.jwt.AuthTokenFilter; +import com.booleanuk.library.security.services.UserDetailsServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@Configuration +@EnableWebSecurity +public class WebSecurityConfig { + @Autowired + private UserDetailsServiceImpl userDetailsService; + + @Autowired + private AuthEntryPointJwt unauthorizedHandler; + + @Bean + public AuthTokenFilter authenticationJwtTokenFilter() { + return new AuthTokenFilter(); + } + + @Bean + public DaoAuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(); + + authProvider.setUserDetailsService(userDetailsService); + authProvider.setPasswordEncoder(passwordEncoder()); + + return authProvider; + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http + .csrf((csrf) -> csrf.disable()) + .exceptionHandling((exception) -> exception.authenticationEntryPoint(unauthorizedHandler)) + .sessionManagement((session) -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeHttpRequests((requests) -> requests + .requestMatchers("/auth/**").permitAll() + .requestMatchers("/books", "/books/**").authenticated() + ); + http.authenticationProvider(authenticationProvider()); + http.addFilterBefore(authenticationJwtTokenFilter(), UsernamePasswordAuthenticationFilter.class); + return http.build(); + } + + @Bean + public AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) throws Exception { + return authenticationConfiguration.getAuthenticationManager(); + } +} diff --git a/src/main/java/com/booleanuk/library/security/jwt/AuthEntryPointJwt.java b/src/main/java/com/booleanuk/library/security/jwt/AuthEntryPointJwt.java new file mode 100644 index 00000000..c22467cc --- /dev/null +++ b/src/main/java/com/booleanuk/library/security/jwt/AuthEntryPointJwt.java @@ -0,0 +1,24 @@ +package com.booleanuk.library.security.jwt; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +public class AuthEntryPointJwt implements AuthenticationEntryPoint { + private static final Logger logger = LoggerFactory.getLogger(AuthEntryPointJwt.class); + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { + logger.error("Unauthorized error: {}", authException.getMessage()); + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Error: Unauthorized"); + } + +} diff --git a/src/main/java/com/booleanuk/library/security/jwt/AuthTokenFilter.java b/src/main/java/com/booleanuk/library/security/jwt/AuthTokenFilter.java new file mode 100644 index 00000000..d2775533 --- /dev/null +++ b/src/main/java/com/booleanuk/library/security/jwt/AuthTokenFilter.java @@ -0,0 +1,54 @@ +package com.booleanuk.library.security.jwt; + +import com.booleanuk.library.security.services.UserDetailsServiceImpl; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +public class AuthTokenFilter extends OncePerRequestFilter { + @Autowired + private JwtUtils jwtUtils; + + @Autowired + private UserDetailsServiceImpl userDetailsService; + + private static final Logger logger = LoggerFactory.getLogger(AuthTokenFilter.class); + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + try { + String jwt = parseJwt(request); + if (jwt != null && jwtUtils.validateJwtToken(jwt)) { + String username = jwtUtils.getUserNameFromJwtToken(jwt); + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authentication); + } + } catch (Exception e) { + logger.error("Cannot set user authentication: {}", e.getMessage()); + } + filterChain.doFilter(request, response); + } + + private String parseJwt(HttpServletRequest request) { + String headerAuth = request.getHeader("Authorization"); + if (StringUtils.hasText(headerAuth) && headerAuth.startsWith("Bearer ")) { + return headerAuth.substring(7); + } + return null; + } +} diff --git a/src/main/java/com/booleanuk/library/security/jwt/JwtUtils.java b/src/main/java/com/booleanuk/library/security/jwt/JwtUtils.java new file mode 100644 index 00000000..252f6731 --- /dev/null +++ b/src/main/java/com/booleanuk/library/security/jwt/JwtUtils.java @@ -0,0 +1,63 @@ +package com.booleanuk.library.security.jwt; + +import com.booleanuk.library.security.services.UserDetailsImpl; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.UnsupportedJwtException; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.util.Date; + +@Component +public class JwtUtils { + private static final Logger logger = LoggerFactory.getLogger(JwtUtils.class); + + @Value("${booleanuk.app.jwtSecret}") + private String jwtSecret; + + @Value("${booleanuk.app.jwtExpirationMs}") + private int jwtExpirationMs; + + public String generateJwtToken(Authentication authentication) { + UserDetailsImpl userPrincipal = (UserDetailsImpl) authentication.getPrincipal(); + + return Jwts.builder() + .subject((userPrincipal.getUsername())) + .issuedAt(new Date()) + .expiration(new Date((new Date()).getTime() + this.jwtExpirationMs)) + .signWith(this.key()) + .compact(); + } + + private SecretKey key() { + return Keys.hmacShaKeyFor(Decoders.BASE64.decode(this.jwtSecret)); + } + + public String getUserNameFromJwtToken(String token) { + return Jwts.parser().verifyWith(this.key()).build().parseSignedClaims(token).getPayload().getSubject(); + } + + public boolean validateJwtToken(String authToken) { + try { + Jwts.parser().verifyWith(this.key()).build().parse(authToken); + return true; + } catch (MalformedJwtException e) { + logger.error("Invalid JWT token: {}", e.getMessage()); + } catch (ExpiredJwtException e) { + logger.error("JWT token has expired: {}", e.getMessage()); + } catch (UnsupportedJwtException e) { + logger.error("JWT token is unsupported: {}", e.getMessage()); + } catch (IllegalArgumentException e) { + logger.error("JWT claims string is empty: {}", e.getMessage()); + } + return false; + } +} diff --git a/src/main/java/com/booleanuk/library/security/services/UserDetailsImpl.java b/src/main/java/com/booleanuk/library/security/services/UserDetailsImpl.java new file mode 100644 index 00000000..103b1ecc --- /dev/null +++ b/src/main/java/com/booleanuk/library/security/services/UserDetailsImpl.java @@ -0,0 +1,59 @@ +package com.booleanuk.library.security.services; + +import com.booleanuk.library.models.User; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Getter; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +@Getter +public class UserDetailsImpl implements UserDetails { + private static final long serialVersionUID = 1L; + + private int id; + private String username; + private String email; + + @JsonIgnore + private String password; + + private Collection authorities; + + public UserDetailsImpl(int id, String username, String email, String password, Collection authorities) { + this.id = id; + this.username = username; + this.email = email; + this.password = password; + this.authorities = authorities; + } + + public static UserDetailsImpl build(User user) { + List authorities = user.getRoles().stream() + .map(role -> new SimpleGrantedAuthority(role.getName().name())) + .collect(Collectors.toList()); + return new UserDetailsImpl( + user.getId(), + user.getUsername(), + user.getEmail(), + user.getPassword(), + authorities); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + UserDetailsImpl user = (UserDetailsImpl) o; + return Objects.equals(id, user.id); + } +} diff --git a/src/main/java/com/booleanuk/library/security/services/UserDetailsServiceImpl.java b/src/main/java/com/booleanuk/library/security/services/UserDetailsServiceImpl.java new file mode 100644 index 00000000..b1ceba96 --- /dev/null +++ b/src/main/java/com/booleanuk/library/security/services/UserDetailsServiceImpl.java @@ -0,0 +1,26 @@ +package com.booleanuk.library.security.services; + +import com.booleanuk.library.models.User; +import com.booleanuk.library.repository.UserRepository; +import jakarta.transaction.Transactional; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +public class UserDetailsServiceImpl implements UserDetailsService { + @Autowired + UserRepository userRepository; + + @Override + @Transactional + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + User user = userRepository.findByUsername(username).orElseThrow( + () -> new UsernameNotFoundException("User not found with username: " + username) + ); + return UserDetailsImpl.build(user); + + } +} From 16fa17f049ac50b53cea461c7456a0677f38fa36 Mon Sep 17 00:00:00 2001 From: Emanuels Zaurins Date: Fri, 22 Aug 2025 11:54:00 +0200 Subject: [PATCH 2/2] Core completed --- .gitignore | 10 ++ build.gradle | 25 +++- .../library/controllers/BookController.java | 92 ------------ .../controllers/CustomerController.java | 138 ++++++++++++++++++ .../library/controllers/MovieController.java | 133 +++++++++++++++++ .../com/booleanuk/library/models/Book.java | 42 ------ .../booleanuk/library/models/Customer.java | 56 +++++++ .../com/booleanuk/library/models/Movie.java | 63 ++++++++ .../booleanuk/library/models/Screening.java | 65 +++++++++ .../com/booleanuk/library/models/Ticket.java | 52 +++++++ .../payload/response/BookListResponse.java | 8 - .../payload/response/BookResponse.java | 6 - .../response/CustomerListResponse.java | 8 + .../payload/response/CustomerResponse.java | 6 + .../payload/response/MovieListResponse.java | 8 + .../payload/response/MovieResponse.java | 6 + .../response/ScreeningListResponse.java | 8 + .../payload/response/ScreeningResponse.java | 6 + .../library/repository/BookRepository.java | 7 - .../repository/CustomerRepository.java | 7 + .../library/repository/MovieRepository.java | 7 + .../repository/ScreeningRepository.java | 8 + .../library/security/WebSecurityConfig.java | 5 +- src/main/resources/application.yml.example | 23 --- 24 files changed, 602 insertions(+), 187 deletions(-) delete mode 100644 src/main/java/com/booleanuk/library/controllers/BookController.java create mode 100644 src/main/java/com/booleanuk/library/controllers/CustomerController.java create mode 100644 src/main/java/com/booleanuk/library/controllers/MovieController.java delete mode 100644 src/main/java/com/booleanuk/library/models/Book.java create mode 100644 src/main/java/com/booleanuk/library/models/Customer.java create mode 100644 src/main/java/com/booleanuk/library/models/Movie.java create mode 100644 src/main/java/com/booleanuk/library/models/Screening.java create mode 100644 src/main/java/com/booleanuk/library/models/Ticket.java delete mode 100644 src/main/java/com/booleanuk/library/payload/response/BookListResponse.java delete mode 100644 src/main/java/com/booleanuk/library/payload/response/BookResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/CustomerListResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/CustomerResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/MovieListResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/MovieResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/ScreeningListResponse.java create mode 100644 src/main/java/com/booleanuk/library/payload/response/ScreeningResponse.java delete mode 100644 src/main/java/com/booleanuk/library/repository/BookRepository.java create mode 100644 src/main/java/com/booleanuk/library/repository/CustomerRepository.java create mode 100644 src/main/java/com/booleanuk/library/repository/MovieRepository.java create mode 100644 src/main/java/com/booleanuk/library/repository/ScreeningRepository.java delete mode 100644 src/main/resources/application.yml.example diff --git a/.gitignore b/.gitignore index dc01f204..ce34bede 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,13 @@ out/ ### VS Code ### .vscode/ + + +### properties ### + +*.properties +report.html.html +report.html.json +application.yml + + diff --git a/build.gradle b/build.gradle index 3d7f7607..90ba6eb2 100644 --- a/build.gradle +++ b/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.5.4' + id 'io.spring.dependency-management' version '1.1.7' } group = 'com.booleanuk' @@ -18,12 +18,21 @@ repositories { } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-web' - developmentOnly 'org.springframework.boot:spring-boot-devtools' - runtimeOnly 'org.postgresql:postgresql' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'io.jsonwebtoken:jjwt-api:0.12.7' + implementation 'io.jsonwebtoken:jjwt-impl:0.12.7' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.7' + + 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' + testImplementation 'org.springframework.security:spring-security-test' + + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' } tasks.named('test') { diff --git a/src/main/java/com/booleanuk/library/controllers/BookController.java b/src/main/java/com/booleanuk/library/controllers/BookController.java deleted file mode 100644 index 594c95cb..00000000 --- a/src/main/java/com/booleanuk/library/controllers/BookController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.booleanuk.library.controllers; - -import com.booleanuk.library.models.Book; -import com.booleanuk.library.repository.BookRepository; -import com.booleanuk.library.payload.response.BookListResponse; -import com.booleanuk.library.payload.response.BookResponse; -import com.booleanuk.library.payload.response.ErrorResponse; -import com.booleanuk.library.payload.response.Response; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("books") -public class BookController { - @Autowired - private BookRepository bookRepository; - - @GetMapping - public ResponseEntity getAllBooks() { - BookListResponse bookListResponse = new BookListResponse(); - bookListResponse.set(this.bookRepository.findAll()); - return ResponseEntity.ok(bookListResponse); - } - - @PostMapping - public ResponseEntity> createBook(@RequestBody Book book) { - BookResponse bookResponse = new BookResponse(); - try { - bookResponse.set(this.bookRepository.save(book)); - } catch (Exception e) { - ErrorResponse error = new ErrorResponse(); - error.set("Bad request"); - return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); - } - return new ResponseEntity<>(bookResponse, HttpStatus.CREATED); - } - - @GetMapping("/{id}") - public ResponseEntity> getBookById(@PathVariable int id) { - Book book = this.bookRepository.findById(id).orElse(null); - if (book == null) { - ErrorResponse error = new ErrorResponse(); - error.set("not found"); - return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); - } - BookResponse bookResponse = new BookResponse(); - bookResponse.set(book); - return ResponseEntity.ok(bookResponse); - } - - @PutMapping("/{id}") - public ResponseEntity> updateBook(@PathVariable int id, @RequestBody Book book) { - Book bookToUpdate = this.bookRepository.findById(id).orElse(null); - if (bookToUpdate == null) { - ErrorResponse error = new ErrorResponse(); - error.set("not found"); - return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); - } - bookToUpdate.setTitle(book.getTitle()); - bookToUpdate.setAuthor(book.getAuthor()); - bookToUpdate.setPublisher(book.getPublisher()); - bookToUpdate.setYear(book.getYear()); - bookToUpdate.setGenre(book.getGenre()); - - try { - bookToUpdate = this.bookRepository.save(bookToUpdate); - } catch (Exception e) { - ErrorResponse error = new ErrorResponse(); - error.set("Bad request"); - return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); - } - BookResponse bookResponse = new BookResponse(); - bookResponse.set(bookToUpdate); - return new ResponseEntity<>(bookResponse, HttpStatus.CREATED); - } - - @DeleteMapping("/{id}") - public ResponseEntity> deleteBook(@PathVariable int id) { - Book bookToDelete = this.bookRepository.findById(id).orElse(null); - if (bookToDelete == null) { - ErrorResponse error = new ErrorResponse(); - error.set("not found"); - return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); - } - this.bookRepository.delete(bookToDelete); - BookResponse bookResponse = new BookResponse(); - bookResponse.set(bookToDelete); - return ResponseEntity.ok(bookResponse); - } -} diff --git a/src/main/java/com/booleanuk/library/controllers/CustomerController.java b/src/main/java/com/booleanuk/library/controllers/CustomerController.java new file mode 100644 index 00000000..431add19 --- /dev/null +++ b/src/main/java/com/booleanuk/library/controllers/CustomerController.java @@ -0,0 +1,138 @@ +package com.booleanuk.library.controllers; + +import com.booleanuk.library.models.Customer; +import com.booleanuk.library.models.Screening; +import com.booleanuk.library.payload.response.*; +import com.booleanuk.library.repository.CustomerRepository; +import com.booleanuk.library.repository.ScreeningRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("customers") +public class CustomerController { + @Autowired + private CustomerRepository customerRepository; + + @Autowired + private ScreeningRepository screeningRepository; + + + //extension + + @PostMapping("/{custId}/screenings/{screenId}") + public ResponseEntity> createScreening(@PathVariable int id, @RequestBody Screening screening) { +// Movie movieToUpdate = this.movieRepository.findById(id).orElse(null); +// if (movieToUpdate == null) { +// ErrorResponse error = new ErrorResponse(); +// error.set("not found"); +// return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); +// } + ScreeningResponse screeningResponse = new ScreeningResponse(); + try { + screeningResponse.set(this.screeningRepository.save(screening)); + } catch (Exception e) { + ErrorResponse error = new ErrorResponse(); + error.set("Bad request"); + return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); + } + return new ResponseEntity<>(screeningResponse, HttpStatus.CREATED); + } + + @GetMapping("/{custId}/screenings/{screenId}") + public ResponseEntity> getScreeningById(@PathVariable int id) { + Screening screening = this.screeningRepository.findById(id).orElse(null); + if (screening == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + ScreeningResponse screeningResponse = new ScreeningResponse(); + screeningResponse.set(screening); + return ResponseEntity.ok(screeningResponse); + } + + + + //core + + + + + + + @GetMapping + public ResponseEntity getAllCustomers() { + CustomerListResponse customerListResponse = new CustomerListResponse(); + customerListResponse.set(this.customerRepository.findAll()); + return ResponseEntity.ok(customerListResponse); + } + + @PostMapping + public ResponseEntity> createCustomer(@RequestBody Customer customer) { + CustomerResponse customerResponse = new CustomerResponse(); + try { + customerResponse.set(this.customerRepository.save(customer)); + } catch (Exception e) { + ErrorResponse error = new ErrorResponse(); + error.set("Bad request"); + return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); + } + return new ResponseEntity<>(customerResponse, HttpStatus.CREATED); + } + + @GetMapping("/{id}") + public ResponseEntity> getCustomerById(@PathVariable int id) { + Customer customer = this.customerRepository.findById(id).orElse(null); + if (customer == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + CustomerResponse customerResponse = new CustomerResponse(); + customerResponse.set(customer); + return ResponseEntity.ok(customerResponse); + } + + @PutMapping("/{id}") + public ResponseEntity> updateCustomer(@PathVariable int id, @RequestBody Customer customer) { + Customer customerToUpdate = this.customerRepository.findById(id).orElse(null); + if (customerToUpdate == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + customerToUpdate.setName(customer.getName()); + customerToUpdate.setEmail(customer.getEmail()); + customerToUpdate.setPhone(customer.getPhone()); + customerToUpdate.setCreatedAt(customer.getCreatedAt()); + customerToUpdate.setUpdatedAt(customer.getUpdatedAt()); + + try { + customerToUpdate = this.customerRepository.save(customerToUpdate); + } catch (Exception e) { + ErrorResponse error = new ErrorResponse(); + error.set("Bad request"); + return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); + } + CustomerResponse customerResponse = new CustomerResponse(); + customerResponse.set(customerToUpdate); + return new ResponseEntity<>(customerResponse, HttpStatus.CREATED); + } + + @DeleteMapping("/{id}") + public ResponseEntity> deleteCustomer(@PathVariable int id) { + Customer customerToDelete = this.customerRepository.findById(id).orElse(null); + if (customerToDelete == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + this.customerRepository.delete(customerToDelete); + CustomerResponse customerResponse = new CustomerResponse(); + customerResponse.set(customerToDelete); + return ResponseEntity.ok(customerResponse); + } +} diff --git a/src/main/java/com/booleanuk/library/controllers/MovieController.java b/src/main/java/com/booleanuk/library/controllers/MovieController.java new file mode 100644 index 00000000..2870c091 --- /dev/null +++ b/src/main/java/com/booleanuk/library/controllers/MovieController.java @@ -0,0 +1,133 @@ +package com.booleanuk.library.controllers; + +import com.booleanuk.library.models.Movie; +import com.booleanuk.library.models.Screening; +import com.booleanuk.library.payload.response.*; +import com.booleanuk.library.repository.MovieRepository; +import com.booleanuk.library.repository.ScreeningRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; + +@RestController +@RequestMapping("movies") +public class MovieController { + @Autowired + private MovieRepository movieRepository; + + @Autowired + private ScreeningRepository screeningRepository; + + + @PostMapping("/{id}/screenings") + public ResponseEntity> createScreening(@PathVariable int id, @RequestBody Screening screening) { + + + ScreeningResponse screeningResponse = new ScreeningResponse(); + Movie movie = this.movieRepository.findById(id).orElse(null); + screening.setMovie(movie); + + try { + screeningResponse.set(this.screeningRepository.save(screening)); + } catch (Exception e) { + ErrorResponse error = new ErrorResponse(); + error.set("Bad request"); + return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); + } + return new ResponseEntity<>(screeningResponse, HttpStatus.CREATED); + } + + + @GetMapping("/{id}/screenings") + public ResponseEntity> getScreeningById(@PathVariable int id) { + Movie movie = this.movieRepository.findById(id).orElse(null); + ScreeningListResponse screeningListResponse = new ScreeningListResponse(); + screeningListResponse.set(this.screeningRepository.findAll()); + + if (movie == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + + return ResponseEntity.ok(screeningListResponse); + } + + @GetMapping + public ResponseEntity getAllMovies() { + MovieListResponse movieListResponse = new MovieListResponse(); + movieListResponse.set(this.movieRepository.findAll()); + return ResponseEntity.ok(movieListResponse); + } + + @PostMapping + public ResponseEntity> createMovie(@RequestBody Movie movie) { + MovieResponse movieResponse = new MovieResponse(); + try { + movieResponse.set(this.movieRepository.save(movie)); + } catch (Exception e) { + ErrorResponse error = new ErrorResponse(); + error.set("Bad request"); + return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); + } + return new ResponseEntity<>(movieResponse, HttpStatus.CREATED); + } + + @GetMapping("/{id}") + public ResponseEntity> getMovieById(@PathVariable int id) { + Movie movie = this.movieRepository.findById(id).orElse(null); + if (movie == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + MovieResponse movieResponse = new MovieResponse(); + movieResponse.set(movie); + return ResponseEntity.ok(movieResponse); + } + + @PutMapping("/{id}") + public ResponseEntity> updateMovie(@PathVariable int id, @RequestBody Movie movie) { + Movie movieToUpdate = this.movieRepository.findById(id).orElse(null); + if (movieToUpdate == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + movieToUpdate.setTitle(movie.getTitle()); + movieToUpdate.setRating(movie.getRating()); + movieToUpdate.setDescription(movie.getDescription()); + movieToUpdate.setDescription(movie.getDescription()); + movieToUpdate.setRuntimeMins(movie.getRuntimeMins()); + movieToUpdate.setCreatedAt(movie.getCreatedAt()); + movieToUpdate.setUpdatedAt(movie.getUpdatedAt()); + + try { + movieToUpdate = this.movieRepository.save(movieToUpdate); + } catch (Exception e) { + ErrorResponse error = new ErrorResponse(); + error.set("Bad request"); + return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST); + } + MovieResponse movieResponse = new MovieResponse(); + movieResponse.set(movieToUpdate); + return new ResponseEntity<>(movieResponse, HttpStatus.CREATED); + } + + @DeleteMapping("/{id}") + public ResponseEntity> deleteMovie(@PathVariable int id) { + Movie movieToDelete = this.movieRepository.findById(id).orElse(null); + if (movieToDelete == null) { + ErrorResponse error = new ErrorResponse(); + error.set("not found"); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } + this.movieRepository.delete(movieToDelete); + MovieResponse movieResponse = new MovieResponse(); + movieResponse.set(movieToDelete); + return ResponseEntity.ok(movieResponse); + } +} diff --git a/src/main/java/com/booleanuk/library/models/Book.java b/src/main/java/com/booleanuk/library/models/Book.java deleted file mode 100644 index a8529c5f..00000000 --- a/src/main/java/com/booleanuk/library/models/Book.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.booleanuk.library.models; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "books") -public class Book { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private int id; - - @Column(name = "title") - private String title; - - @Column(name = "author") - private String author; - - @Column(name = "publisher") - private String publisher; - - @Column(name = "year") - private int year; - - @Column(name = "genre") - private String genre; - - public Book(String title, String author, String publisher, int year, String genre) { - this.title = title; - this.author = author; - this.publisher = publisher; - this.year = year; - this.genre = genre; - } - - public Book(int id) { - this.id = id; - } -} diff --git a/src/main/java/com/booleanuk/library/models/Customer.java b/src/main/java/com/booleanuk/library/models/Customer.java new file mode 100644 index 00000000..efee8553 --- /dev/null +++ b/src/main/java/com/booleanuk/library/models/Customer.java @@ -0,0 +1,56 @@ +package com.booleanuk.library.models; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "customers") +public class Customer { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @Column + private String name; + + @Column + private String email; + + @Column + private String phone; + + @Column + private LocalDateTime createdAt; + + @Column + private LocalDateTime updatedAt; + + public Customer(String name, String email, String phone) { + this.name = name; + this.email = email; + this.phone = phone; + + } + + + @PrePersist + protected void onCreate() { + this.createdAt = LocalDateTime.now(); + this.updatedAt = LocalDateTime.now(); + } + + @PreUpdate + protected void onUpdate() { + this.updatedAt = LocalDateTime.now(); + } + + + public Customer(int id) { + this.id = id; + } +} diff --git a/src/main/java/com/booleanuk/library/models/Movie.java b/src/main/java/com/booleanuk/library/models/Movie.java new file mode 100644 index 00000000..ce21b8c3 --- /dev/null +++ b/src/main/java/com/booleanuk/library/models/Movie.java @@ -0,0 +1,63 @@ +package com.booleanuk.library.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.persistence.*; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "movies") +public class Movie { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @Column(name = "title") + private String title; + + @Column + private String rating; + + @Column(name = "description") + private String description; + + @Column(name = "runtime_mins") + private int runtimeMins; + + + @Column + private LocalDateTime createdAt; + + @Column + private LocalDateTime updatedAt; + + @OneToMany(mappedBy = "movie", cascade = CascadeType.REMOVE, fetch = FetchType.EAGER) + @JsonIgnoreProperties({"movie"}) + private List screenings; + + + public Movie(String title, String rating, String description, int runtimeMins) { + this.title = title; + this.rating = rating; + this.description = description; + this.runtimeMins = runtimeMins; + } + @PrePersist + protected void onCreate() { + this.createdAt = LocalDateTime.now(); + this.updatedAt = LocalDateTime.now(); + } + + @PreUpdate + protected void onUpdate() { + this.updatedAt = LocalDateTime.now(); + } + public Movie(int id) { + this.id = id; + } +} diff --git a/src/main/java/com/booleanuk/library/models/Screening.java b/src/main/java/com/booleanuk/library/models/Screening.java new file mode 100644 index 00000000..00c78cd2 --- /dev/null +++ b/src/main/java/com/booleanuk/library/models/Screening.java @@ -0,0 +1,65 @@ +package com.booleanuk.library.models; + +import com.fasterxml.jackson.annotation.JsonIncludeProperties; +import jakarta.persistence.*; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "screenings") +public class Screening { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @Column + private int screenNumber; + + @Column + private LocalDateTime startsAt; + + @Column + private int capacity; + + @Column + private LocalDateTime createdAt; + + @Column + private LocalDateTime updatedAt; + + + @ManyToOne + @JoinColumn(name="movie_id", nullable = true) + @JsonIncludeProperties(value={"created_at","description","author","runtime_mins","title","updated_at"}) + private Movie movie; + + + + public Screening(int screenNumber,int capacity, LocalDateTime startsAt) { + this.capacity = capacity; + this.startsAt = startsAt; + this.screenNumber = screenNumber; + } + + + + @PrePersist + protected void onCreate() { + this.createdAt = LocalDateTime.now(); + this.updatedAt = LocalDateTime.now(); + } + + @PreUpdate + protected void onUpdate() { + this.updatedAt = LocalDateTime.now(); + } + + + public Screening(int id) { + this.id = id; + } +} diff --git a/src/main/java/com/booleanuk/library/models/Ticket.java b/src/main/java/com/booleanuk/library/models/Ticket.java new file mode 100644 index 00000000..a7035524 --- /dev/null +++ b/src/main/java/com/booleanuk/library/models/Ticket.java @@ -0,0 +1,52 @@ +package com.booleanuk.library.models; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "tickets") +public class Ticket { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + + @Column + private int numSeats; + + @Column + private LocalDateTime createdAt; + + @Column + private LocalDateTime updatedAt; + + @Column + private int customerId; + + @Column + private int screeningId; + + public Ticket(int numSeats, LocalDateTime createdAt, LocalDateTime updatedAt) { + this.numSeats = numSeats; + } + + @PrePersist + protected void onCreate() { + this.createdAt = LocalDateTime.now(); + this.updatedAt = LocalDateTime.now(); + } + + @PreUpdate + protected void onUpdate() { + this.updatedAt = LocalDateTime.now(); + } + + public Ticket(int id) { + this.id = id; + } +} diff --git a/src/main/java/com/booleanuk/library/payload/response/BookListResponse.java b/src/main/java/com/booleanuk/library/payload/response/BookListResponse.java deleted file mode 100644 index c53cbce5..00000000 --- a/src/main/java/com/booleanuk/library/payload/response/BookListResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.booleanuk.library.payload.response; - -import com.booleanuk.library.models.Book; - -import java.util.List; - -public class BookListResponse extends Response> { -} diff --git a/src/main/java/com/booleanuk/library/payload/response/BookResponse.java b/src/main/java/com/booleanuk/library/payload/response/BookResponse.java deleted file mode 100644 index 553720e4..00000000 --- a/src/main/java/com/booleanuk/library/payload/response/BookResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.booleanuk.library.payload.response; - -import com.booleanuk.library.models.Book; - -public class BookResponse extends Response { -} diff --git a/src/main/java/com/booleanuk/library/payload/response/CustomerListResponse.java b/src/main/java/com/booleanuk/library/payload/response/CustomerListResponse.java new file mode 100644 index 00000000..c7eee5fe --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/CustomerListResponse.java @@ -0,0 +1,8 @@ +package com.booleanuk.library.payload.response; + +import com.booleanuk.library.models.Customer; + +import java.util.List; + +public class CustomerListResponse extends Response> { +} diff --git a/src/main/java/com/booleanuk/library/payload/response/CustomerResponse.java b/src/main/java/com/booleanuk/library/payload/response/CustomerResponse.java new file mode 100644 index 00000000..191f1ee6 --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/CustomerResponse.java @@ -0,0 +1,6 @@ +package com.booleanuk.library.payload.response; + +import com.booleanuk.library.models.Customer; + +public class CustomerResponse extends Response { +} diff --git a/src/main/java/com/booleanuk/library/payload/response/MovieListResponse.java b/src/main/java/com/booleanuk/library/payload/response/MovieListResponse.java new file mode 100644 index 00000000..b3004b2d --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/MovieListResponse.java @@ -0,0 +1,8 @@ +package com.booleanuk.library.payload.response; + +import com.booleanuk.library.models.Movie; + +import java.util.List; + +public class MovieListResponse extends Response> { +} diff --git a/src/main/java/com/booleanuk/library/payload/response/MovieResponse.java b/src/main/java/com/booleanuk/library/payload/response/MovieResponse.java new file mode 100644 index 00000000..96565a78 --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/MovieResponse.java @@ -0,0 +1,6 @@ +package com.booleanuk.library.payload.response; + +import com.booleanuk.library.models.Movie; + +public class MovieResponse extends Response { +} diff --git a/src/main/java/com/booleanuk/library/payload/response/ScreeningListResponse.java b/src/main/java/com/booleanuk/library/payload/response/ScreeningListResponse.java new file mode 100644 index 00000000..61aab2c5 --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/ScreeningListResponse.java @@ -0,0 +1,8 @@ +package com.booleanuk.library.payload.response; + +import com.booleanuk.library.models.Screening; + +import java.util.List; + +public class ScreeningListResponse extends Response> { +} diff --git a/src/main/java/com/booleanuk/library/payload/response/ScreeningResponse.java b/src/main/java/com/booleanuk/library/payload/response/ScreeningResponse.java new file mode 100644 index 00000000..755dfd2f --- /dev/null +++ b/src/main/java/com/booleanuk/library/payload/response/ScreeningResponse.java @@ -0,0 +1,6 @@ +package com.booleanuk.library.payload.response; + +import com.booleanuk.library.models.Screening; + +public class ScreeningResponse extends Response { +} diff --git a/src/main/java/com/booleanuk/library/repository/BookRepository.java b/src/main/java/com/booleanuk/library/repository/BookRepository.java deleted file mode 100644 index 1c6ddca7..00000000 --- a/src/main/java/com/booleanuk/library/repository/BookRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.booleanuk.library.repository; - -import com.booleanuk.library.models.Book; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BookRepository extends JpaRepository { -} diff --git a/src/main/java/com/booleanuk/library/repository/CustomerRepository.java b/src/main/java/com/booleanuk/library/repository/CustomerRepository.java new file mode 100644 index 00000000..edf4fcdc --- /dev/null +++ b/src/main/java/com/booleanuk/library/repository/CustomerRepository.java @@ -0,0 +1,7 @@ +package com.booleanuk.library.repository; + +import com.booleanuk.library.models.Customer; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CustomerRepository extends JpaRepository { +} diff --git a/src/main/java/com/booleanuk/library/repository/MovieRepository.java b/src/main/java/com/booleanuk/library/repository/MovieRepository.java new file mode 100644 index 00000000..f69d0183 --- /dev/null +++ b/src/main/java/com/booleanuk/library/repository/MovieRepository.java @@ -0,0 +1,7 @@ +package com.booleanuk.library.repository; + +import com.booleanuk.library.models.Movie; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MovieRepository extends JpaRepository { +} diff --git a/src/main/java/com/booleanuk/library/repository/ScreeningRepository.java b/src/main/java/com/booleanuk/library/repository/ScreeningRepository.java new file mode 100644 index 00000000..2c2f33fd --- /dev/null +++ b/src/main/java/com/booleanuk/library/repository/ScreeningRepository.java @@ -0,0 +1,8 @@ +package com.booleanuk.library.repository; + +import com.booleanuk.library.models.Screening; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ScreeningRepository extends JpaRepository { + +} diff --git a/src/main/java/com/booleanuk/library/security/WebSecurityConfig.java b/src/main/java/com/booleanuk/library/security/WebSecurityConfig.java index 26b2f0fa..3f531bed 100644 --- a/src/main/java/com/booleanuk/library/security/WebSecurityConfig.java +++ b/src/main/java/com/booleanuk/library/security/WebSecurityConfig.java @@ -54,7 +54,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .sessionManagement((session) -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests((requests) -> requests .requestMatchers("/auth/**").permitAll() - .requestMatchers("/books", "/books/**").authenticated() + .requestMatchers("/customers", "/customers/**").authenticated() + .requestMatchers("/movies", "/movies/**").authenticated() + .requestMatchers("/movies/**/screenings", "/movies/**/**").authenticated() + ); http.authenticationProvider(authenticationProvider()); http.addFilterBefore(authenticationJwtTokenFilter(), UsernamePasswordAuthenticationFilter.class); diff --git a/src/main/resources/application.yml.example b/src/main/resources/application.yml.example deleted file mode 100644 index 275ec30f..00000000 --- a/src/main/resources/application.yml.example +++ /dev/null @@ -1,23 +0,0 @@ -server: - port: 4000 - error: - include-message: always - include-binding-errors: always - include-stacktrace: never - include-exception: false - -spring: - datasource: - url: jdbc:postgresql://DATABASE_URL:5432/DATABASE_NAME - username: DATABASE_USERNAME - password: DATABASE_PASSWORD - max-active: 3 - max-idle: 3 - jpa: - hibernate: - ddl-auto: update - properties: - hibernate: - dialect: org.hibernate.dialect.PostgreSQLDialect - format_sql: true - show-sql: true