chore: todo 도메인 -> trip 도메인 패키지 병합 (#35)

Team-Going · Jan 9, 2024 · 3c00a9c · 3c00a9c
1 parent c0f93f9
commit 3c00a9c
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 21 deletions.
diff --git a/...rg/doorip/todo/api/TodoApiController.java → ...rg/doorip/trip/api/TodoApiController.java b/...rg/doorip/todo/api/TodoApiController.java → ...rg/doorip/trip/api/TodoApiController.java
@@ -1,11 +1,11 @@
-package org.doorip.todo.api;
+package org.doorip.trip.api;
 
 import lombok.RequiredArgsConstructor;
 import org.doorip.common.ApiResponse;
 import org.doorip.common.ApiResponseUtil;
 import org.doorip.message.SuccessMessage;
-import org.doorip.todo.dto.request.TodoCreateRequest;
-import org.doorip.todo.service.TodoService;
+import org.doorip.trip.dto.request.TodoCreateRequest;
+import org.doorip.trip.service.TodoService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;

diff --git a/...p/todo/dto/request/TodoCreateRequest.java → ...p/trip/dto/request/TodoCreateRequest.java b/...p/todo/dto/request/TodoCreateRequest.java → ...p/trip/dto/request/TodoCreateRequest.java
@@ -1,4 +1,4 @@
-package org.doorip.todo.dto.request;
+package org.doorip.trip.dto.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

diff --git a/.../org/doorip/todo/service/TodoService.java → .../org/doorip/trip/service/TodoService.java b/.../org/doorip/todo/service/TodoService.java → .../org/doorip/trip/service/TodoService.java
@@ -1,23 +1,23 @@
-package org.doorip.todo.service;
+package org.doorip.trip.service;
 
 import lombok.RequiredArgsConstructor;
 import org.doorip.exception.EntityNotFoundException;
 import org.doorip.exception.InvalidValueException;
 import org.doorip.message.ErrorMessage;
-import org.doorip.todo.domain.Secret;
-import org.doorip.todo.domain.Todo;
-import org.doorip.todo.dto.request.TodoCreateRequest;
-import org.doorip.todo.repository.TodoRepository;
 import org.doorip.trip.domain.Participant;
+import org.doorip.trip.domain.Secret;
+import org.doorip.trip.domain.Todo;
 import org.doorip.trip.domain.Trip;
+import org.doorip.trip.dto.request.TodoCreateRequest;
 import org.doorip.trip.repository.ParticipantRepository;
+import org.doorip.trip.repository.TodoRepository;
 import org.doorip.trip.repository.TripRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
-import static org.doorip.todo.domain.Allocator.createAllocator;
+import static org.doorip.trip.domain.Allocator.createAllocator;
 
 @RequiredArgsConstructor
 @Transactional

diff --git a/...ava/org/doorip/todo/domain/Allocator.java → ...ava/org/doorip/trip/domain/Allocator.java b/...ava/org/doorip/todo/domain/Allocator.java → ...ava/org/doorip/trip/domain/Allocator.java
@@ -1,9 +1,8 @@
-package org.doorip.todo.domain;
+package org.doorip.trip.domain;
 
 import jakarta.persistence.*;
 import lombok.*;
 import org.doorip.common.BaseTimeEntity;
-import org.doorip.trip.domain.Participant;
 
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)

diff --git a/doorip-domain/src/main/java/org/doorip/trip/domain/Participant.java b/doorip-domain/src/main/java/org/doorip/trip/domain/Participant.java
@@ -3,7 +3,6 @@
 import jakarta.persistence.*;
 import lombok.*;
 import org.doorip.common.BaseTimeEntity;
-import org.doorip.todo.domain.Allocator;
 import org.doorip.user.domain.User;
 
 import java.util.ArrayList;
@@ -42,7 +41,7 @@ public class Participant extends BaseTimeEntity {
     @OneToMany(mappedBy = "participant", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
     private List<Allocator> allocators = new ArrayList<>();
 
-    public static Participant createParticipant(Role role, int styleA, int styleB, int styleC, int styleD, int styleE, User user, Trip trip){
+    public static Participant createParticipant(Role role, int styleA, int styleB, int styleC, int styleD, int styleE, User user, Trip trip) {
         Participant participant = Participant.builder()
                 .role(role)
                 .styleA(styleA)

diff --git a/...java/org/doorip/todo/domain/Progress.java → ...java/org/doorip/trip/domain/Progress.java b/...java/org/doorip/todo/domain/Progress.java → ...java/org/doorip/trip/domain/Progress.java
@@ -1,4 +1,4 @@
-package org.doorip.todo.domain;
+package org.doorip.trip.domain;
 
 public enum Progress {
     INCOMPLETE, COMPLETE

diff --git a/...n/java/org/doorip/todo/domain/Secret.java → ...n/java/org/doorip/trip/domain/Secret.java b/...n/java/org/doorip/todo/domain/Secret.java → ...n/java/org/doorip/trip/domain/Secret.java
@@ -1,4 +1,4 @@
-package org.doorip.todo.domain;
+package org.doorip.trip.domain;
 
 public enum Secret {
     OUR, MY;

diff --git a/...ain/java/org/doorip/todo/domain/Todo.java → ...ain/java/org/doorip/trip/domain/Todo.java b/...ain/java/org/doorip/todo/domain/Todo.java → ...ain/java/org/doorip/trip/domain/Todo.java
@@ -1,9 +1,8 @@
-package org.doorip.todo.domain;
+package org.doorip.trip.domain;
 
 import jakarta.persistence.*;
 import lombok.*;
 import org.doorip.common.BaseTimeEntity;
-import org.doorip.trip.domain.Trip;
 
 import java.time.LocalDate;
 import java.util.ArrayList;

diff --git a/doorip-domain/src/main/java/org/doorip/trip/domain/Trip.java b/doorip-domain/src/main/java/org/doorip/trip/domain/Trip.java
@@ -3,7 +3,6 @@
 import jakarta.persistence.*;
 import lombok.*;
 import org.doorip.common.BaseTimeEntity;
-import org.doorip.todo.domain.Todo;
 
 import java.time.LocalDate;
 import java.util.ArrayList;

diff --git a/...oorip/todo/repository/TodoRepository.java → ...oorip/trip/repository/TodoRepository.java b/...oorip/todo/repository/TodoRepository.java → ...oorip/trip/repository/TodoRepository.java
@@ -1,6 +1,6 @@
-package org.doorip.todo.repository;
+package org.doorip.trip.repository;
 
-import org.doorip.todo.domain.Todo;
+import org.doorip.trip.domain.Todo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TodoRepository extends JpaRepository<Todo, Long> {