Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package commonly.commonlybe.domain.admin.presentation;
package commonly.commonlybe.admin.controller;

import commonly.commonlybe.domain.admin.presentation.dto.request.ChangeInitialPasswordRequest;
import commonly.commonlybe.domain.admin.presentation.dto.request.CreateUserRequest;
import commonly.commonlybe.domain.admin.presentation.dto.response.UserListResponse;
import commonly.commonlybe.domain.admin.service.ChangeInitialPasswordService;
import commonly.commonlybe.domain.admin.service.CreateUserService;
import commonly.commonlybe.domain.admin.service.DeleteUserService;
import commonly.commonlybe.domain.admin.service.QueryUserListService;
import commonly.commonlybe.admin.controller.dto.ChangeInitialPasswordRequest;
import commonly.commonlybe.admin.controller.dto.CreateUserRequest;
import commonly.commonlybe.admin.controller.dto.UserListResponse;
import commonly.commonlybe.admin.service.ChangeInitialPasswordService;
import commonly.commonlybe.admin.service.CreateUserService;
import commonly.commonlybe.admin.service.DeleteUserService;
import commonly.commonlybe.admin.service.QueryUserListService;
import commonly.commonlybe.global.security.auth.AuthDetails;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Min;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.admin.presentation.dto.request;
package commonly.commonlybe.admin.controller.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.admin.presentation.dto.request;
package commonly.commonlybe.admin.controller.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.admin.presentation.dto.response;
package commonly.commonlybe.admin.controller.dto;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commonly.commonlybe.domain.admin.domain;
package commonly.commonlybe.admin.entity;

import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.user.entity.User;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/commonly/commonlybe/admin/entity/AdminRole.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package commonly.commonlybe.admin.entity;

public enum AdminRole {
ADMIN,
USER
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package commonly.commonlybe.domain.admin.domain.repository;
package commonly.commonlybe.admin.repository;

import commonly.commonlybe.domain.admin.domain.Admin;
import commonly.commonlybe.domain.admin.domain.AdminRole;
import commonly.commonlybe.admin.entity.Admin;
import commonly.commonlybe.admin.entity.AdminRole;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.EntityGraph;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package commonly.commonlybe.domain.admin.service;
package commonly.commonlybe.admin.service;

import commonly.commonlybe.domain.admin.presentation.dto.request.ChangeInitialPasswordRequest;
import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.domain.user.domain.repository.UserRepository;
import commonly.commonlybe.domain.user.exception.UserNotFoundException;
import commonly.commonlybe.admin.controller.dto.ChangeInitialPasswordRequest;
import commonly.commonlybe.user.entity.User;
import commonly.commonlybe.user.repository.UserRepository;
import commonly.commonlybe.user.exception.UserNotFoundException;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package commonly.commonlybe.domain.admin.service;
package commonly.commonlybe.admin.service;

import commonly.commonlybe.domain.admin.domain.Admin;
import commonly.commonlybe.domain.admin.domain.AdminRole;
import commonly.commonlybe.domain.admin.domain.repository.AdminRepository;
import commonly.commonlybe.domain.admin.presentation.dto.request.CreateUserRequest;
import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.domain.user.domain.repository.UserRepository;
import commonly.commonlybe.domain.user.exception.UserAlreadyExistsException;
import commonly.commonlybe.admin.entity.Admin;
import commonly.commonlybe.admin.entity.AdminRole;
import commonly.commonlybe.admin.repository.AdminRepository;
import commonly.commonlybe.admin.controller.dto.CreateUserRequest;
import commonly.commonlybe.user.entity.User;
import commonly.commonlybe.user.repository.UserRepository;
import commonly.commonlybe.user.exception.UserAlreadyExistsException;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package commonly.commonlybe.domain.admin.service;
package commonly.commonlybe.admin.service;

import commonly.commonlybe.domain.admin.domain.Admin;
import commonly.commonlybe.domain.admin.domain.repository.AdminRepository;
import commonly.commonlybe.domain.user.domain.repository.UserRepository;
import commonly.commonlybe.domain.user.exception.UserNotFoundException;
import commonly.commonlybe.admin.entity.Admin;
import commonly.commonlybe.admin.repository.AdminRepository;
import commonly.commonlybe.user.repository.UserRepository;
import commonly.commonlybe.user.exception.UserNotFoundException;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package commonly.commonlybe.domain.admin.service;
package commonly.commonlybe.admin.service;

import commonly.commonlybe.domain.admin.domain.AdminRole;
import commonly.commonlybe.domain.admin.domain.repository.AdminRepository;
import commonly.commonlybe.domain.admin.presentation.dto.response.UserListResponse;
import commonly.commonlybe.admin.entity.AdminRole;
import commonly.commonlybe.admin.repository.AdminRepository;
import commonly.commonlybe.admin.controller.dto.UserListResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package commonly.commonlybe.domain.auth.presentation;
package commonly.commonlybe.auth.controller;

import commonly.commonlybe.domain.auth.presentation.dto.request.ChangePasswordRequest;
import commonly.commonlybe.domain.auth.presentation.dto.request.LoginRequest;
import commonly.commonlybe.domain.auth.presentation.dto.request.SignupRequest;
import commonly.commonlybe.domain.auth.presentation.dto.request.UpdateAccountRequest;
import commonly.commonlybe.domain.auth.presentation.dto.response.TokenResponse;
import commonly.commonlybe.domain.auth.service.ChangePasswordService;
import commonly.commonlybe.domain.auth.service.LoginService;
import commonly.commonlybe.domain.auth.service.SignupService;
import commonly.commonlybe.domain.auth.service.UpdateAccountService;
import commonly.commonlybe.auth.controller.dto.ChangePasswordRequest;
import commonly.commonlybe.auth.controller.dto.LoginRequest;
import commonly.commonlybe.auth.controller.dto.SignupRequest;
import commonly.commonlybe.auth.controller.dto.UpdateAccountRequest;
import commonly.commonlybe.auth.controller.dto.TokenResponse;
import commonly.commonlybe.auth.service.ChangePasswordService;
import commonly.commonlybe.auth.service.LoginService;
import commonly.commonlybe.auth.service.SignupService;
import commonly.commonlybe.auth.service.UpdateAccountService;
import commonly.commonlybe.global.security.auth.AuthDetails;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.auth.presentation.dto.request;
package commonly.commonlybe.auth.controller.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.auth.presentation.dto.request;
package commonly.commonlybe.auth.controller.dto;

import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.auth.presentation.dto.request;
package commonly.commonlybe.auth.controller.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.auth.presentation.dto.response;
package commonly.commonlybe.auth.controller.dto;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.auth.presentation.dto.request;
package commonly.commonlybe.auth.controller.dto;

import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package commonly.commonlybe.domain.auth.service;
package commonly.commonlybe.auth.service;

import commonly.commonlybe.domain.auth.presentation.dto.request.ChangePasswordRequest;
import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.domain.user.domain.repository.UserRepository;
import commonly.commonlybe.domain.user.exception.ForbiddenUserException;
import commonly.commonlybe.domain.user.exception.PasswordMismatchException;
import commonly.commonlybe.domain.user.exception.UserNotFoundException;
import commonly.commonlybe.auth.controller.dto.ChangePasswordRequest;
import commonly.commonlybe.user.entity.User;
import commonly.commonlybe.user.repository.UserRepository;
import commonly.commonlybe.user.exception.ForbiddenUserException;
import commonly.commonlybe.user.exception.PasswordMismatchException;
import commonly.commonlybe.user.exception.UserNotFoundException;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package commonly.commonlybe.domain.auth.service;
package commonly.commonlybe.auth.service;

import commonly.commonlybe.domain.auth.presentation.dto.request.LoginRequest;
import commonly.commonlybe.domain.auth.presentation.dto.response.TokenResponse;
import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.domain.user.domain.repository.UserRepository;
import commonly.commonlybe.domain.user.exception.PasswordMismatchException;
import commonly.commonlybe.auth.controller.dto.LoginRequest;
import commonly.commonlybe.auth.controller.dto.TokenResponse;
import commonly.commonlybe.user.entity.User;
import commonly.commonlybe.user.repository.UserRepository;
import commonly.commonlybe.user.exception.PasswordMismatchException;
import commonly.commonlybe.global.jwt.JwtGenerator;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package commonly.commonlybe.domain.auth.service;
package commonly.commonlybe.auth.service;

import commonly.commonlybe.domain.auth.presentation.dto.request.SignupRequest;
import commonly.commonlybe.domain.auth.presentation.dto.response.TokenResponse;
import commonly.commonlybe.domain.petitioner.domain.Petitioner;
import commonly.commonlybe.domain.petitioner.domain.repository.PetitionerRepository;
import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.domain.user.domain.repository.UserRepository;
import commonly.commonlybe.domain.user.exception.UserAlreadyExistsException;
import commonly.commonlybe.auth.controller.dto.SignupRequest;
import commonly.commonlybe.auth.controller.dto.TokenResponse;
import commonly.commonlybe.petitioner.entity.Petitioner;
import commonly.commonlybe.petitioner.repository.PetitionerRepository;
import commonly.commonlybe.user.entity.User;
import commonly.commonlybe.user.repository.UserRepository;
import commonly.commonlybe.user.exception.UserAlreadyExistsException;
import commonly.commonlybe.global.jwt.JwtGenerator;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package commonly.commonlybe.domain.auth.service;
package commonly.commonlybe.auth.service;

import commonly.commonlybe.domain.auth.presentation.dto.request.UpdateAccountRequest;
import commonly.commonlybe.domain.petitioner.domain.repository.PetitionerRepository;
import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.domain.user.domain.repository.UserRepository;
import commonly.commonlybe.domain.user.exception.ForbiddenUserException;
import commonly.commonlybe.domain.user.exception.UserNotFoundException;
import commonly.commonlybe.auth.controller.dto.UpdateAccountRequest;
import commonly.commonlybe.petitioner.repository.PetitionerRepository;
import commonly.commonlybe.user.entity.User;
import commonly.commonlybe.user.repository.UserRepository;
import commonly.commonlybe.user.exception.ForbiddenUserException;
import commonly.commonlybe.user.exception.UserNotFoundException;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import commonly.commonlybe.certificate.exception.CertificateErrorCode;
import commonly.commonlybe.certificate.exception.CertificateException;
import commonly.commonlybe.domain.petitioner.domain.Petitioner;
import commonly.commonlybe.domain.petitioner.domain.repository.PetitionerRepository;
import commonly.commonlybe.petitioner.entity.Petitioner;
import commonly.commonlybe.petitioner.repository.PetitionerRepository;
import commonly.commonlybe.global.security.auth.AuthDetails;
import commonly.commonlybe.human.entity.HumanEntity;
import commonly.commonlybe.human.repository.HumanRepository;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commonly.commonlybe.global.jwt;

import commonly.commonlybe.domain.user.exception.UserNotFoundException;
import commonly.commonlybe.user.exception.UserNotFoundException;
import commonly.commonlybe.global.jwt.exception.ExpiredTokenException;
import commonly.commonlybe.global.jwt.exception.InvalidTokenException;
import commonly.commonlybe.global.security.auth.AuthDetailsService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commonly.commonlybe.global.security.auth;

import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.user.entity.User;
import org.jspecify.annotations.Nullable;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package commonly.commonlybe.global.security.auth;

import commonly.commonlybe.domain.admin.domain.Admin;
import commonly.commonlybe.domain.admin.domain.repository.AdminRepository;
import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.domain.user.domain.repository.UserRepository;
import commonly.commonlybe.domain.user.exception.UserNotFoundException;
import commonly.commonlybe.admin.entity.Admin;
import commonly.commonlybe.admin.repository.AdminRepository;
import commonly.commonlybe.user.entity.User;
import commonly.commonlybe.user.repository.UserRepository;
import commonly.commonlybe.user.exception.UserNotFoundException;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commonly.commonlybe.domain.petitioner.domain;
package commonly.commonlybe.petitioner.entity;

import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.user.entity.User;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commonly.commonlybe.domain.petitioner.domain.repository;
package commonly.commonlybe.petitioner.repository;

import commonly.commonlybe.domain.petitioner.domain.Petitioner;
import commonly.commonlybe.petitioner.entity.Petitioner;
import org.springframework.data.jpa.repository.JpaRepository;

public interface PetitionerRepository extends JpaRepository<Petitioner, Long> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.user.domain;
package commonly.commonlybe.user.entity;

import jakarta.persistence.*;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.user.exception;
package commonly.commonlybe.user.exception;

import commonly.commonlybe.global.error.exception.CommonlyException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.user.exception;
package commonly.commonlybe.user.exception;

import commonly.commonlybe.global.error.exception.CommonlyException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.user.exception;
package commonly.commonlybe.user.exception;

import commonly.commonlybe.global.error.exception.CommonlyException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.user.exception;
package commonly.commonlybe.user.exception;

import commonly.commonlybe.global.error.error_code.ErrorProperty;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package commonly.commonlybe.domain.user.exception;
package commonly.commonlybe.user.exception;

import commonly.commonlybe.global.error.exception.CommonlyException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commonly.commonlybe.domain.user.domain.repository;
package commonly.commonlybe.user.repository;

import commonly.commonlybe.domain.user.domain.User;
import commonly.commonlybe.user.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.Optional;
Expand Down
7 changes: 0 additions & 7 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ jwt:
prefix: ${JWT_PREFIX:Bearer}
access-exp: ${JWT_ACCESS_EXP:3600}

garage:
endpoint: ${GARAGE_ENDPOINT:http://garage:3900}
region: ${GARAGE_REGION:garage}
bucket: ${GARAGE_BUCKET:commonly}
access-key: ${GARAGE_ACCESS_KEY:}
secret-key: ${GARAGE_SECRET_KEY:}

app:
s3:
bucket: ${S3_BUCKET:commonly-files}
Expand Down
Loading