diff --git a/Dockerfile b/Dockerfile
index e3b4059..aa9241c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 # syntax=docker/dockerfile:1
 # Build and Run docker image with --tag e.g. "wedemyserver"
-FROM maven:3-eclipse-temurin-alpine AS build
+FROM maven:3-eclipse-temurin-17-alpine AS build
 WORKDIR /app
 COPY pom.xml ./
 COPY src ./src
 RUN mvn clean -DskipTests package
 
 
-FROM eclipse-temurin:jre-alpine AS runner
+FROM eclipse-temurin:17-jre-alpine AS runner
 WORKDIR /app
 COPY --from=build /app/target/wedemyserver.jar /app
 EXPOSE 9000
diff --git a/README.md b/README.md
index 2feee5c..963cc44 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # WedemyServer
 
-[![Static Badge](https://img.shields.io/badge/API_docs-v1.2-red)](https://longwater1234.github.io/WedemyServer/)
+[![Static Badge](https://img.shields.io/badge/API_docs-v2.0-red)](https://longwater1234.github.io/WedemyServer/)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/Longwater1234/WedemyServer/graphs/commit-activity)
 [![License: MIT](https://img.shields.io/github/license/Longwater1234/WedemyServer)](https://github.com/Longwater1234/WedemyServer/blob/master/LICENSE)
 [![Static Badge](https://img.shields.io/badge/reference-help.md-orange)](HELP.md)
 
-(Backend repo). Clone of Udemy, an e-learning platform, built using SpringBoot + Vue 3 + Typescript. With CreditCard and
+(Backend repo). Clone of Udemy, an e-learning platform, built using SpringBoot 3 + Vue 3 + Typescript. With CreditCard and
 PayPal checkout (both powered by **Braintree Payments**). Uses Spring Security & Spring Session Redis (via cookies[^1]
 or sessionID Headers) for auth, instead of stateless JWT Tokens. CSRF protection is enabled. You can easily customize
 these settings in [SecurityConfig](src/main/java/com/davistiba/wedemyserver/config/SecurityConfig.java). By default, the
@@ -14,13 +14,13 @@ app runs on port 9000.
 ## Frontend & Live Demo
 
 Click to view [Frontend Repo](https://github.com/Longwater1234/WedemyClient) and live Demo built using Vue 3, Vite and
-Typescript. However, you can still use any frontend stack with this project. See
-the [API Docs](https://longwater1234.github.io/WedemyServer/) for this project.
+Typescript. However, you may use any other frontend stack with this project. See
+the [OpenAPI Docs](https://longwater1234.github.io/WedemyServer/) for this project.
 
-## Requirements
+## Minimum Requirements
 
-- JDK 11 or newer
-- MySQL 8.0 or newer (NOT compatible with MariaDB)
+- Java 17 or newer
+- MySQL 8.0.x or newer
 - Redis Server (latest stable)
 - [Google OAuth Credentials](https://developers.google.com/identity/gsi/web/guides/get-google-api-clientid) (for Google
   Login)
@@ -32,7 +32,7 @@ the [API Docs](https://longwater1234.github.io/WedemyServer/) for this project.
 You MUST set these variables on your Local or Cloud ENV before you launch this SpringBoot app. **💡TIP**: During
 dev/test, you can pass them via `args`, OR store inside your IDE: e.g. In either Eclipse or IntelliJ IDE, in the top
 toolbar, find the **"Run"** menu > **Edit/Run Configuration** > **Environment** > **Environmental Variables**. Add (+)
-each key and its value, then click **Apply**. If using Docker CLI, follow this quick
+each key and its value, then click **Apply**. If using Docker CLI, please follow this quick
 [official guide.](https://docs.docker.com/engine/reference/commandline/run/#env)
 
 ```properties
@@ -61,7 +61,8 @@ in [BraintreeConfig](src/main/java/com/davistiba/wedemyserver/config/BraintreeCo
 ## Database Setup
 
 Using any MySQL client, CREATE new database called `wedemy` (any name is OK), with charset `utf8mb4`. Then follow
-carefully the rest of instructions in [HELP.md](HELP.md#database-setup-info), for both MySQL and Redis.
+carefully instructions in [HELP.md](HELP.md#database-setup-info), for both MySQL and Redis. We recommend NOT to use
+`root` account in prod for Db; create new user account with fewer privileges.
 
 ## Quick Start 🚀
 
@@ -77,21 +78,22 @@ java -jar target/wedemyserver.jar
 
 ### With Docker
 
-I have attached [Dockerfile](Dockerfile) for the Spring server only. You will need to set up MySQL & Redis
-separately. Refer to official Docker docs on how to pass Env variables.
+I have attached [Dockerfile](Dockerfile) for the Springboot server only. You will need to set up MySQL &
+Redis separately. Refer to official Docker docs on how to pass ENV variables listed above.
 
 ```bash
-  docker build -t wedemy-server .
-  docker run --name "wedemy" -d -p9000:9000 wedemy-server
+  docker build -t wedemyserver .
+  docker run --name "wedemy" -d -p9000:9000 wedemyserver
 ```
 
-Tip💡 : If using Docker Desktop (latest), before starting container, you can fill in the ENV vars in the GUI directly.
+**Tip** 💡 : If using Docker Desktop (latest), before starting container, you can fill in the ENV vars in the GUI
+directly.
 See [screenshot](src/main/resources/docker_env.PNG)
 
 ## Deploying your App 🌍
 
 This App can be easily deployed within few minutes, straight from GitHub to your Cloud PaaS of choice. You can either
-use the [Dockerfile](Dockerfile) provided, or as a pure Java app. Popular PaaS with CI/CD for Java
+use the [Dockerfile](Dockerfile) provided, or as a pure Java app. Popular PaaS with CI/CD for Java (without Dockerfile)
 include: Heroku, AWS ElasticBeanstalk, Google App Engine, Azure Web Apps. The following may **require** a Dockerfile:
 Dokku, Railway, Render.com, Fly.io. Please note, you will also need a **separate** MySQL & Redis instance!
 
diff --git a/pom.xml b/pom.xml
index 12512ce..70d217c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,25 +6,25 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>3.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.davistiba</groupId>
     <artifactId>wedemyserver</artifactId>
-    <version>1.2</version>
+    <version>2.0.0</version>
     <name>wedemyserver</name>
     <description>Wedemy clone server, built with Spring Boot</description>
     <url>https://github.com/longwater1234/WedemyServer</url>
 
     <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
@@ -136,6 +136,11 @@
             <artifactId>braintree-java</artifactId>
             <version>3.37.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-properties-migrator</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <!--        UNCOMMENT TO ENABLE SWAGGER -->
         <!--        <dependency>
@@ -184,6 +189,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${project.parent.version}</version>
                 <configuration>
                     <excludes>
                         <exclude>
diff --git a/src/main/java/com/davistiba/wedemyserver/WedemyserverApplication.java b/src/main/java/com/davistiba/wedemyserver/WedemyserverApplication.java
index bbb1113..fe59393 100644
--- a/src/main/java/com/davistiba/wedemyserver/WedemyserverApplication.java
+++ b/src/main/java/com/davistiba/wedemyserver/WedemyserverApplication.java
@@ -32,6 +32,7 @@ public static void main(String[] args) {
     }
 
     @Bean
+    // important for Heroku
     public static ConfigureRedisAction configureRedisAction() {
         return ConfigureRedisAction.NO_OP;
     }
diff --git a/src/main/java/com/davistiba/wedemyserver/config/CustomAuthSuccessHandler.java b/src/main/java/com/davistiba/wedemyserver/config/CustomAuthSuccessHandler.java
index efd47df..5a0cef2 100644
--- a/src/main/java/com/davistiba/wedemyserver/config/CustomAuthSuccessHandler.java
+++ b/src/main/java/com/davistiba/wedemyserver/config/CustomAuthSuccessHandler.java
@@ -1,10 +1,12 @@
 package com.davistiba.wedemyserver.config;
 
 import com.davistiba.wedemyserver.dto.UserDTO;
-import com.davistiba.wedemyserver.models.User;
 import com.davistiba.wedemyserver.service.MyUserDetailsService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -14,9 +16,6 @@
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -44,15 +43,14 @@ public CustomAuthSuccessHandler(MyUserDetailsService myUserDetailsService) {
     public void onAuthenticationSuccess(HttpServletRequest request,
                                         HttpServletResponse response,
                                         Authentication auth) throws IOException, ServletException {
-        if (auth.getPrincipal() instanceof OidcUser) {
+        if (auth.getPrincipal() instanceof OidcUser oidcUser) {
             //if Google Login
-            OidcUser oidcUser = (OidcUser) auth.getPrincipal();
             myUserDetailsService.processOAuthPostLogin(oidcUser, request.getSession());
             response.sendRedirect(FRONTEND_URL);
             return;
         }
-        User loggedInUser = (User) auth.getPrincipal();
-        UserDTO userInfo = modelMapper.map(loggedInUser, UserDTO.class);
+        MainUserDetails loggedInUser = (MainUserDetails) auth.getPrincipal();
+        UserDTO userInfo = modelMapper.map(loggedInUser.getUser(), UserDTO.class);
 
         request.getSession().setAttribute(MyUserDetailsService.USERID, userInfo.getId());
         Map<String, Object> authResponse = new HashMap<>();
diff --git a/src/main/java/com/davistiba/wedemyserver/config/CustomLoginHandler.java b/src/main/java/com/davistiba/wedemyserver/config/CustomLoginHandler.java
index 27c0f8c..681251f 100644
--- a/src/main/java/com/davistiba/wedemyserver/config/CustomLoginHandler.java
+++ b/src/main/java/com/davistiba/wedemyserver/config/CustomLoginHandler.java
@@ -3,6 +3,9 @@
 import com.davistiba.wedemyserver.dto.LoginRequest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationServiceException;
@@ -13,10 +16,6 @@
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * Custom handling of Login by JSON Post request
  */
diff --git a/src/main/java/com/davistiba/wedemyserver/config/MainUserDetails.java b/src/main/java/com/davistiba/wedemyserver/config/MainUserDetails.java
new file mode 100644
index 0000000..daac3e4
--- /dev/null
+++ b/src/main/java/com/davistiba/wedemyserver/config/MainUserDetails.java
@@ -0,0 +1,83 @@
+package com.davistiba.wedemyserver.config;
+
+import com.davistiba.wedemyserver.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.io.Serial;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Objects;
+
+@Getter
+public class MainUserDetails implements UserDetails, Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 3733936374876008250L;
+
+    private final User user;
+
+    public MainUserDetails(User user) {
+        this.user = user;
+    }
+
+    @Override
+    @JsonIgnore
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(user.getUserRole());
+        return Collections.singletonList(authority);
+    }
+
+    @Override
+    @JsonIgnore
+    public String getPassword() {
+        return user.getPassword();
+    }
+
+    @Override
+    @JsonIgnore
+    public String getUsername() {
+        return user.getEmail();
+    }
+
+    @Override
+    @JsonIgnore
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @Override
+    @JsonIgnore
+    public boolean isAccountNonLocked() {
+        return true;
+    }
+
+    @Override
+    @JsonIgnore
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @Override
+    @JsonIgnore
+    public boolean isEnabled() {
+        return user.getEnabled();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        MainUserDetails that = (MainUserDetails) o;
+        return Objects.equals(user.getEmail(), that.user.getEmail());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(user.getEmail());
+    }
+}
diff --git a/src/main/java/com/davistiba/wedemyserver/config/SecurityConfig.java b/src/main/java/com/davistiba/wedemyserver/config/SecurityConfig.java
index 29e4541..71f84a5 100644
--- a/src/main/java/com/davistiba/wedemyserver/config/SecurityConfig.java
+++ b/src/main/java/com/davistiba/wedemyserver/config/SecurityConfig.java
@@ -5,12 +5,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -22,7 +23,7 @@
 
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
+@EnableMethodSecurity(jsr250Enabled = true, securedEnabled = true)
 public class SecurityConfig {
 
     @Bean
@@ -53,22 +54,29 @@ public HttpSessionIdResolver sessionIdResolver() {
     @Bean
     @Order(1)
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-        http.cors().and().httpBasic(Customizer.withDefaults())
-                .oauth2Login().userInfoEndpoint().oidcUserService(googleOauthService)
-                .and().successHandler(successHandler)
-                .and().authorizeHttpRequests((authz) ->
-                        authz.antMatchers("/index.html", "/", "/auth/**", "/favicon.ico", "/login/**").permitAll()
-                                .antMatchers(HttpMethod.GET, "/courses/**", "/objectives/**", "/lessons/**", "/reviews/**").permitAll()
-                                .antMatchers("/profile/**", "/user/**").hasAuthority(UserRole.ROLE_STUDENT.name())
-                                .antMatchers(HttpMethod.GET, "/swagger-ui/**", "/swagger-ui.html", "/v3/api-docs/**").permitAll()
-                                .antMatchers("/admin/**").hasAuthority(UserRole.ROLE_ADMIN.name())
+        return http.cors(Customizer.withDefaults()).httpBasic(Customizer.withDefaults())
+                .oauth2Login(x -> x.userInfoEndpoint(config -> config.oidcUserService(googleOauthService)).successHandler(successHandler))
+                .csrf(c -> c.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()).ignoringRequestMatchers("/oauth2/**", "/auth/**"))
+                .sessionManagement(s -> s.maximumSessions(2))
+                .authorizeHttpRequests((authz) ->
+                        authz.requestMatchers("/index.html", "/", "/auth/**", "/favicon.ico", "/login/**").permitAll()
+                                .requestMatchers(HttpMethod.GET, "/courses/**", "/objectives/**", "/lessons/**", "/reviews/**").permitAll()
+                                .requestMatchers("/profile/**", "/user/**").hasAuthority(UserRole.ROLE_STUDENT.name())
+                                .requestMatchers(HttpMethod.GET, "/swagger-ui/**", "/swagger-ui.html", "/v3/api-docs/**").permitAll()
+                                .requestMatchers("/admin/**").hasAuthority(UserRole.ROLE_ADMIN.name())
                                 .anyRequest().authenticated())
-                .apply(new MyCustomFilterSetup(successHandler));
+                .with(new MyCustomFilterSetup(successHandler), x -> {
+                }).build();
+    }
 
-        //SESSION and CSRF (you may disable CSRF)
-        return http.csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-                .ignoringAntMatchers("/oauth2/**", "/auth/**")
-                .and().sessionManagement(s -> s.maximumSessions(2)).build();
+    @Bean
+    @Order(1)
+    @Profile(value = "debug")
+    public SecurityFilterChain securityFilterChainDebug(HttpSecurity http) throws Exception {
+        // Disable CSRF and Allow all paths
+        http.csrf(AbstractHttpConfigurer::disable)
+                .authorizeHttpRequests(c -> c.anyRequest().permitAll());
+        return http.build();
     }
 
     @Bean
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/AuthController.java b/src/main/java/com/davistiba/wedemyserver/controllers/AuthController.java
index 5831141..feffef5 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/AuthController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/AuthController.java
@@ -1,11 +1,12 @@
 package com.davistiba.wedemyserver.controllers;
 
+import com.davistiba.wedemyserver.config.MainUserDetails;
 import com.davistiba.wedemyserver.dto.LoginStatus;
 import com.davistiba.wedemyserver.dto.UserDTO;
-import com.davistiba.wedemyserver.models.CustomOAuthUser;
 import com.davistiba.wedemyserver.models.MyCustomResponse;
 import com.davistiba.wedemyserver.models.User;
 import com.davistiba.wedemyserver.repository.UserRepository;
+import jakarta.validation.Valid;
 import org.jetbrains.annotations.NotNull;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,13 +14,11 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.validation.Valid;
-
 @RestController
 @RequestMapping(path = "/auth", produces = MediaType.APPLICATION_JSON_VALUE)
 public class AuthController {
@@ -55,11 +54,10 @@ public ResponseEntity<MyCustomResponse> addNewUser(@RequestBody @Valid User user
     }
 
     @GetMapping("/status")
-    public ResponseEntity<LoginStatus> getStatusLogin(@AuthenticationPrincipal CustomOAuthUser customOAuthUser,
-                                                      @AuthenticationPrincipal User user) {
-        if (customOAuthUser != null) {
-            return convertToDto(customOAuthUser);
-        } else if (user != null) {
+    public ResponseEntity<LoginStatus> getStatusLogin(Authentication auth) {
+        if (auth != null) {
+            MainUserDetails userDetails = (MainUserDetails) auth.getPrincipal();
+            User user = userDetails.getUser();
             return convertToDto(user);
         } else {
             return ResponseEntity.ok().body(new LoginStatus());
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/CartController.java b/src/main/java/com/davistiba/wedemyserver/controllers/CartController.java
index b281394..1d720f5 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/CartController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/CartController.java
@@ -5,6 +5,8 @@
 import com.davistiba.wedemyserver.repository.CartRepository;
 import com.davistiba.wedemyserver.repository.CourseRepository;
 import com.davistiba.wedemyserver.service.MyUserDetailsService;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -12,11 +14,10 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.Map;
@@ -34,6 +35,7 @@ public class CartController {
 
     @PostMapping(path = "/course/{courseId}")
     @ResponseStatus(HttpStatus.CREATED)
+    @Transactional
     public ResponseEntity<MyCustomResponse> addSingleItem(HttpSession session, @PathVariable Integer courseId) {
         try {
             Integer userId = MyUserDetailsService.getSessionUserId(session);
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/CheckoutController.java b/src/main/java/com/davistiba/wedemyserver/controllers/CheckoutController.java
index 688de24..f6d8338 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/CheckoutController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/CheckoutController.java
@@ -8,6 +8,8 @@
 import com.davistiba.wedemyserver.repository.UserRepository;
 import com.davistiba.wedemyserver.service.CheckoutService;
 import com.davistiba.wedemyserver.service.MyUserDetailsService;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.http.HttpStatus;
@@ -17,8 +19,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/CourseController.java b/src/main/java/com/davistiba/wedemyserver/controllers/CourseController.java
index e03e509..5978fc0 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/CourseController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/CourseController.java
@@ -3,6 +3,8 @@
 import com.davistiba.wedemyserver.dto.CategoryDTO;
 import com.davistiba.wedemyserver.models.Course;
 import com.davistiba.wedemyserver.repository.CourseRepository;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
@@ -13,8 +15,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/EnrollmentController.java b/src/main/java/com/davistiba/wedemyserver/controllers/EnrollmentController.java
index b3637ca..a8e9060 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/EnrollmentController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/EnrollmentController.java
@@ -10,6 +10,9 @@
 import com.davistiba.wedemyserver.repository.LessonRepository;
 import com.davistiba.wedemyserver.service.EnrollProgressService;
 import com.davistiba.wedemyserver.service.MyUserDetailsService;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.data.domain.PageRequest;
@@ -21,9 +24,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.*;
 
 @RestController
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/LessonController.java b/src/main/java/com/davistiba/wedemyserver/controllers/LessonController.java
index c169560..49994bc 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/LessonController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/LessonController.java
@@ -2,6 +2,7 @@
 
 import com.davistiba.wedemyserver.models.Lesson;
 import com.davistiba.wedemyserver.repository.LessonRepository;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
@@ -10,7 +11,6 @@
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/ObjectivesController.java b/src/main/java/com/davistiba/wedemyserver/controllers/ObjectivesController.java
index 37809db..73ce131 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/ObjectivesController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/ObjectivesController.java
@@ -6,6 +6,7 @@
 import com.davistiba.wedemyserver.models.MyCustomResponse;
 import com.davistiba.wedemyserver.repository.CourseRepository;
 import com.davistiba.wedemyserver.repository.ObjectiveRepository;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -15,7 +16,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/ProfileController.java b/src/main/java/com/davistiba/wedemyserver/controllers/ProfileController.java
index 1975f63..73d3d74 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/ProfileController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/ProfileController.java
@@ -6,6 +6,8 @@
 import com.davistiba.wedemyserver.repository.UserRepository;
 import com.davistiba.wedemyserver.service.MyUserDetailsService;
 import com.davistiba.wedemyserver.service.ProfileService;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.constraints.NotNull;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -16,8 +18,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @RestController
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/ReviewController.java b/src/main/java/com/davistiba/wedemyserver/controllers/ReviewController.java
index 21122d1..9d41565 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/ReviewController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/ReviewController.java
@@ -7,6 +7,8 @@
 import com.davistiba.wedemyserver.repository.ReviewRepository;
 import com.davistiba.wedemyserver.service.MyUserDetailsService;
 import com.davistiba.wedemyserver.service.ReviewService;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -19,8 +21,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.Valid;
 import java.util.stream.Stream;
 
 @RestController
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/SalesController.java b/src/main/java/com/davistiba/wedemyserver/controllers/SalesController.java
index b23cc41..ac1accb 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/SalesController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/SalesController.java
@@ -5,6 +5,8 @@
 import com.davistiba.wedemyserver.repository.OrderItemRepository;
 import com.davistiba.wedemyserver.repository.SalesRepository;
 import com.davistiba.wedemyserver.service.MyUserDetailsService;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -13,9 +15,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.constraints.NotNull;
-
 @RestController
 @RequestMapping(path = "/sales", produces = MediaType.APPLICATION_JSON_VALUE)
 public class SalesController {
diff --git a/src/main/java/com/davistiba/wedemyserver/controllers/WishlistController.java b/src/main/java/com/davistiba/wedemyserver/controllers/WishlistController.java
index ebf5254..d3ee254 100644
--- a/src/main/java/com/davistiba/wedemyserver/controllers/WishlistController.java
+++ b/src/main/java/com/davistiba/wedemyserver/controllers/WishlistController.java
@@ -5,6 +5,8 @@
 import com.davistiba.wedemyserver.repository.CourseRepository;
 import com.davistiba.wedemyserver.repository.WishlistRepository;
 import com.davistiba.wedemyserver.service.MyUserDetailsService;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -15,8 +17,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.constraints.NotNull;
 import java.util.Collections;
 import java.util.Map;
 
diff --git a/src/main/java/com/davistiba/wedemyserver/dto/CheckoutRequest.java b/src/main/java/com/davistiba/wedemyserver/dto/CheckoutRequest.java
index a2126b8..9b730ae 100644
--- a/src/main/java/com/davistiba/wedemyserver/dto/CheckoutRequest.java
+++ b/src/main/java/com/davistiba/wedemyserver/dto/CheckoutRequest.java
@@ -1,12 +1,12 @@
 package com.davistiba.wedemyserver.dto;
 
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
diff --git a/src/main/java/com/davistiba/wedemyserver/dto/LoginRequest.java b/src/main/java/com/davistiba/wedemyserver/dto/LoginRequest.java
index f155b1b..c4a58e8 100644
--- a/src/main/java/com/davistiba/wedemyserver/dto/LoginRequest.java
+++ b/src/main/java/com/davistiba/wedemyserver/dto/LoginRequest.java
@@ -1,12 +1,11 @@
 package com.davistiba.wedemyserver.dto;
 
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-
 @Getter
 @NoArgsConstructor
 public class LoginRequest {
diff --git a/src/main/java/com/davistiba/wedemyserver/dto/ObjectivesDTO.java b/src/main/java/com/davistiba/wedemyserver/dto/ObjectivesDTO.java
index d1f2249..9ae7872 100644
--- a/src/main/java/com/davistiba/wedemyserver/dto/ObjectivesDTO.java
+++ b/src/main/java/com/davistiba/wedemyserver/dto/ObjectivesDTO.java
@@ -1,10 +1,10 @@
 package com.davistiba.wedemyserver.dto;
 
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 
 @Getter
diff --git a/src/main/java/com/davistiba/wedemyserver/dto/ReviewRequest.java b/src/main/java/com/davistiba/wedemyserver/dto/ReviewRequest.java
index 3df3b56..6169455 100644
--- a/src/main/java/com/davistiba/wedemyserver/dto/ReviewRequest.java
+++ b/src/main/java/com/davistiba/wedemyserver/dto/ReviewRequest.java
@@ -1,10 +1,9 @@
 package com.davistiba.wedemyserver.dto;
 
+import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.ToString;
 
-import javax.validation.constraints.*;
-
 /**
  * REVIEW body sent from frontend
  */
diff --git a/src/main/java/com/davistiba/wedemyserver/dto/VideoRequest.java b/src/main/java/com/davistiba/wedemyserver/dto/VideoRequest.java
index fa2274f..fabc153 100644
--- a/src/main/java/com/davistiba/wedemyserver/dto/VideoRequest.java
+++ b/src/main/java/com/davistiba/wedemyserver/dto/VideoRequest.java
@@ -1,10 +1,9 @@
 package com.davistiba.wedemyserver.dto;
 
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 @Getter
 public class VideoRequest {
     @NotNull
diff --git a/src/main/java/com/davistiba/wedemyserver/dto/VideoResponse.java b/src/main/java/com/davistiba/wedemyserver/dto/VideoResponse.java
index 5b3cb2e..ba1c3c2 100644
--- a/src/main/java/com/davistiba/wedemyserver/dto/VideoResponse.java
+++ b/src/main/java/com/davistiba/wedemyserver/dto/VideoResponse.java
@@ -1,10 +1,9 @@
 package com.davistiba.wedemyserver.dto;
 
 import com.davistiba.wedemyserver.models.Lesson;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
-
 @Getter
 public class VideoResponse {
     @NotNull
diff --git a/src/main/java/com/davistiba/wedemyserver/dto/WatchStatus.java b/src/main/java/com/davistiba/wedemyserver/dto/WatchStatus.java
index 64e3b8b..6d24a2b 100644
--- a/src/main/java/com/davistiba/wedemyserver/dto/WatchStatus.java
+++ b/src/main/java/com/davistiba/wedemyserver/dto/WatchStatus.java
@@ -1,9 +1,8 @@
 package com.davistiba.wedemyserver.dto;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * This is for updating watchStatus on currentLessonId, and requesting next lesson
  */
diff --git a/src/main/java/com/davistiba/wedemyserver/models/Cart.java b/src/main/java/com/davistiba/wedemyserver/models/Cart.java
index 5406a68..72a5252 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/Cart.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/Cart.java
@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -9,8 +11,6 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.Instant;
 
diff --git a/src/main/java/com/davistiba/wedemyserver/models/Course.java b/src/main/java/com/davistiba/wedemyserver/models/Course.java
index f1290f7..9e29d36 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/Course.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/Course.java
@@ -1,6 +1,11 @@
 package com.davistiba.wedemyserver.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -8,11 +13,7 @@
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.validator.constraints.URL;
 
-import javax.persistence.*;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Objects;
@@ -25,6 +26,7 @@
 @RequiredArgsConstructor
 public class Course implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -2540907171719494221L;
 
     @Id
diff --git a/src/main/java/com/davistiba/wedemyserver/models/CourseObjective.java b/src/main/java/com/davistiba/wedemyserver/models/CourseObjective.java
index 94fbe27..b512094 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/CourseObjective.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/CourseObjective.java
@@ -1,14 +1,14 @@
 package com.davistiba.wedemyserver.models;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import javax.persistence.*;
-import javax.validation.constraints.Size;
 import java.util.Objects;
 
 @Entity
diff --git a/src/main/java/com/davistiba/wedemyserver/models/CustomOAuthUser.java b/src/main/java/com/davistiba/wedemyserver/models/CustomOAuthUser.java
index 25ef9ba..309f44d 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/CustomOAuthUser.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/CustomOAuthUser.java
@@ -1,11 +1,17 @@
 package com.davistiba.wedemyserver.models;
 
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 
+import java.io.Serial;
 import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * [NOT A TABLE]
@@ -13,6 +19,7 @@
  */
 public class CustomOAuthUser extends User implements OidcUser, Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8362892628832016809L;
     private final OidcUser oidcUser;
 
@@ -41,8 +48,9 @@ public Map<String, Object> getAttributes() {
     }
 
     @Override
-    public String getUsername() {
-        return oidcUser.getAttribute("email");
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(super.getUserRole());
+        return Collections.singletonList(authority);
     }
 
     @Override
@@ -60,5 +68,17 @@ public String getEmail() {
         return oidcUser.getAttribute("email");
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        CustomOAuthUser that = (CustomOAuthUser) o;
+        return Objects.equals(oidcUser.getEmail(), that.oidcUser.getEmail());
+    }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), oidcUser);
+    }
 }
diff --git a/src/main/java/com/davistiba/wedemyserver/models/EnrollProgress.java b/src/main/java/com/davistiba/wedemyserver/models/EnrollProgress.java
index 09c36ea..1c965fc 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/EnrollProgress.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/EnrollProgress.java
@@ -1,6 +1,7 @@
 package com.davistiba.wedemyserver.models;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -8,7 +9,6 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import javax.persistence.*;
 import java.util.Objects;
 
 /**
diff --git a/src/main/java/com/davistiba/wedemyserver/models/Enrollment.java b/src/main/java/com/davistiba/wedemyserver/models/Enrollment.java
index 45685ef..0df903c 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/Enrollment.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/Enrollment.java
@@ -2,16 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.persistence.Table;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Max;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.*;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.*;
-import javax.validation.constraints.Max;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.Instant;
diff --git a/src/main/java/com/davistiba/wedemyserver/models/Lesson.java b/src/main/java/com/davistiba/wedemyserver/models/Lesson.java
index 10afdbc..3bdc731 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/Lesson.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/Lesson.java
@@ -1,6 +1,10 @@
 package com.davistiba.wedemyserver.models;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -9,10 +13,6 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import java.time.Duration;
 import java.util.Objects;
 import java.util.UUID;
diff --git a/src/main/java/com/davistiba/wedemyserver/models/OrderItem.java b/src/main/java/com/davistiba/wedemyserver/models/OrderItem.java
index cdc97d7..aeec01c 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/OrderItem.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/OrderItem.java
@@ -1,6 +1,7 @@
 package com.davistiba.wedemyserver.models;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -8,7 +9,6 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
diff --git a/src/main/java/com/davistiba/wedemyserver/models/Review.java b/src/main/java/com/davistiba/wedemyserver/models/Review.java
index 0c418d6..5f7cdb9 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/Review.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/Review.java
@@ -2,6 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -11,9 +14,6 @@
 import org.hibernate.annotations.OnDeleteAction;
 import org.hibernate.annotations.UpdateTimestamp;
 
-import javax.persistence.*;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Size;
 import java.time.Instant;
 import java.util.Objects;
 
diff --git a/src/main/java/com/davistiba/wedemyserver/models/Sales.java b/src/main/java/com/davistiba/wedemyserver/models/Sales.java
index 725a581..877155f 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/Sales.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/Sales.java
@@ -2,6 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.hibernate.Hibernate;
@@ -9,10 +13,6 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import javax.persistence.*;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.Objects;
diff --git a/src/main/java/com/davistiba/wedemyserver/models/User.java b/src/main/java/com/davistiba/wedemyserver/models/User.java
index 4cd924b..70416ed 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/User.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/User.java
@@ -3,23 +3,18 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty.Access;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.hibernate.Hibernate;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.CreationTimestamp;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import javax.persistence.*;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+
+import java.io.Serial;
+import java.io.Serializable;
 import java.time.Instant;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Objects;
 
 @Entity
@@ -27,8 +22,9 @@
 @Getter
 @Setter
 @RequiredArgsConstructor
-public class User implements UserDetails {
+public class User implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -1352733651057286866L;
 
     @Id
@@ -63,6 +59,10 @@ public class User implements UserDetails {
     @JsonIgnore
     private AuthProvider authProvider = AuthProvider.LOCAL;
 
+    @ColumnDefault(value = "TRUE")
+    @NotNull
+    private Boolean enabled;
+
     @Enumerated(EnumType.STRING)
     @Column(columnDefinition = "enum('ROLE_STUDENT', 'ROLE_ADMIN') DEFAULT 'ROLE_STUDENT'", nullable = false)
     @JsonIgnore
@@ -73,48 +73,6 @@ public class User implements UserDetails {
     @JsonProperty(access = Access.READ_ONLY)
     private Instant createdAt;
 
-    @Override
-    @JsonIgnore
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(this.getUserRole());
-        return Collections.singletonList(authority);
-    }
-
-    @Override
-    @JsonIgnore
-    public String getPassword() {
-        return password;
-    }
-
-    @Override
-    @JsonIgnore
-    public String getUsername() {
-        return email;
-    }
-
-    @Override
-    @JsonIgnore
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    @JsonIgnore
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    @JsonIgnore
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    @JsonIgnore
-    public boolean isEnabled() {
-        return true;
-    }
 
     public String getUserRole() {
         return String.valueOf(userRole);
diff --git a/src/main/java/com/davistiba/wedemyserver/models/Wishlist.java b/src/main/java/com/davistiba/wedemyserver/models/Wishlist.java
index 1ab48fe..fd642e8 100644
--- a/src/main/java/com/davistiba/wedemyserver/models/Wishlist.java
+++ b/src/main/java/com/davistiba/wedemyserver/models/Wishlist.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.hibernate.Hibernate;
@@ -9,7 +10,6 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import javax.persistence.*;
 import java.time.Instant;
 import java.util.Objects;
 
diff --git a/src/main/java/com/davistiba/wedemyserver/repository/CartRepository.java b/src/main/java/com/davistiba/wedemyserver/repository/CartRepository.java
index 5ebc199..24e2b5d 100644
--- a/src/main/java/com/davistiba/wedemyserver/repository/CartRepository.java
+++ b/src/main/java/com/davistiba/wedemyserver/repository/CartRepository.java
@@ -25,7 +25,7 @@ public interface CartRepository extends CrudRepository<Cart, Integer> {
 
     @Query(value = "SELECT EXISTS(SELECT 1 from cart c where c.user_id = ?1 and c.course_id = ?2)", nativeQuery = true)
     int checkIfCourseInCart(Integer userId, Integer courseId);
-    //FASTER, BUT UNFORTUNATELY IT RETURNS int (MySQL), NOT BOOLEAN.
+    //^FASTER, BUT UNFORTUNATELY IT RETURNS int (MySQL), NOT BOOLEAN.
 
     @Query(value = "SELECT COUNT(c) FROM Cart c WHERE c.user.id = ?1")
     long countCartByUserIdEquals(Integer userId);
diff --git a/src/main/java/com/davistiba/wedemyserver/repository/CourseRepository.java b/src/main/java/com/davistiba/wedemyserver/repository/CourseRepository.java
index 840e0d9..86e0f5b 100644
--- a/src/main/java/com/davistiba/wedemyserver/repository/CourseRepository.java
+++ b/src/main/java/com/davistiba/wedemyserver/repository/CourseRepository.java
@@ -2,6 +2,7 @@
 
 import com.davistiba.wedemyserver.dto.CategoryDTO;
 import com.davistiba.wedemyserver.models.Course;
+import jakarta.validation.constraints.NotBlank;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
@@ -10,7 +11,6 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import javax.validation.constraints.NotBlank;
 import java.util.Collection;
 import java.util.List;
 
diff --git a/src/main/java/com/davistiba/wedemyserver/repository/ReviewRepository.java b/src/main/java/com/davistiba/wedemyserver/repository/ReviewRepository.java
index 760727f..3f6c23f 100644
--- a/src/main/java/com/davistiba/wedemyserver/repository/ReviewRepository.java
+++ b/src/main/java/com/davistiba/wedemyserver/repository/ReviewRepository.java
@@ -5,13 +5,13 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
 @Repository
-public interface ReviewRepository extends PagingAndSortingRepository<Review, Integer> {
+public interface ReviewRepository extends CrudRepository<Review, Integer> {
 
     @Query("SELECT r FROM Review r WHERE r.user.id = ?1 AND r.course.id = ?2")
     Optional<Review> findByUserIdAndCourseId(Integer userId, Integer courseId);
diff --git a/src/main/java/com/davistiba/wedemyserver/service/CheckoutService.java b/src/main/java/com/davistiba/wedemyserver/service/CheckoutService.java
index cda5dfb..4570f18 100644
--- a/src/main/java/com/davistiba/wedemyserver/service/CheckoutService.java
+++ b/src/main/java/com/davistiba/wedemyserver/service/CheckoutService.java
@@ -46,15 +46,15 @@ public class CheckoutService {
     public MyCustomResponse processCheckoutDatabase(String transactionId,
                                                     @NotNull CheckoutRequest request,
                                                     User user) {
-
-        List<OrderItem> orderItemList = new ArrayList<>();
-        List<Enrollment> enrollments = new ArrayList<>();
         Page<Course> coursePage = courseRepository.getCartListByUser(user.getId(), Pageable.unpaged());
 
         //===== begin DB OPERATIONS ========
         Sales savedSale = salesRepository.save(
                 new Sales(transactionId, user, request.getTotalAmount(), request.getPaymentMethod()));
 
+        ArrayList<OrderItem> orderItemList = new ArrayList<>(coursePage.getTotalPages());
+        ArrayList<Enrollment> enrollments = new ArrayList<>(coursePage.getTotalPages());
+
         coursePage.get().forEach(course -> {
             OrderItem o = new OrderItem(savedSale, course);
             orderItemList.add(o);
@@ -63,7 +63,7 @@ public MyCustomResponse processCheckoutDatabase(String transactionId,
             enrollments.add(e);
         });
 
-        List<Integer> courseIds = coursePage.get().map(Course::getId).collect(Collectors.toUnmodifiableList());
+        List<Integer> courseIds = coursePage.get().map(Course::getId).toList();
 
         orderItemRepository.saveAll(orderItemList);
         enrollmentRepository.saveAll(enrollments);
diff --git a/src/main/java/com/davistiba/wedemyserver/service/CustomOAuthUserService.java b/src/main/java/com/davistiba/wedemyserver/service/CustomOAuthUserService.java
index 929e950..dac59db 100644
--- a/src/main/java/com/davistiba/wedemyserver/service/CustomOAuthUserService.java
+++ b/src/main/java/com/davistiba/wedemyserver/service/CustomOAuthUserService.java
@@ -9,6 +9,7 @@
 
 @Service
 public class CustomOAuthUserService extends OidcUserService {
+
     @Override
     public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
         OidcUser oidcUser = super.loadUser(userRequest);
diff --git a/src/main/java/com/davistiba/wedemyserver/service/EnrollProgressService.java b/src/main/java/com/davistiba/wedemyserver/service/EnrollProgressService.java
index d1e97b0..69b411f 100644
--- a/src/main/java/com/davistiba/wedemyserver/service/EnrollProgressService.java
+++ b/src/main/java/com/davistiba/wedemyserver/service/EnrollProgressService.java
@@ -7,11 +7,11 @@
 import com.davistiba.wedemyserver.repository.EnrollProgressRepository;
 import com.davistiba.wedemyserver.repository.EnrollmentRepository;
 import com.davistiba.wedemyserver.repository.LessonRepository;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Optional;
diff --git a/src/main/java/com/davistiba/wedemyserver/service/MyUserDetailsService.java b/src/main/java/com/davistiba/wedemyserver/service/MyUserDetailsService.java
index 7895cd9..fcb6af0 100644
--- a/src/main/java/com/davistiba/wedemyserver/service/MyUserDetailsService.java
+++ b/src/main/java/com/davistiba/wedemyserver/service/MyUserDetailsService.java
@@ -1,10 +1,13 @@
 package com.davistiba.wedemyserver.service;
 
+import com.davistiba.wedemyserver.config.MainUserDetails;
 import com.davistiba.wedemyserver.models.AuthProvider;
 import com.davistiba.wedemyserver.models.CustomOAuthUser;
 import com.davistiba.wedemyserver.models.User;
 import com.davistiba.wedemyserver.models.UserRole;
 import com.davistiba.wedemyserver.repository.UserRepository;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -12,8 +15,6 @@
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.constraints.NotNull;
 import java.util.Optional;
 
 
@@ -27,8 +28,9 @@ public class MyUserDetailsService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        return userRepository.findByEmail(username)
+        var user = userRepository.findByEmail(username)
                 .orElseThrow(() -> new UsernameNotFoundException("Not found"));
+        return new MainUserDetails(user);
     }
 
     /**
@@ -47,6 +49,7 @@ public void processOAuthPostLogin(OidcUser oidcUser, HttpSession session) {
             newUser.setFullname(m.getName());
             newUser.setEmail(m.getEmail());
             newUser.setConfirmPass("WHATEVER!"); //<-- anything, but not NULL
+            newUser.setEnabled(true);
             newUser.setAuthProvider(AuthProvider.GOOGLE);
             newUser.setUserRole(UserRole.ROLE_STUDENT);
 
diff --git a/src/main/java/com/davistiba/wedemyserver/service/ProfileService.java b/src/main/java/com/davistiba/wedemyserver/service/ProfileService.java
index 1c8d84d..58df2a6 100644
--- a/src/main/java/com/davistiba/wedemyserver/service/ProfileService.java
+++ b/src/main/java/com/davistiba/wedemyserver/service/ProfileService.java
@@ -4,10 +4,10 @@
 import com.davistiba.wedemyserver.models.SummaryTitle;
 import com.davistiba.wedemyserver.models.User;
 import com.davistiba.wedemyserver.repository.EnrollmentRepository;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotNull;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -23,7 +23,7 @@ public class ProfileService {
      * Custom service to return a Student's summary
      */
     public List<StudentSummary> getUserSummaryList(@NotNull User user) {
-        List<StudentSummary> summaryList = new ArrayList<>(3);
+        ArrayList<StudentSummary> summaryList = new ArrayList<>(3);
         long owned = enrollmentRepository.countEnrollmentByUser(user);
         StudentSummary s1 = new StudentSummary(SummaryTitle.OWNING, owned, "courses");
         summaryList.add(s1);
diff --git a/src/main/java/com/davistiba/wedemyserver/service/ReviewService.java b/src/main/java/com/davistiba/wedemyserver/service/ReviewService.java
index 07f3314..3f8d8de 100644
--- a/src/main/java/com/davistiba/wedemyserver/service/ReviewService.java
+++ b/src/main/java/com/davistiba/wedemyserver/service/ReviewService.java
@@ -28,7 +28,7 @@ public class ReviewService {
 
     /**
      * Insert new review.
-     * Then, calculate and update AVG rating for course.
+     * Then, re-calculate and update AVG rating for course.
      * All in single DB transaction
      *
      * @param request from frontend
@@ -48,7 +48,7 @@ public void addCourseRating(ReviewRequest request, Integer userId) {
     }
 
     /**
-     * EDIT existing review, and modify AVG course rating
+     * UPDATE existing review, and modify AVG course rating
      */
     @Transactional
     public void updateCourseRating(Integer reviewId, ReviewRequest request) {
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index b5b03a3..3f47d51 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -25,29 +25,27 @@ server:
       charset: UTF-8
       force: true
 spring:
+  application:
+    name: wedemy-server
   datasource:
     password: ${MYSQL_PASSWORD}
     url: ${MYSQL_HOST}
     username: ${MYSQL_USERNAME}
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: update  #You may change to `NONE`
     properties:
       hibernate:
         order_inserts: true
         order_updates: true
-        dialect: org.hibernate.dialect.MySQL8Dialect
+        dialect: org.hibernate.dialect.MySQLDialect
         jdbc:
           batch-size: 20
   cache:
     type: redis
     redis:
       time-to-live: PT60M #60 minutes
-  redis:
-    host: ${REDIS_HOST}
-    password: ${REDIS_PASSWORD}
-    port: ${REDIS_PORT}
-    # url: ${REDIS_URL} #Optional. Full URi. Will override [host, password, port] above
+
   security:
     oauth2:
       client:
@@ -56,12 +54,19 @@ spring:
             client-id: ${GOOGLE_CLIENT_ID}
             client-secret: ${GOOGLE_CLIENT_SECRET}
   session:
-    store-type: redis
     redis:
       cleanup-cron: 0 0 23 * * *
+      repository-type: indexed
   jackson:
     date-format: "yyyy-MM-dd HH:mm:ss"
-## ENABLE SWAGGER-UI (disable in PROD)
+  data:
+    redis:
+      host: ${REDIS_HOST}
+      password: ${REDIS_PASSWORD}
+      port: ${REDIS_PORT}
+      # url: ${REDIS_URL} # Optional. Full Uri. Will override [host, password, port] above
+
+## DISABLE SWAGGER-UI in PROD
 #springdoc:
 #  swagger-ui:
-#    enabled: false
\ No newline at end of file
+#    enabled: false
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6712c37..b90a6f5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -18,32 +18,32 @@ server:
         http-only: true
         max-age: 10800s #3hours
         name: WD_SESSION
+        same-site: lax
     encoding:
       charset: UTF-8
       force: true
 spring:
+  application:
+    name: wedemy-server
   datasource:
     password: ${MYSQL_PASSWORD}
-    url: jdbc:mysql://localhost:3306/wedemy?connectionTimeZone=UTC&useSSL=false
+    url: jdbc:mysql://localhost:3306/wedemy?connectionTimeZone=UTC&rewriteBatchedStatements=true
     username: root
   jpa:
     hibernate:
-      ddl-auto: update #You may chnage to `NONE` in production
+      ddl-auto: update
     properties:
       hibernate:
         order_inserts: true
         order_updates: true
-        dialect: org.hibernate.dialect.MySQL8Dialect
+        dialect: org.hibernate.dialect.MySQLDialect
         jdbc:
           batch-size: 20
   cache:
     type: redis
     redis:
       time-to-live: PT30M #30minutes
-  redis:
-    host: localhost
-    port: 6379
-    password: ""
+
   security:
     oauth2:
       client:
@@ -52,10 +52,16 @@ spring:
             client-id: ${GOOGLE_CLIENT_ID}
             client-secret: ${GOOGLE_CLIENT_SECRET}
   session:
-    store-type: redis
     redis:
       cleanup-cron: 0 0 * * * *
+      repository-type: indexed
   jackson:
     date-format: "yyyy-MM-dd HH:mm:ss"
+  data:
+    redis:
+      host: localhost
+      port: 6379
+      password: ""
+      # url: ${REDIS_URL} # Optional. Full Uri. Will override [host, password, port] above
 #springdoc:
 #  show-login-endpoint: true
\ No newline at end of file
diff --git a/system.properties b/system.properties
index 9d7596b..4ab28e3 100644
--- a/system.properties
+++ b/system.properties
@@ -1,2 +1,2 @@
 # Required for Heroku
-java.runtime.version=11
\ No newline at end of file
+java.runtime.version=17
\ No newline at end of file