Skip to content

Commit

Permalink
Merge pull request #31 from 23JGP/jihyeon
Browse files Browse the repository at this point in the history
♻️[refactor] : 디렉토리 구조를 도메인형 구조로 변경
  • Loading branch information
mic050r authored May 26, 2024
2 parents 36022c8 + ba7fa67 commit e99ccdc
Show file tree
Hide file tree
Showing 47 changed files with 110 additions and 124 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
implementation 'net.sourceforge.tess4j:tess4j:4.5.2' // 최신 버전 확인
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:session:spring-session-jdbc'
implementation 'com.squareup.okhttp3:okhttp:4.9.1'

// swagger
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.deepapi;
package com.wevel.wevel_server.domain.deepapi;

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,7 +1,7 @@
package com.wevel.wevel_server.deepapi;
package com.wevel.wevel_server.domain.deepapi;

import com.wevel.wevel_server.deepapi.model.TranslationRequest;
import com.wevel.wevel_server.deepapi.model.TranslationResponse;
import com.wevel.wevel_server.domain.deepapi.model.TranslationRequest;
import com.wevel.wevel_server.domain.deepapi.model.TranslationResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.deepapi.model;
package com.wevel.wevel_server.domain.deepapi.model;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.deepapi.model;
package com.wevel.wevel_server.domain.deepapi.model;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.deepapi.model;
package com.wevel.wevel_server.domain.deepapi.model;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.wevel.wevel_server.memo;
package com.wevel.wevel_server.domain.memo;

import com.wevel.wevel_server.memo.dto.GivenMemoResponse;
import com.wevel.wevel_server.memo.dto.MemoAllResponse;
import com.wevel.wevel_server.memo.dto.ReceivedMemoResponse;
import com.wevel.wevel_server.memo.repository.MemoRepository;
import com.wevel.wevel_server.memo.service.MemoService;
import com.wevel.wevel_server.domain.memo.dto.GivenMemoResponse;
import com.wevel.wevel_server.domain.memo.dto.MemoAllResponse;
import com.wevel.wevel_server.domain.memo.dto.ReceivedMemoResponse;
import com.wevel.wevel_server.domain.memo.service.MemoService;
import com.wevel.wevel_server.domain.memo.repository.MemoRepository;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.memo.dto;
package com.wevel.wevel_server.domain.memo.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.wevel.wevel_server.memo.dto;
package com.wevel.wevel_server.domain.memo.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.memo.dto;
package com.wevel.wevel_server.domain.memo.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.memo.dto;
package com.wevel.wevel_server.domain.memo.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.wevel.wevel_server.memo.dto;
package com.wevel.wevel_server.domain.memo.dto;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.wevel.wevel_server.memo.entity;
package com.wevel.wevel_server.domain.memo.entity;

import com.fasterxml.jackson.annotation.JsonBackReference;
import com.wevel.wevel_server.receipt.entity.Receipt;
import com.wevel.wevel_server.domain.receipt.entity.Receipt;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import net.minidev.json.annotate.JsonIgnore;

import java.util.Date;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.wevel.wevel_server.memo.repository;
package com.wevel.wevel_server.domain.memo.repository;

import com.wevel.wevel_server.memo.entity.Memo;
import com.wevel.wevel_server.domain.memo.entity.Memo;
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,11 +1,11 @@
package com.wevel.wevel_server.memo.service;

import com.wevel.wevel_server.memo.dto.GivenMemoResponse;
import com.wevel.wevel_server.memo.dto.MemoDTO;
import com.wevel.wevel_server.memo.dto.ReceivedMemoResponse;
import com.wevel.wevel_server.memo.entity.Memo;
import com.wevel.wevel_server.memo.dto.MemoResponse;
import com.wevel.wevel_server.memo.repository.MemoRepository;
package com.wevel.wevel_server.domain.memo.service;

import com.wevel.wevel_server.domain.memo.dto.MemoDTO;
import com.wevel.wevel_server.domain.memo.dto.MemoResponse;
import com.wevel.wevel_server.domain.memo.dto.ReceivedMemoResponse;
import com.wevel.wevel_server.domain.memo.entity.Memo;
import com.wevel.wevel_server.domain.memo.dto.GivenMemoResponse;
import com.wevel.wevel_server.domain.memo.repository.MemoRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.ocr;
package com.wevel.wevel_server.domain.ocr;

import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.ocr;
package com.wevel.wevel_server.domain.ocr;

import net.sourceforge.tess4j.ITesseract;
import net.sourceforge.tess4j.Tesseract;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.wevel.wevel_server.receipt;
import com.wevel.wevel_server.memo.entity.Memo;
import com.wevel.wevel_server.memo.repository.MemoRepository;
import com.wevel.wevel_server.receipt.dto.ProductDTO;
import com.wevel.wevel_server.receipt.dto.ReceiptDTO;
import com.wevel.wevel_server.receipt.entity.Product;
import com.wevel.wevel_server.receipt.entity.Receipt;
import com.wevel.wevel_server.receipt.repository.ProductRepository;
import com.wevel.wevel_server.receipt.repository.ReceiptRepository;
import com.wevel.wevel_server.receipt.service.ReceiptService;
import com.wevel.wevel_server.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.tripInfo.service.TripInfoService;
package com.wevel.wevel_server.domain.receipt;
import com.wevel.wevel_server.domain.memo.entity.Memo;
import com.wevel.wevel_server.domain.memo.repository.MemoRepository;
import com.wevel.wevel_server.domain.receipt.dto.ProductDTO;
import com.wevel.wevel_server.domain.receipt.dto.ReceiptDTO;
import com.wevel.wevel_server.domain.receipt.entity.Product;
import com.wevel.wevel_server.domain.receipt.repository.ProductRepository;
import com.wevel.wevel_server.domain.receipt.repository.ReceiptRepository;
import com.wevel.wevel_server.domain.receipt.service.ReceiptService;
import com.wevel.wevel_server.domain.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.domain.tripInfo.service.TripInfoService;
import com.wevel.wevel_server.domain.receipt.entity.Receipt;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.wevel.wevel_server.receipt;

import com.wevel.wevel_server.memo.dto.MemoDTO;
import com.wevel.wevel_server.memo.service.MemoService;
import com.wevel.wevel_server.receipt.dto.ProductDTO;
import com.wevel.wevel_server.receipt.dto.ReceiptDTO;
import com.wevel.wevel_server.receipt.service.ProductService;
import com.wevel.wevel_server.receipt.service.ReceiptService;
package com.wevel.wevel_server.domain.receipt;

import com.wevel.wevel_server.domain.receipt.service.ProductService;
import com.wevel.wevel_server.domain.receipt.service.ReceiptService;
import com.wevel.wevel_server.domain.memo.dto.MemoDTO;
import com.wevel.wevel_server.domain.memo.service.MemoService;
import com.wevel.wevel_server.domain.receipt.dto.ProductDTO;
import com.wevel.wevel_server.domain.receipt.dto.ReceiptDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.receipt.dto;
package com.wevel.wevel_server.domain.receipt.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.receipt.dto;
package com.wevel.wevel_server.domain.receipt.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.wevel.wevel_server.receipt.entity;
package com.wevel.wevel_server.domain.receipt.entity;

import com.fasterxml.jackson.annotation.JsonBackReference;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import net.minidev.json.annotate.JsonIgnore;


@Entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.wevel.wevel_server.receipt.entity;
package com.wevel.wevel_server.domain.receipt.entity;

import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.wevel.wevel_server.memo.entity.Memo;
import com.wevel.wevel_server.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.domain.memo.entity.Memo;
import jakarta.persistence.*;
import lombok.*;
import net.minidev.json.annotate.JsonIgnore;

import java.util.Date;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.wevel.wevel_server.receipt.repository;
package com.wevel.wevel_server.domain.receipt.repository;

import com.wevel.wevel_server.receipt.entity.Product;
import com.wevel.wevel_server.domain.receipt.entity.Product;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.wevel.wevel_server.receipt.repository;
package com.wevel.wevel_server.domain.receipt.repository;

import com.wevel.wevel_server.receipt.entity.Receipt;
import com.wevel.wevel_server.domain.receipt.entity.Receipt;
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 com.wevel.wevel_server.receipt.service;
package com.wevel.wevel_server.domain.receipt.service;

import com.wevel.wevel_server.receipt.dto.ProductDTO;
import com.wevel.wevel_server.receipt.entity.Product;
import com.wevel.wevel_server.receipt.repository.ProductRepository;
import com.wevel.wevel_server.domain.receipt.dto.ProductDTO;
import com.wevel.wevel_server.domain.receipt.entity.Product;
import com.wevel.wevel_server.domain.receipt.repository.ProductRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
package com.wevel.wevel_server.receipt.service;

import com.wevel.wevel_server.memo.entity.Memo;
import com.wevel.wevel_server.memo.repository.MemoRepository;
import com.wevel.wevel_server.receipt.dto.ReceiptDTO;
import com.wevel.wevel_server.receipt.entity.Product;
import com.wevel.wevel_server.receipt.entity.Receipt;
import com.wevel.wevel_server.receipt.repository.ReceiptRepository;
import com.wevel.wevel_server.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.tripInfo.repository.TripInfoRepository;
package com.wevel.wevel_server.domain.receipt.service;

import com.wevel.wevel_server.domain.memo.entity.Memo;
import com.wevel.wevel_server.domain.memo.repository.MemoRepository;
import com.wevel.wevel_server.domain.receipt.dto.ReceiptDTO;
import com.wevel.wevel_server.domain.receipt.entity.Product;
import com.wevel.wevel_server.domain.receipt.entity.Receipt;
import com.wevel.wevel_server.domain.receipt.repository.ReceiptRepository;
import com.wevel.wevel_server.domain.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.domain.tripInfo.repository.TripInfoRepository;
import jakarta.persistence.EntityNotFoundException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.wevel.wevel_server.tripInfo.controller;
package com.wevel.wevel_server.domain.tripInfo.controller;

import com.wevel.wevel_server.receipt.service.ReceiptService;
import com.wevel.wevel_server.tripInfo.dto.TripInfoDTO;
import com.wevel.wevel_server.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.tripInfo.repository.TripInfoRepository;
import com.wevel.wevel_server.tripInfo.service.TripInfoService;
import com.wevel.wevel_server.domain.receipt.service.ReceiptService;
import com.wevel.wevel_server.domain.tripInfo.dto.TripInfoDTO;
import com.wevel.wevel_server.domain.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.domain.tripInfo.repository.TripInfoRepository;
import com.wevel.wevel_server.domain.tripInfo.service.TripInfoService;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.tripInfo.dto;
package com.wevel.wevel_server.domain.tripInfo.dto;

public class SpentPercentageResponse {
private Double spentPercentage;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.tripInfo.dto;
package com.wevel.wevel_server.domain.tripInfo.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.wevel.wevel_server.tripInfo.entity;
package com.wevel.wevel_server.domain.tripInfo.entity;

import com.wevel.wevel_server.receipt.entity.Receipt;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;

import java.util.Date;
import java.util.List;

@Getter
@Setter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package com.wevel.wevel_server.tripInfo.repository;
package com.wevel.wevel_server.domain.tripInfo.repository;

import com.wevel.wevel_server.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.domain.tripInfo.entity.TripInfo;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDate;
import java.util.*;

@Repository
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@

package com.wevel.wevel_server.tripInfo.service;
package com.wevel.wevel_server.domain.tripInfo.service;

import com.wevel.wevel_server.tripInfo.dto.TripInfoDTO;
import com.wevel.wevel_server.tripInfo.entity.TripInfo;
import com.wevel.wevel_server.tripInfo.repository.TripInfoRepository;
import com.wevel.wevel_server.domain.tripInfo.repository.TripInfoRepository;
import com.wevel.wevel_server.domain.tripInfo.dto.TripInfoDTO;
import com.wevel.wevel_server.domain.tripInfo.entity.TripInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.user;
package com.wevel.wevel_server.domain.user;

import jakarta.servlet.http.HttpSession;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wevel.wevel_server.user;
package com.wevel.wevel_server.domain.user;


import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.wevel.wevel_server.user;
package com.wevel.wevel_server.domain.user;

import com.wevel.wevel_server.user.dto.UserResponse;
import com.wevel.wevel_server.domain.user.dto.UserResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
Loading

0 comments on commit e99ccdc

Please sign in to comment.