Skip to content

Commit

Permalink
Merge pull request #74 from Team-KeepGoing/refactor
Browse files Browse the repository at this point in the history
Refactor :: refactor package structure
  • Loading branch information
miraexhoi authored Jul 15, 2024
2 parents 81d2027 + 7beef02 commit d33a9ff
Show file tree
Hide file tree
Showing 35 changed files with 77 additions and 78 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.keepgoing.keepserver.domain.book.entity;
package com.keepgoing.keepserver.domain.book.domain.entity;


import com.keepgoing.keepserver.domain.book.entity.enums.BookState;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import jakarta.persistence.*;
import lombok.*;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.keepgoing.keepserver.domain.book.entity.enums;
package com.keepgoing.keepserver.domain.book.domain.entity.enums;

public enum BookState {
AVAILABLE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.keepgoing.keepserver.domain.book.repository;
package com.keepgoing.keepserver.domain.book.domain.repository;

import com.keepgoing.keepserver.domain.book.entity.Book;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.book.domain.entity.Book;
import com.keepgoing.keepserver.domain.user.domain.entity.user.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,7 +1,7 @@
package com.keepgoing.keepserver.domain.book.mapper;

import com.keepgoing.keepserver.domain.book.entity.Book;
import com.keepgoing.keepserver.domain.book.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.domain.entity.Book;
import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.payload.request.BookDto;
import com.keepgoing.keepserver.domain.book.payload.response.BookResponseDto;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.keepgoing.keepserver.domain.book.payload.request;

import com.keepgoing.keepserver.domain.book.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
import lombok.Builder;

import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.keepgoing.keepserver.domain.book.payload.request;

import com.keepgoing.keepserver.domain.book.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
import lombok.Builder;
import lombok.Getter;

@Builder
public record BookRequestDto (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.keepgoing.keepserver.domain.book.payload.response;

import com.keepgoing.keepserver.domain.book.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
import lombok.Builder;

import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.keepgoing.keepserver.domain.book.service;

import com.keepgoing.keepserver.domain.book.entity.Book;
import com.keepgoing.keepserver.domain.book.domain.entity.Book;
import com.keepgoing.keepserver.domain.book.payload.request.BookDto;
import com.keepgoing.keepserver.domain.book.payload.request.BookRequestDto;
import com.keepgoing.keepserver.domain.book.mapper.BookMapper;
import com.keepgoing.keepserver.domain.book.repository.BookRepository;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.repository.user.UserRepository;
import com.keepgoing.keepserver.domain.book.domain.repository.BookRepository;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.repository.user.UserRepository;
import com.keepgoing.keepserver.global.common.BaseResponse;
import com.keepgoing.keepserver.global.exception.book.BookException;
import com.keepgoing.keepserver.global.util.GenerateCertCharacter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package com.keepgoing.keepserver.domain.device.entity;
package com.keepgoing.keepserver.domain.device.domain.entity;

import com.keepgoing.keepserver.domain.device.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import jakarta.persistence.*;
import lombok.*;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.time.LocalDateTime;

import static com.keepgoing.keepserver.domain.device.entity.enums.DeviceStatus.AVAILABLE;

@Entity
@Setter
@Getter
Expand Down Expand Up @@ -39,7 +37,7 @@ public class Device {
*/
@Enumerated(EnumType.STRING)
@Column(nullable = false)
private DeviceStatus status = AVAILABLE;
private DeviceStatus status = DeviceStatus.AVAILABLE;

/*
기기 등록일
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.keepgoing.keepserver.domain.device.entity.enums;
package com.keepgoing.keepserver.domain.device.domain.entity.enums;

public enum DeviceStatus {
AVAILABLE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.keepgoing.keepserver.domain.device.repository;
package com.keepgoing.keepserver.domain.device.domain.repository;

import com.keepgoing.keepserver.domain.device.entity.Device;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.device.domain.entity.Device;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.keepgoing.keepserver.domain.device.mapper;

import com.keepgoing.keepserver.domain.device.entity.Device;
import com.keepgoing.keepserver.domain.device.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.device.domain.entity.Device;
import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.device.payload.response.DeviceResponseDto;
import com.keepgoing.keepserver.domain.device.payload.request.DeviceDto;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.keepgoing.keepserver.domain.device.payload.request;

import com.keepgoing.keepserver.domain.device.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.keepgoing.keepserver.domain.device.payload.request;

import com.keepgoing.keepserver.domain.device.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;

public record DeviceEditRequest (
String deviceName,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.keepgoing.keepserver.domain.device.payload.response;

import com.keepgoing.keepserver.domain.device.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
import lombok.Builder;

import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.keepgoing.keepserver.domain.device.service;

import com.keepgoing.keepserver.domain.device.entity.Device;
import com.keepgoing.keepserver.domain.device.domain.entity.Device;
import com.keepgoing.keepserver.domain.device.mapper.DeviceMapper;
import com.keepgoing.keepserver.domain.device.payload.request.DeviceDto;
import com.keepgoing.keepserver.domain.device.payload.request.DeviceEditRequest;
import com.keepgoing.keepserver.domain.device.payload.response.DeviceResponseDto;
import com.keepgoing.keepserver.domain.device.repository.DeviceRepository;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.repository.user.UserRepository;
import com.keepgoing.keepserver.domain.device.domain.repository.DeviceRepository;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.repository.user.UserRepository;
import com.keepgoing.keepserver.global.common.BaseResponse;
import com.keepgoing.keepserver.global.exception.device.DeviceError;
import com.keepgoing.keepserver.global.exception.device.DeviceException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.keepgoing.keepserver.domain.rent.service;

import com.keepgoing.keepserver.domain.book.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.entity.Book;
import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.domain.entity.Book;
import com.keepgoing.keepserver.domain.book.mapper.BookMapper;
import com.keepgoing.keepserver.domain.book.repository.BookRepository;
import com.keepgoing.keepserver.domain.device.entity.Device;
import com.keepgoing.keepserver.domain.device.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.book.domain.repository.BookRepository;
import com.keepgoing.keepserver.domain.device.domain.entity.Device;
import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.device.mapper.DeviceMapper;
import com.keepgoing.keepserver.domain.device.repository.DeviceRepository;
import com.keepgoing.keepserver.domain.device.domain.repository.DeviceRepository;
import com.keepgoing.keepserver.domain.device.service.DeviceServiceImpl;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import com.keepgoing.keepserver.global.common.BaseResponse;
import com.keepgoing.keepserver.global.exception.book.BookError;
import com.keepgoing.keepserver.global.exception.book.BookException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.keepgoing.keepserver.domain.returns.service;

import com.keepgoing.keepserver.domain.book.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.entity.Book;
import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
import com.keepgoing.keepserver.domain.book.domain.entity.Book;
import com.keepgoing.keepserver.domain.book.mapper.BookMapper;
import com.keepgoing.keepserver.domain.book.repository.BookRepository;
import com.keepgoing.keepserver.domain.device.entity.Device;
import com.keepgoing.keepserver.domain.device.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.book.domain.repository.BookRepository;
import com.keepgoing.keepserver.domain.device.domain.entity.Device;
import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
import com.keepgoing.keepserver.domain.device.mapper.DeviceMapper;
import com.keepgoing.keepserver.domain.device.repository.DeviceRepository;
import com.keepgoing.keepserver.domain.device.domain.repository.DeviceRepository;
import com.keepgoing.keepserver.domain.device.service.DeviceServiceImpl;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import com.keepgoing.keepserver.global.common.BaseResponse;
import com.keepgoing.keepserver.global.exception.book.BookError;
import com.keepgoing.keepserver.global.exception.book.BookException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.keepgoing.keepserver.domain.student.controller;

import com.keepgoing.keepserver.domain.student.repository.dto.StudentFindDto;
import com.keepgoing.keepserver.domain.student.repository.dto.StudentRequestDto;
import com.keepgoing.keepserver.domain.student.domain.repository.dto.StudentFindDto;
import com.keepgoing.keepserver.domain.student.domain.repository.dto.StudentRequestDto;
import com.keepgoing.keepserver.domain.student.service.StudentService;
import com.keepgoing.keepserver.global.common.BaseResponse;
import io.swagger.v3.oas.annotations.Operation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.keepgoing.keepserver.domain.student.entity;
package com.keepgoing.keepserver.domain.student.domain.entity;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.keepgoing.keepserver.domain.student.repository;
package com.keepgoing.keepserver.domain.student.domain.repository;

import com.keepgoing.keepserver.domain.student.entity.Student;
import com.keepgoing.keepserver.domain.student.domain.entity.Student;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.keepgoing.keepserver.domain.student.repository.dto;
package com.keepgoing.keepserver.domain.student.domain.repository.dto;


import com.keepgoing.keepserver.domain.student.entity.Student;
import com.keepgoing.keepserver.domain.student.domain.entity.Student;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.keepgoing.keepserver.domain.student.repository.dto;
package com.keepgoing.keepserver.domain.student.domain.repository.dto;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.keepgoing.keepserver.domain.student.repository.dto;
package com.keepgoing.keepserver.domain.student.domain.repository.dto;

import lombok.Data;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.keepgoing.keepserver.domain.student.repository.dto;
package com.keepgoing.keepserver.domain.student.domain.repository.dto;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.keepgoing.keepserver.domain.student.repository.dto;
package com.keepgoing.keepserver.domain.student.domain.repository.dto;

import lombok.Builder;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.keepgoing.keepserver.domain.student.service;

import com.keepgoing.keepserver.domain.student.repository.dto.StudentFindDto;
import com.keepgoing.keepserver.domain.student.repository.dto.StudentRequestDto;
import com.keepgoing.keepserver.domain.student.domain.repository.dto.StudentFindDto;
import com.keepgoing.keepserver.domain.student.domain.repository.dto.StudentRequestDto;
import com.keepgoing.keepserver.global.common.BaseResponse;
import org.springframework.web.multipart.MultipartFile;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package com.keepgoing.keepserver.domain.student.service;

import com.keepgoing.keepserver.domain.student.entity.Student;
import com.keepgoing.keepserver.domain.student.repository.StudentRepository;
import com.keepgoing.keepserver.domain.student.repository.dto.*;
import com.keepgoing.keepserver.domain.student.domain.entity.Student;
import com.keepgoing.keepserver.domain.student.domain.repository.StudentRepository;
import com.keepgoing.keepserver.domain.student.domain.repository.dto.StudentDto;
import com.keepgoing.keepserver.domain.student.domain.repository.dto.StudentFindDto;
import com.keepgoing.keepserver.domain.student.domain.repository.dto.StudentRequestDto;
import com.keepgoing.keepserver.domain.student.domain.repository.dto.StudentResponseDto;
import com.keepgoing.keepserver.global.common.BaseResponse;
import lombok.AllArgsConstructor;
import org.apache.commons.io.FilenameUtils;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.keepgoing.keepserver.domain.user.entity.user;
package com.keepgoing.keepserver.domain.user.domain.entity.user;

import jakarta.persistence.*;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.keepgoing.keepserver.domain.user.repository.user;
package com.keepgoing.keepserver.domain.user.domain.repository.user;

import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.entity.user.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
Expand Up @@ -2,7 +2,7 @@

import com.keepgoing.keepserver.domain.book.payload.response.BookResponseDto;
import com.keepgoing.keepserver.domain.device.payload.response.DeviceResponseDto;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.keepgoing.keepserver.domain.user.security.service;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import lombok.Getter;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.keepgoing.keepserver.domain.user.security.service;

import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.repository.user.UserRepository;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.repository.user.UserRepository;
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,20 +1,20 @@
package com.keepgoing.keepserver.domain.user.service.user;

import com.keepgoing.keepserver.domain.book.entity.Book;
import com.keepgoing.keepserver.domain.book.domain.entity.Book;
import com.keepgoing.keepserver.domain.book.payload.response.BookResponseDto;
import com.keepgoing.keepserver.domain.book.mapper.BookMapper;
import com.keepgoing.keepserver.domain.book.service.BookServiceImpl;
import com.keepgoing.keepserver.domain.device.entity.Device;
import com.keepgoing.keepserver.domain.device.domain.entity.Device;
import com.keepgoing.keepserver.domain.device.mapper.DeviceMapper;
import com.keepgoing.keepserver.domain.device.payload.response.DeviceResponseDto;
import com.keepgoing.keepserver.domain.device.service.DeviceServiceImpl;
import com.keepgoing.keepserver.domain.user.entity.user.User;
import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
import com.keepgoing.keepserver.domain.user.payload.request.SignupRequest;
import com.keepgoing.keepserver.domain.user.payload.request.UserInfoRequest;
import com.keepgoing.keepserver.domain.user.payload.request.UserProfileDto;
import com.keepgoing.keepserver.domain.user.payload.response.ApiResponse;
import com.keepgoing.keepserver.domain.user.payload.response.JwtResponse;
import com.keepgoing.keepserver.domain.user.repository.user.UserRepository;
import com.keepgoing.keepserver.domain.user.domain.repository.user.UserRepository;
import com.keepgoing.keepserver.domain.user.security.jwt.JwtUtils;
import com.keepgoing.keepserver.domain.user.security.service.UserDetailsImpl;
import com.keepgoing.keepserver.global.exception.BusinessException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.keepgoing.keepserver.global.exception.device;

import com.keepgoing.keepserver.global.exception.BusinessException;
import com.keepgoing.keepserver.global.exception.book.BookException;

public class DeviceException extends BusinessException {
private static final DeviceException USER_NOT_FOUND = new DeviceException(DeviceError.USER_NOT_FOUND);
Expand Down

0 comments on commit d33a9ff

Please sign in to comment.