Skip to content

Commit

Permalink
Merge pull request #98 from KUSITMS-MOAMOA/refactor/#97
Browse files Browse the repository at this point in the history
[Refactor/#97] : 디렉토리 구조 DDD로 수정
  • Loading branch information
oosedus authored Nov 20, 2024
2 parents 17b2987 + a9dacd8 commit e75e0f9
Show file tree
Hide file tree
Showing 99 changed files with 442 additions and 443 deletions.
4 changes: 2 additions & 2 deletions src/main/java/corecord/dev/common/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import corecord.dev.common.util.*;
import corecord.dev.domain.auth.handler.OAuthLoginFailureHandler;
import corecord.dev.domain.auth.handler.OAuthLoginSuccessHandler;
import corecord.dev.domain.auth.util.JwtFilter;
import corecord.dev.domain.auth.util.JwtUtil;
import corecord.dev.domain.auth.jwt.JwtFilter;
import corecord.dev.domain.auth.jwt.JwtUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

import corecord.dev.common.response.ApiResponse;
import corecord.dev.common.status.ErrorStatus;
import corecord.dev.domain.ability.exception.model.AbilityException;
import corecord.dev.domain.analysis.exception.model.AnalysisException;
import corecord.dev.domain.auth.exception.model.TokenException;
import corecord.dev.domain.chat.exception.model.ChatException;
import corecord.dev.domain.folder.exception.model.FolderException;
import corecord.dev.domain.record.exception.model.RecordException;
import corecord.dev.domain.user.exception.model.UserException;
import corecord.dev.domain.ability.exception.AbilityException;
import corecord.dev.domain.analysis.exception.AnalysisException;
import corecord.dev.domain.auth.exception.TokenException;
import corecord.dev.domain.chat.exception.ChatException;
import corecord.dev.domain.folder.exception.FolderException;
import corecord.dev.domain.record.exception.RecordException;
import corecord.dev.domain.user.exception.UserException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.support.DefaultMessageSourceResolvable;
import org.springframework.http.HttpHeaders;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package corecord.dev.domain.ability.service;
package corecord.dev.domain.ability.application;

import corecord.dev.common.exception.GeneralException;
import corecord.dev.common.status.ErrorStatus;
import corecord.dev.domain.ability.converter.AbilityConverter;
import corecord.dev.domain.ability.dto.response.AbilityResponse;
import corecord.dev.domain.ability.entity.Ability;
import corecord.dev.domain.ability.entity.Keyword;
import corecord.dev.domain.ability.exception.enums.AbilityErrorStatus;
import corecord.dev.domain.ability.exception.model.AbilityException;
import corecord.dev.domain.ability.repository.AbilityRepository;
import corecord.dev.domain.analysis.entity.Analysis;
import corecord.dev.domain.user.entity.User;
import corecord.dev.domain.user.repository.UserRepository;
import corecord.dev.domain.ability.domain.converter.AbilityConverter;
import corecord.dev.domain.ability.domain.dto.response.AbilityResponse;
import corecord.dev.domain.ability.domain.entity.Ability;
import corecord.dev.domain.ability.domain.entity.Keyword;
import corecord.dev.domain.ability.status.AbilityErrorStatus;
import corecord.dev.domain.ability.exception.AbilityException;
import corecord.dev.domain.ability.domain.repository.AbilityRepository;
import corecord.dev.domain.analysis.domain.entity.Analysis;
import corecord.dev.domain.user.domain.entity.User;
import corecord.dev.domain.user.domain.repository.UserRepository;
import jakarta.persistence.EntityManager;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package corecord.dev.domain.ability.converter;
package corecord.dev.domain.ability.domain.converter;

import corecord.dev.domain.ability.dto.response.AbilityResponse;
import corecord.dev.domain.ability.entity.Ability;
import corecord.dev.domain.ability.entity.Keyword;
import corecord.dev.domain.analysis.entity.Analysis;
import corecord.dev.domain.user.entity.User;
import corecord.dev.domain.ability.domain.dto.response.AbilityResponse;
import corecord.dev.domain.ability.domain.entity.Ability;
import corecord.dev.domain.ability.domain.entity.Keyword;
import corecord.dev.domain.analysis.domain.entity.Analysis;
import corecord.dev.domain.user.domain.entity.User;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package corecord.dev.domain.ability.dto.response;
package corecord.dev.domain.ability.domain.dto.response;

import corecord.dev.domain.ability.entity.Keyword;
import corecord.dev.domain.ability.domain.entity.Keyword;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package corecord.dev.domain.ability.entity;
package corecord.dev.domain.ability.domain.entity;

import corecord.dev.common.base.BaseEntity;
import corecord.dev.domain.analysis.entity.Analysis;
import corecord.dev.domain.user.entity.User;
import corecord.dev.domain.analysis.domain.entity.Analysis;
import corecord.dev.domain.user.domain.entity.User;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.ability.entity;
package corecord.dev.domain.ability.domain.entity;

import lombok.AllArgsConstructor;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package corecord.dev.domain.ability.repository;
package corecord.dev.domain.ability.domain.repository;

import corecord.dev.domain.ability.dto.response.AbilityResponse;
import corecord.dev.domain.ability.entity.Ability;
import corecord.dev.domain.ability.entity.Keyword;
import corecord.dev.domain.user.entity.User;
import corecord.dev.domain.ability.domain.dto.response.AbilityResponse;
import corecord.dev.domain.ability.domain.entity.Ability;
import corecord.dev.domain.ability.domain.entity.Keyword;
import corecord.dev.domain.user.domain.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
Expand All @@ -14,7 +14,7 @@

@Repository
public interface AbilityRepository extends JpaRepository<Ability, Long> {
@Query("SELECT new corecord.dev.domain.ability.dto.response.AbilityResponse$KeywordStateDto(" +
@Query("SELECT new corecord.dev.domain.ability.domain.dto.response.AbilityResponse$KeywordStateDto(" +
"a.keyword, COUNT(a), " + // 각 키워드의 개수 집계
"(COUNT(a) * 1.0 / (SELECT COUNT(a2) FROM Ability a2 WHERE a2.user = :user)) * 100.0) " + // 각 키워드의 비율 집계
"FROM Ability a " +
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package corecord.dev.domain.ability.exception.model;
package corecord.dev.domain.ability.exception;

import corecord.dev.domain.ability.exception.enums.AbilityErrorStatus;
import corecord.dev.domain.ability.status.AbilityErrorStatus;
import lombok.AllArgsConstructor;
import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package corecord.dev.domain.ability.controller;
package corecord.dev.domain.ability.presentation;

import corecord.dev.common.response.ApiResponse;
import corecord.dev.common.web.UserId;
import corecord.dev.domain.ability.constant.AbilitySuccessStatus;
import corecord.dev.domain.ability.dto.response.AbilityResponse;
import corecord.dev.domain.ability.service.AbilityService;
import corecord.dev.domain.ability.status.AbilitySuccessStatus;
import corecord.dev.domain.ability.domain.dto.response.AbilityResponse;
import corecord.dev.domain.ability.application.AbilityService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.ability.exception.enums;
package corecord.dev.domain.ability.status;

import corecord.dev.common.base.BaseErrorStatus;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.ability.constant;
package corecord.dev.domain.ability.status;

import corecord.dev.common.base.BaseSuccessStatus;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
package corecord.dev.domain.analysis.service;
package corecord.dev.domain.analysis.application;

import corecord.dev.common.exception.GeneralException;
import corecord.dev.common.status.ErrorStatus;
import corecord.dev.domain.ability.entity.Keyword;
import corecord.dev.domain.ability.exception.enums.AbilityErrorStatus;
import corecord.dev.domain.ability.exception.model.AbilityException;
import corecord.dev.domain.ability.service.AbilityService;
import corecord.dev.domain.analysis.converter.AnalysisConverter;
import corecord.dev.domain.analysis.dto.request.AnalysisRequest;
import corecord.dev.domain.analysis.dto.response.AnalysisAiResponse;
import corecord.dev.domain.analysis.dto.response.AnalysisResponse;
import corecord.dev.domain.ability.entity.Ability;
import corecord.dev.domain.analysis.entity.Analysis;
import corecord.dev.domain.analysis.exception.enums.AnalysisErrorStatus;
import corecord.dev.domain.analysis.exception.model.AnalysisException;
import corecord.dev.domain.analysis.repository.AnalysisRepository;
import corecord.dev.domain.record.entity.Record;
import corecord.dev.domain.record.exception.enums.RecordErrorStatus;
import corecord.dev.domain.record.exception.model.RecordException;
import corecord.dev.domain.record.repository.RecordRepository;
import corecord.dev.domain.user.entity.User;
import corecord.dev.domain.user.repository.UserRepository;
import corecord.dev.domain.ability.domain.entity.Keyword;
import corecord.dev.domain.ability.status.AbilityErrorStatus;
import corecord.dev.domain.ability.exception.AbilityException;
import corecord.dev.domain.ability.application.AbilityService;
import corecord.dev.domain.analysis.domain.converter.AnalysisConverter;
import corecord.dev.domain.analysis.domain.dto.request.AnalysisRequest;
import corecord.dev.domain.analysis.infra.openai.dto.response.AnalysisAiResponse;
import corecord.dev.domain.analysis.domain.dto.response.AnalysisResponse;
import corecord.dev.domain.ability.domain.entity.Ability;
import corecord.dev.domain.analysis.domain.entity.Analysis;
import corecord.dev.domain.analysis.infra.openai.application.OpenAiService;
import corecord.dev.domain.analysis.status.AnalysisErrorStatus;
import corecord.dev.domain.analysis.exception.AnalysisException;
import corecord.dev.domain.analysis.domain.repository.AnalysisRepository;
import corecord.dev.domain.record.domain.entity.Record;
import corecord.dev.domain.record.status.RecordErrorStatus;
import corecord.dev.domain.record.exception.RecordException;
import corecord.dev.domain.record.domain.repository.RecordRepository;
import corecord.dev.domain.user.domain.entity.User;
import corecord.dev.domain.user.domain.repository.UserRepository;
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,11 +1,11 @@
package corecord.dev.domain.analysis.converter;
package corecord.dev.domain.analysis.domain.converter;

import corecord.dev.domain.ability.converter.AbilityConverter;
import corecord.dev.domain.ability.dto.response.AbilityResponse;
import corecord.dev.domain.analysis.dto.response.AnalysisResponse;
import corecord.dev.domain.analysis.entity.Analysis;
import corecord.dev.domain.record.constant.RecordType;
import corecord.dev.domain.record.entity.Record;
import corecord.dev.domain.ability.domain.converter.AbilityConverter;
import corecord.dev.domain.ability.domain.dto.response.AbilityResponse;
import corecord.dev.domain.analysis.domain.dto.response.AnalysisResponse;
import corecord.dev.domain.analysis.domain.entity.Analysis;
import corecord.dev.domain.record.domain.entity.RecordType;
import corecord.dev.domain.record.domain.entity.Record;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.analysis.dto.request;
package corecord.dev.domain.analysis.domain.dto.request;

import jakarta.validation.constraints.NotNull;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package corecord.dev.domain.analysis.dto.response;
package corecord.dev.domain.analysis.domain.dto.response;

import corecord.dev.domain.ability.dto.response.AbilityResponse;
import corecord.dev.domain.record.constant.RecordType;
import corecord.dev.domain.ability.domain.dto.response.AbilityResponse;
import corecord.dev.domain.record.domain.entity.RecordType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package corecord.dev.domain.analysis.entity;
package corecord.dev.domain.analysis.domain.entity;

import corecord.dev.common.base.BaseEntity;
import corecord.dev.domain.ability.entity.Ability;
import corecord.dev.domain.record.entity.Record;
import corecord.dev.domain.ability.domain.entity.Ability;
import corecord.dev.domain.record.domain.entity.Record;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package corecord.dev.domain.analysis.repository;
package corecord.dev.domain.analysis.domain.repository;

import corecord.dev.domain.analysis.entity.Analysis;
import corecord.dev.domain.analysis.domain.entity.Analysis;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package corecord.dev.domain.analysis.exception.model;
package corecord.dev.domain.analysis.exception;

import corecord.dev.domain.analysis.exception.enums.AnalysisErrorStatus;
import corecord.dev.domain.analysis.status.AnalysisErrorStatus;
import lombok.AllArgsConstructor;
import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package corecord.dev.domain.analysis.service;
package corecord.dev.domain.analysis.infra.openai.application;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import corecord.dev.common.util.ResourceLoader;
import corecord.dev.domain.analysis.dto.response.AnalysisAiResponse;
import corecord.dev.domain.analysis.exception.enums.AnalysisErrorStatus;
import corecord.dev.domain.analysis.exception.model.AnalysisException;
import corecord.dev.domain.analysis.infra.openai.dto.response.AnalysisAiResponse;
import corecord.dev.domain.analysis.status.AnalysisErrorStatus;
import corecord.dev.domain.analysis.exception.AnalysisException;
import lombok.RequiredArgsConstructor;
import org.springframework.ai.openai.OpenAiChatModel;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.common.config;
package corecord.dev.domain.analysis.infra.openai.config;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.analysis.dto.response;
package corecord.dev.domain.analysis.infra.openai.dto.response;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package corecord.dev.domain.analysis.controller;
package corecord.dev.domain.analysis.presentation;

import corecord.dev.common.response.ApiResponse;
import corecord.dev.common.web.UserId;
import corecord.dev.domain.analysis.constant.AnalysisSuccessStatus;
import corecord.dev.domain.analysis.dto.request.AnalysisRequest;
import corecord.dev.domain.analysis.dto.response.AnalysisResponse;
import corecord.dev.domain.analysis.service.AnalysisService;
import corecord.dev.domain.analysis.status.AnalysisSuccessStatus;
import corecord.dev.domain.analysis.domain.dto.request.AnalysisRequest;
import corecord.dev.domain.analysis.domain.dto.response.AnalysisResponse;
import corecord.dev.domain.analysis.application.AnalysisService;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.analysis.exception.enums;
package corecord.dev.domain.analysis.status;

import corecord.dev.common.base.BaseErrorStatus;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.analysis.constant;
package corecord.dev.domain.analysis.status;

import corecord.dev.common.base.BaseSuccessStatus;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package corecord.dev.domain.auth.service;
package corecord.dev.domain.auth.application;

import corecord.dev.common.exception.GeneralException;
import corecord.dev.common.status.ErrorStatus;
import corecord.dev.common.util.CookieUtil;
import corecord.dev.domain.auth.util.JwtUtil;
import corecord.dev.domain.auth.entity.RefreshToken;
import corecord.dev.domain.auth.entity.TmpToken;
import corecord.dev.domain.auth.exception.enums.TokenErrorStatus;
import corecord.dev.domain.auth.exception.model.TokenException;
import corecord.dev.domain.auth.repository.RefreshTokenRepository;
import corecord.dev.domain.auth.repository.TmpTokenRepository;
import corecord.dev.domain.user.converter.UserConverter;
import corecord.dev.domain.user.dto.response.UserResponse;
import corecord.dev.domain.user.entity.User;
import corecord.dev.domain.user.repository.UserRepository;
import corecord.dev.domain.auth.jwt.JwtUtil;
import corecord.dev.domain.auth.domain.entity.RefreshToken;
import corecord.dev.domain.auth.domain.entity.TmpToken;
import corecord.dev.domain.auth.status.TokenErrorStatus;
import corecord.dev.domain.auth.exception.TokenException;
import corecord.dev.domain.auth.domain.repository.RefreshTokenRepository;
import corecord.dev.domain.auth.domain.repository.TmpTokenRepository;
import corecord.dev.domain.user.domain.converter.UserConverter;
import corecord.dev.domain.user.domain.dto.response.UserResponse;
import corecord.dev.domain.user.domain.entity.User;
import corecord.dev.domain.user.domain.repository.UserRepository;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.transaction.Transactional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.auth.dto;
package corecord.dev.domain.auth.domain.dto;

import lombok.AllArgsConstructor;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.auth.dto;
package corecord.dev.domain.auth.domain.dto;

public interface OAuth2UserInfo {
String getProviderId();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.auth.entity;
package corecord.dev.domain.auth.domain.entity;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package corecord.dev.domain.auth.entity;
package corecord.dev.domain.auth.domain.entity;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Loading

0 comments on commit e75e0f9

Please sign in to comment.