From f4cfda05e097db727ad7f4a330842b55749e812c Mon Sep 17 00:00:00 2001 From: frombunny Date: Sat, 14 Sep 2024 21:34:39 +0900 Subject: [PATCH] =?UTF-8?q?:truck:=20MOVE.=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hsu/shimpyoo/domain/breathing/entity/DailyPef.java | 2 ++ .../shimpyoo/domain/breathing/{entity => enums}/State.java | 2 +- .../shimpyoo/domain/breathing/{entity => enums}/WeekDay.java | 2 +- .../shimpyoo/domain/breathing/service/BreathingService.java | 4 ++-- .../com/hsu/shimpyoo/domain/medicine/entity/Medicine.java | 2 ++ .../domain/medicine/{entity => enums}/MealTiming.java | 2 +- .../shimpyoo/domain/medicine/{entity => enums}/MealType.java | 2 +- .../hsu/shimpyoo/domain/medicine/service/MedicineService.java | 2 +- .../shimpyoo/domain/medicine/web/dto/MedicineRequestDto.java | 2 +- .../domain/medicine/web/dto/MedicineTimeSettingDto.java | 2 +- 10 files changed, 13 insertions(+), 9 deletions(-) rename src/main/java/com/hsu/shimpyoo/domain/breathing/{entity => enums}/State.java (84%) rename src/main/java/com/hsu/shimpyoo/domain/breathing/{entity => enums}/WeekDay.java (88%) rename src/main/java/com/hsu/shimpyoo/domain/medicine/{entity => enums}/MealTiming.java (84%) rename src/main/java/com/hsu/shimpyoo/domain/medicine/{entity => enums}/MealType.java (55%) diff --git a/src/main/java/com/hsu/shimpyoo/domain/breathing/entity/DailyPef.java b/src/main/java/com/hsu/shimpyoo/domain/breathing/entity/DailyPef.java index 880b6b4..70e1ccc 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/breathing/entity/DailyPef.java +++ b/src/main/java/com/hsu/shimpyoo/domain/breathing/entity/DailyPef.java @@ -1,5 +1,7 @@ package com.hsu.shimpyoo.domain.breathing.entity; +import com.hsu.shimpyoo.domain.breathing.enums.State; +import com.hsu.shimpyoo.domain.breathing.enums.WeekDay; import com.hsu.shimpyoo.domain.user.entity.User; import com.hsu.shimpyoo.global.entity.BaseEntity; import jakarta.persistence.*; diff --git a/src/main/java/com/hsu/shimpyoo/domain/breathing/entity/State.java b/src/main/java/com/hsu/shimpyoo/domain/breathing/enums/State.java similarity index 84% rename from src/main/java/com/hsu/shimpyoo/domain/breathing/entity/State.java rename to src/main/java/com/hsu/shimpyoo/domain/breathing/enums/State.java index f55bc35..770a5b0 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/breathing/entity/State.java +++ b/src/main/java/com/hsu/shimpyoo/domain/breathing/enums/State.java @@ -1,4 +1,4 @@ -package com.hsu.shimpyoo.domain.breathing.entity; +package com.hsu.shimpyoo.domain.breathing.enums; public enum State { GOOD("양호"), diff --git a/src/main/java/com/hsu/shimpyoo/domain/breathing/entity/WeekDay.java b/src/main/java/com/hsu/shimpyoo/domain/breathing/enums/WeekDay.java similarity index 88% rename from src/main/java/com/hsu/shimpyoo/domain/breathing/entity/WeekDay.java rename to src/main/java/com/hsu/shimpyoo/domain/breathing/enums/WeekDay.java index 2217951..3f633e9 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/breathing/entity/WeekDay.java +++ b/src/main/java/com/hsu/shimpyoo/domain/breathing/enums/WeekDay.java @@ -1,4 +1,4 @@ -package com.hsu.shimpyoo.domain.breathing.entity; +package com.hsu.shimpyoo.domain.breathing.enums; public enum WeekDay { MONDAY("월요일"), diff --git a/src/main/java/com/hsu/shimpyoo/domain/breathing/service/BreathingService.java b/src/main/java/com/hsu/shimpyoo/domain/breathing/service/BreathingService.java index beb3935..24a2fa7 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/breathing/service/BreathingService.java +++ b/src/main/java/com/hsu/shimpyoo/domain/breathing/service/BreathingService.java @@ -1,7 +1,8 @@ package com.hsu.shimpyoo.domain.breathing.service; -import com.hsu.shimpyoo.domain.breathing.web.dto.BreathingPefDto; +import com.hsu.shimpyoo.domain.breathing.enums.State; import com.hsu.shimpyoo.domain.breathing.entity.Breathing; import com.hsu.shimpyoo.domain.breathing.entity.*; +import com.hsu.shimpyoo.domain.breathing.enums.WeekDay; import com.hsu.shimpyoo.domain.breathing.repository.BreathingRepository; import com.hsu.shimpyoo.domain.breathing.repository.DailyPefRepository; import com.hsu.shimpyoo.domain.user.entity.User; @@ -14,7 +15,6 @@ import java.time.*; import java.util.*; -import java.util.stream.Collectors; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/hsu/shimpyoo/domain/medicine/entity/Medicine.java b/src/main/java/com/hsu/shimpyoo/domain/medicine/entity/Medicine.java index 703e9e4..e9f53af 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/medicine/entity/Medicine.java +++ b/src/main/java/com/hsu/shimpyoo/domain/medicine/entity/Medicine.java @@ -1,5 +1,7 @@ package com.hsu.shimpyoo.domain.medicine.entity; +import com.hsu.shimpyoo.domain.medicine.enums.MealTiming; +import com.hsu.shimpyoo.domain.medicine.enums.MealType; import com.hsu.shimpyoo.domain.user.entity.User; import com.hsu.shimpyoo.global.entity.BaseEntity; import jakarta.persistence.*; diff --git a/src/main/java/com/hsu/shimpyoo/domain/medicine/entity/MealTiming.java b/src/main/java/com/hsu/shimpyoo/domain/medicine/enums/MealTiming.java similarity index 84% rename from src/main/java/com/hsu/shimpyoo/domain/medicine/entity/MealTiming.java rename to src/main/java/com/hsu/shimpyoo/domain/medicine/enums/MealTiming.java index 7c65e77..e0aae8b 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/medicine/entity/MealTiming.java +++ b/src/main/java/com/hsu/shimpyoo/domain/medicine/enums/MealTiming.java @@ -1,4 +1,4 @@ -package com.hsu.shimpyoo.domain.medicine.entity; +package com.hsu.shimpyoo.domain.medicine.enums; public enum MealTiming { BEFORE_MEAL("식전"), diff --git a/src/main/java/com/hsu/shimpyoo/domain/medicine/entity/MealType.java b/src/main/java/com/hsu/shimpyoo/domain/medicine/enums/MealType.java similarity index 55% rename from src/main/java/com/hsu/shimpyoo/domain/medicine/entity/MealType.java rename to src/main/java/com/hsu/shimpyoo/domain/medicine/enums/MealType.java index 90c09c9..2853470 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/medicine/entity/MealType.java +++ b/src/main/java/com/hsu/shimpyoo/domain/medicine/enums/MealType.java @@ -1,4 +1,4 @@ -package com.hsu.shimpyoo.domain.medicine.entity; +package com.hsu.shimpyoo.domain.medicine.enums; public enum MealType { BREAKFAST, diff --git a/src/main/java/com/hsu/shimpyoo/domain/medicine/service/MedicineService.java b/src/main/java/com/hsu/shimpyoo/domain/medicine/service/MedicineService.java index 8fa098c..c08ceae 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/medicine/service/MedicineService.java +++ b/src/main/java/com/hsu/shimpyoo/domain/medicine/service/MedicineService.java @@ -1,7 +1,7 @@ package com.hsu.shimpyoo.domain.medicine.service; import com.hsu.shimpyoo.domain.medicine.web.dto.MedicineRequestDto; -import com.hsu.shimpyoo.domain.medicine.entity.MealTiming; +import com.hsu.shimpyoo.domain.medicine.enums.MealTiming; import com.hsu.shimpyoo.domain.medicine.entity.Medicine; import com.hsu.shimpyoo.domain.medicine.repository.MedicineRepository; import com.hsu.shimpyoo.domain.medicine.web.dto.MedicineTimeSettingDto; diff --git a/src/main/java/com/hsu/shimpyoo/domain/medicine/web/dto/MedicineRequestDto.java b/src/main/java/com/hsu/shimpyoo/domain/medicine/web/dto/MedicineRequestDto.java index 9c4c4a8..90d3ddc 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/medicine/web/dto/MedicineRequestDto.java +++ b/src/main/java/com/hsu/shimpyoo/domain/medicine/web/dto/MedicineRequestDto.java @@ -1,6 +1,6 @@ package com.hsu.shimpyoo.domain.medicine.web.dto; -import com.hsu.shimpyoo.domain.medicine.entity.MealTiming; +import com.hsu.shimpyoo.domain.medicine.enums.MealTiming; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/hsu/shimpyoo/domain/medicine/web/dto/MedicineTimeSettingDto.java b/src/main/java/com/hsu/shimpyoo/domain/medicine/web/dto/MedicineTimeSettingDto.java index 90b0c3e..5ae7e29 100644 --- a/src/main/java/com/hsu/shimpyoo/domain/medicine/web/dto/MedicineTimeSettingDto.java +++ b/src/main/java/com/hsu/shimpyoo/domain/medicine/web/dto/MedicineTimeSettingDto.java @@ -1,6 +1,6 @@ package com.hsu.shimpyoo.domain.medicine.web.dto; -import com.hsu.shimpyoo.domain.medicine.entity.MealTiming; +import com.hsu.shimpyoo.domain.medicine.enums.MealTiming; import lombok.Builder; import lombok.Getter;