Skip to content

Commit

Permalink
refactor: moved user folder
Browse files Browse the repository at this point in the history
  • Loading branch information
Toto-hitori committed Feb 6, 2024
1 parent c9091c3 commit 6b18c5c
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 17 deletions.
4 changes: 2 additions & 2 deletions api/src/main/java/lab/en2b/quizapi/auth/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import lab.en2b.quizapi.auth.jwt.JwtUtils;
import lab.en2b.quizapi.commons.exceptions.TokenRefreshException;
import lab.en2b.quizapi.auth.dtos.RefreshTokenResponseDto;
import lab.en2b.quizapi.user.User;
import lab.en2b.quizapi.user.UserService;
import lab.en2b.quizapi.commons.user.User;
import lab.en2b.quizapi.commons.user.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lab.en2b.quizapi.auth.config;

import lab.en2b.quizapi.user.UserService;
import lab.en2b.quizapi.commons.user.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package lab.en2b.quizapi.auth.config;

import com.fasterxml.jackson.annotation.JsonIgnore;
import lab.en2b.quizapi.user.User;
import lab.en2b.quizapi.user.role.Role;
import lab.en2b.quizapi.commons.user.User;
import lab.en2b.quizapi.commons.user.role.Role;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.security.core.GrantedAuthority;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lab.en2b.quizapi.user.UserService;
import lab.en2b.quizapi.commons.user.UserService;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lab.en2b.quizapi.user;
package lab.en2b.quizapi.commons.user;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand All @@ -8,7 +8,7 @@
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lab.en2b.quizapi.commons.exceptions.TokenRefreshException;
import lab.en2b.quizapi.user.role.Role;
import lab.en2b.quizapi.commons.user.role.Role;
import lombok.*;

import java.time.Instant;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lab.en2b.quizapi.user;
package lab.en2b.quizapi.commons.user;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package lab.en2b.quizapi.user;
package lab.en2b.quizapi.commons.user;

import lab.en2b.quizapi.auth.config.UserDetailsImpl;
import lab.en2b.quizapi.auth.dtos.RegisterDto;
import lab.en2b.quizapi.user.role.RoleRepository;
import lab.en2b.quizapi.commons.user.role.RoleRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.userdetails.UserDetails;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package lab.en2b.quizapi.user.role;
package lab.en2b.quizapi.commons.user.role;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
import jakarta.persistence.*;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lab.en2b.quizapi.user.User;
import lab.en2b.quizapi.commons.user.User;
import lombok.*;

import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package lab.en2b.quizapi.user.role;
package lab.en2b.quizapi.commons.user.role;


import lab.en2b.quizapi.user.role.Role;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

Expand Down

0 comments on commit 6b18c5c

Please sign in to comment.