From cb299b4e1031bff3bd90bb5714728045ffaa3d28 Mon Sep 17 00:00:00 2001 From: Wo-ogie Date: Sat, 23 Mar 2024 10:57:28 +0900 Subject: [PATCH 1/6] =?UTF-8?q?refactor:=20#90=20=EC=9D=BC=EB=A0=89=20?= =?UTF-8?q?=EA=B8=B0=ED=83=80=EC=97=90=20=EB=8C=80=ED=95=9C=20package=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instrument/controller/InstrumentController.java | 8 ++++---- .../hertz/domain/instrument/dto/InstrumentDto.java | 2 +- .../constant/ElectricGuitarBrand.java | 2 +- .../constant/ElectricGuitarModel.java | 2 +- .../{ => electric_guitar}/dto/ElectricGuitarDto.java | 10 ++++++---- .../dto/request/CreateNewElectricGuitarRequest.java | 9 +++++---- .../dto/request/ElectricGuitarFilterConditions.java | 7 ++++--- .../dto/response/ElectricGuitarResponse.java | 10 ++++++---- .../{ => electric_guitar}/entity/ElectricGuitar.java | 7 ++++--- .../strategy/ElectricGuitarCreationStrategy.java | 7 ++++--- .../domain/instrument/mapper/InstrumentMapper.java | 6 +++--- .../repository/InstrumentRepositoryCustom.java | 4 ++-- .../repository/InstrumentRepositoryCustomImpl.java | 6 +++--- .../instrument/service/InstrumentCommandService.java | 8 ++++---- .../instrument/service/InstrumentQueryService.java | 4 ++-- .../repository/InstrumentRepositoryTest.java | 8 ++++---- .../controller/InstrumentControllerTest.java | 10 +++++----- .../service/InstrumentCommandServiceTest.java | 10 +++++----- .../service/InstrumentQueryServiceTest.java | 10 +++++----- .../java/com/ajou/hertz/util/ReflectionUtils.java | 12 ++++++------ 20 files changed, 75 insertions(+), 67 deletions(-) rename src/main/java/com/ajou/hertz/domain/instrument/{ => electric_guitar}/constant/ElectricGuitarBrand.java (73%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => electric_guitar}/constant/ElectricGuitarModel.java (68%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => electric_guitar}/dto/ElectricGuitarDto.java (78%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => electric_guitar}/dto/request/CreateNewElectricGuitarRequest.java (82%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => electric_guitar}/dto/request/ElectricGuitarFilterConditions.java (71%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => electric_guitar}/dto/response/ElectricGuitarResponse.java (79%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => electric_guitar}/entity/ElectricGuitar.java (87%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => electric_guitar}/strategy/ElectricGuitarCreationStrategy.java (50%) diff --git a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java index a82c58e..eec6d77 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java @@ -25,7 +25,7 @@ import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; @@ -36,15 +36,15 @@ import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewElectricGuitarRequest; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.ElectricGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.dto.response.BassGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.EffectorResponse; -import com.ajou.hertz.domain.instrument.dto.response.ElectricGuitarResponse; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.response.ElectricGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentSummaryResponse; import com.ajou.hertz.domain.instrument.mapper.InstrumentMapper; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java index 6922ecf..6714371 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java @@ -11,7 +11,7 @@ import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.dto.UserDto; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/ElectricGuitarBrand.java b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/constant/ElectricGuitarBrand.java similarity index 73% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/ElectricGuitarBrand.java rename to src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/constant/ElectricGuitarBrand.java index 69d65d3..114f22c 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/ElectricGuitarBrand.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/constant/ElectricGuitarBrand.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.electric_guitar.constant; public enum ElectricGuitarBrand { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/ElectricGuitarModel.java b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/constant/ElectricGuitarModel.java similarity index 68% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/ElectricGuitarModel.java rename to src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/constant/ElectricGuitarModel.java index ba8b9d5..3cfad51 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/ElectricGuitarModel.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/constant/ElectricGuitarModel.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.electric_guitar.constant; public enum ElectricGuitarModel { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/ElectricGuitarDto.java b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/ElectricGuitarDto.java similarity index 78% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/ElectricGuitarDto.java rename to src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/ElectricGuitarDto.java index 8e85cac..196c47e 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/ElectricGuitarDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/ElectricGuitarDto.java @@ -1,14 +1,16 @@ -package com.ajou.hertz.domain.instrument.dto; +package com.ajou.hertz.domain.instrument.electric_guitar.dto; import java.util.List; import com.ajou.hertz.common.dto.AddressDto; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.dto.InstrumentDto; +import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.user.dto.UserDto; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewElectricGuitarRequest.java b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/request/CreateNewElectricGuitarRequest.java similarity index 82% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewElectricGuitarRequest.java rename to src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/request/CreateNewElectricGuitarRequest.java index 130854b..da09259 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewElectricGuitarRequest.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/request/CreateNewElectricGuitarRequest.java @@ -1,15 +1,16 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.electric_guitar.dto.request; import java.util.List; import org.springframework.web.multipart.MultipartFile; import com.ajou.hertz.common.dto.request.AddressRequest; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.user.entity.User; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/ElectricGuitarFilterConditions.java b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/request/ElectricGuitarFilterConditions.java similarity index 71% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/ElectricGuitarFilterConditions.java rename to src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/request/ElectricGuitarFilterConditions.java index ca78027..3c03c63 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/ElectricGuitarFilterConditions.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/request/ElectricGuitarFilterConditions.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.electric_guitar.dto.request; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/ElectricGuitarResponse.java b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/response/ElectricGuitarResponse.java similarity index 79% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/response/ElectricGuitarResponse.java rename to src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/response/ElectricGuitarResponse.java index 13dab0f..0d55d0e 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/ElectricGuitarResponse.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/dto/response/ElectricGuitarResponse.java @@ -1,14 +1,16 @@ -package com.ajou.hertz.domain.instrument.dto.response; +package com.ajou.hertz.domain.instrument.electric_guitar.dto.response; import java.util.List; import com.ajou.hertz.common.dto.response.AddressResponse; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/entity/ElectricGuitar.java b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/entity/ElectricGuitar.java similarity index 87% rename from src/main/java/com/ajou/hertz/domain/instrument/entity/ElectricGuitar.java rename to src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/entity/ElectricGuitar.java index c7fad3d..48d47af 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/entity/ElectricGuitar.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/entity/ElectricGuitar.java @@ -1,10 +1,11 @@ -package com.ajou.hertz.domain.instrument.entity; +package com.ajou.hertz.domain.instrument.electric_guitar.entity; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.entity.User; import jakarta.persistence.Column; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/strategy/ElectricGuitarCreationStrategy.java b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/strategy/ElectricGuitarCreationStrategy.java similarity index 50% rename from src/main/java/com/ajou/hertz/domain/instrument/strategy/ElectricGuitarCreationStrategy.java rename to src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/strategy/ElectricGuitarCreationStrategy.java index d85c68a..3f23c80 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/strategy/ElectricGuitarCreationStrategy.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/electric_guitar/strategy/ElectricGuitarCreationStrategy.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.strategy; +package com.ajou.hertz.domain.instrument.electric_guitar.strategy; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewElectricGuitarRequest; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; import com.ajou.hertz.domain.user.entity.User; public class ElectricGuitarCreationStrategy diff --git a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java index 184f9d5..837a943 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java @@ -6,14 +6,14 @@ import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.dto.response.BassGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.EffectorResponse; -import com.ajou.hertz.domain.instrument.dto.response.ElectricGuitarResponse; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.response.ElectricGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentSummaryResponse; @@ -22,7 +22,7 @@ import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java index 58c44ce..2951ef5 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java @@ -8,13 +8,13 @@ import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.ElectricGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; public interface InstrumentRepositoryCustom { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java index ccbc672..d3bf4e5 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java @@ -5,7 +5,7 @@ import static com.ajou.hertz.domain.instrument.entity.QAudioEquipment.*; import static com.ajou.hertz.domain.instrument.entity.QBassGuitar.*; import static com.ajou.hertz.domain.instrument.entity.QEffector.*; -import static com.ajou.hertz.domain.instrument.entity.QElectricGuitar.*; +import static com.ajou.hertz.domain.instrument.electric_guitar.entity.QElectricGuitar.*; import static com.ajou.hertz.domain.user.entity.QUser.*; import java.util.ArrayList; @@ -25,14 +25,14 @@ import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.ElectricGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.entity.User; import com.querydsl.core.types.Order; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java index 1e7524f..7eaf969 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java @@ -11,20 +11,20 @@ import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewElectricGuitarRequest; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.entity.InstrumentHashtag; import com.ajou.hertz.domain.instrument.entity.InstrumentImage; @@ -37,7 +37,7 @@ import com.ajou.hertz.domain.instrument.strategy.AudioEquipmentCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.BassGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.EffectorCreationStrategy; -import com.ajou.hertz.domain.instrument.strategy.ElectricGuitarCreationStrategy; +import com.ajou.hertz.domain.instrument.electric_guitar.strategy.ElectricGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; import com.ajou.hertz.domain.user.entity.User; import com.ajou.hertz.domain.user.service.UserQueryService; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java index e2e04b7..6735912 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java @@ -11,14 +11,14 @@ import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.ElectricGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.exception.InstrumentNotFoundByIdException; import com.ajou.hertz.domain.instrument.mapper.InstrumentMapper; diff --git a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java index 2d35aad..7da6f37 100644 --- a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java +++ b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java @@ -30,8 +30,8 @@ import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; @@ -40,13 +40,13 @@ import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.ElectricGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.repository.InstrumentRepository; import com.ajou.hertz.domain.user.constant.Gender; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java index 0b08e5f..a40b06d 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java @@ -42,8 +42,8 @@ import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; @@ -54,7 +54,7 @@ import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; @@ -66,9 +66,9 @@ import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewElectricGuitarRequest; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.ElectricGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.service.InstrumentCommandService; import com.ajou.hertz.domain.instrument.service.InstrumentQueryService; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java index 6d56044..22c4569 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java @@ -34,8 +34,8 @@ import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; @@ -43,19 +43,19 @@ import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewElectricGuitarRequest; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.entity.InstrumentHashtag; import com.ajou.hertz.domain.instrument.entity.InstrumentImage; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java index 7313490..abcec6c 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java @@ -33,8 +33,8 @@ import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; @@ -44,20 +44,20 @@ import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.ElectricGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.exception.InstrumentNotFoundByIdException; import com.ajou.hertz.domain.instrument.repository.InstrumentRepository; diff --git a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java index 0dc8ca6..6539f1b 100644 --- a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java +++ b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java @@ -31,8 +31,8 @@ import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.ElectricGuitarModel; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; +import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; @@ -40,7 +40,7 @@ import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; -import com.ajou.hertz.domain.instrument.dto.ElectricGuitarDto; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; @@ -51,16 +51,16 @@ import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewElectricGuitarRequest; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.ElectricGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; -import com.ajou.hertz.domain.instrument.entity.ElectricGuitar; +import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.entity.InstrumentHashtag; import com.ajou.hertz.domain.instrument.entity.InstrumentImage; From 2d79fc0ce8ed58f2ab8f4d1d4fc2433d777b063d Mon Sep 17 00:00:00 2001 From: Wo-ogie Date: Sat, 23 Mar 2024 11:06:01 +0900 Subject: [PATCH 2/6] =?UTF-8?q?refactor:=20#90=20=EB=B2=A0=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=EA=B8=B0=ED=83=80=20pacakge=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/BassGuitarBrand.java | 2 +- .../constant/BassGuitarPickUp.java | 2 +- .../constant/BassGuitarPreAmplifier.java | 2 +- .../{ => bass_guitar}/dto/BassGuitarDto.java | 12 +++++++----- .../dto/request/BassGuitarFilterConditions.java | 9 +++++---- .../dto/request/CreateNewBassGuitarRequest.java | 11 ++++++----- .../dto/response/BassGuitarResponse.java | 12 +++++++----- .../{ => bass_guitar}/entity/BassGuitar.java | 9 +++++---- .../strategy/BassGuitarCreationStrategy.java | 7 ++++--- .../controller/InstrumentController.java | 8 ++++---- .../hertz/domain/instrument/dto/InstrumentDto.java | 2 +- .../domain/instrument/mapper/InstrumentMapper.java | 6 +++--- .../repository/InstrumentRepositoryCustom.java | 4 ++-- .../repository/InstrumentRepositoryCustomImpl.java | 6 +++--- .../service/InstrumentCommandService.java | 8 ++++---- .../instrument/service/InstrumentQueryService.java | 4 ++-- .../repository/InstrumentRepositoryTest.java | 10 +++++----- .../controller/InstrumentControllerTest.java | 12 ++++++------ .../service/InstrumentCommandServiceTest.java | 12 ++++++------ .../service/InstrumentImageCommandServiceTest.java | 8 ++++---- .../service/InstrumentImageQueryServiceTest.java | 8 ++++---- .../service/InstrumentQueryServiceTest.java | 12 ++++++------ .../java/com/ajou/hertz/util/ReflectionUtils.java | 14 +++++++------- 23 files changed, 94 insertions(+), 86 deletions(-) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/constant/BassGuitarBrand.java (73%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/constant/BassGuitarPickUp.java (54%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/constant/BassGuitarPreAmplifier.java (53%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/dto/BassGuitarDto.java (76%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/dto/request/BassGuitarFilterConditions.java (70%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/dto/request/CreateNewBassGuitarRequest.java (79%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/dto/response/BassGuitarResponse.java (77%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/entity/BassGuitar.java (85%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => bass_guitar}/strategy/BassGuitarCreationStrategy.java (50%) diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarBrand.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarBrand.java similarity index 73% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarBrand.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarBrand.java index ed5adc9..5a6c1e4 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarBrand.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarBrand.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.bass_guitar.constant; public enum BassGuitarBrand { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarPickUp.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarPickUp.java similarity index 54% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarPickUp.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarPickUp.java index fa90351..3f317cc 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarPickUp.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarPickUp.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.bass_guitar.constant; public enum BassGuitarPickUp { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarPreAmplifier.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarPreAmplifier.java similarity index 53% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarPreAmplifier.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarPreAmplifier.java index 7ecf76d..ebd8393 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/BassGuitarPreAmplifier.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/constant/BassGuitarPreAmplifier.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.bass_guitar.constant; public enum BassGuitarPreAmplifier { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/BassGuitarDto.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/BassGuitarDto.java similarity index 76% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/BassGuitarDto.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/BassGuitarDto.java index d9f1db8..b79a44c 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/BassGuitarDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/BassGuitarDto.java @@ -1,15 +1,17 @@ -package com.ajou.hertz.domain.instrument.dto; +package com.ajou.hertz.domain.instrument.bass_guitar.dto; import java.util.List; import com.ajou.hertz.common.dto.AddressDto; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.dto.InstrumentDto; +import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.user.dto.UserDto; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/BassGuitarFilterConditions.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/request/BassGuitarFilterConditions.java similarity index 70% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/BassGuitarFilterConditions.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/request/BassGuitarFilterConditions.java index e03f7cd..a1fdc24 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/BassGuitarFilterConditions.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/request/BassGuitarFilterConditions.java @@ -1,10 +1,11 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.bass_guitar.dto.request; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewBassGuitarRequest.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/request/CreateNewBassGuitarRequest.java similarity index 79% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewBassGuitarRequest.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/request/CreateNewBassGuitarRequest.java index 0c3ab88..1e972ef 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewBassGuitarRequest.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/request/CreateNewBassGuitarRequest.java @@ -1,16 +1,17 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.bass_guitar.dto.request; import java.util.List; import org.springframework.web.multipart.MultipartFile; import com.ajou.hertz.common.dto.request.AddressRequest; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.user.entity.User; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/BassGuitarResponse.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/response/BassGuitarResponse.java similarity index 77% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/response/BassGuitarResponse.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/response/BassGuitarResponse.java index 51d5f4e..430ebf0 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/BassGuitarResponse.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/dto/response/BassGuitarResponse.java @@ -1,15 +1,17 @@ -package com.ajou.hertz.domain.instrument.dto.response; +package com.ajou.hertz.domain.instrument.bass_guitar.dto.response; import java.util.List; import com.ajou.hertz.common.dto.response.AddressResponse; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/entity/BassGuitar.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/entity/BassGuitar.java similarity index 85% rename from src/main/java/com/ajou/hertz/domain/instrument/entity/BassGuitar.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/entity/BassGuitar.java index 17004a8..a5a502a 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/entity/BassGuitar.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/entity/BassGuitar.java @@ -1,11 +1,12 @@ -package com.ajou.hertz.domain.instrument.entity; +package com.ajou.hertz.domain.instrument.bass_guitar.entity; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.entity.User; import jakarta.persistence.Column; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/strategy/BassGuitarCreationStrategy.java b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/strategy/BassGuitarCreationStrategy.java similarity index 50% rename from src/main/java/com/ajou/hertz/domain/instrument/strategy/BassGuitarCreationStrategy.java rename to src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/strategy/BassGuitarCreationStrategy.java index 1971d76..e0c87a5 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/strategy/BassGuitarCreationStrategy.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/bass_guitar/strategy/BassGuitarCreationStrategy.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.strategy; +package com.ajou.hertz.domain.instrument.bass_guitar.strategy; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; import com.ajou.hertz.domain.user.entity.User; public class BassGuitarCreationStrategy implements InstrumentCreationStrategy { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java index eec6d77..74ef2cf 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java @@ -23,18 +23,18 @@ import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; @@ -42,7 +42,7 @@ import com.ajou.hertz.domain.instrument.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; -import com.ajou.hertz.domain.instrument.dto.response.BassGuitarResponse; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.EffectorResponse; import com.ajou.hertz.domain.instrument.electric_guitar.dto.response.ElectricGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java index 6714371..d2f83d7 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java @@ -9,7 +9,7 @@ import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java index 837a943..cf203e2 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java @@ -4,14 +4,14 @@ import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; -import com.ajou.hertz.domain.instrument.dto.response.BassGuitarResponse; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.EffectorResponse; import com.ajou.hertz.domain.instrument.electric_guitar.dto.response.ElectricGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; @@ -20,7 +20,7 @@ import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java index 2951ef5..6c39a2f 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java @@ -6,13 +6,13 @@ import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java index d3bf4e5..2fa25a6 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java @@ -3,7 +3,7 @@ import static com.ajou.hertz.domain.instrument.entity.QAcousticAndClassicGuitar.*; import static com.ajou.hertz.domain.instrument.entity.QAmplifier.*; import static com.ajou.hertz.domain.instrument.entity.QAudioEquipment.*; -import static com.ajou.hertz.domain.instrument.entity.QBassGuitar.*; +import static com.ajou.hertz.domain.instrument.bass_guitar.entity.QBassGuitar.*; import static com.ajou.hertz.domain.instrument.entity.QEffector.*; import static com.ajou.hertz.domain.instrument.electric_guitar.entity.QElectricGuitar.*; import static com.ajou.hertz.domain.user.entity.QUser.*; @@ -23,14 +23,14 @@ import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java index 7eaf969..2d8152e 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java @@ -9,20 +9,20 @@ import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; @@ -35,7 +35,7 @@ import com.ajou.hertz.domain.instrument.strategy.AcousticAndClassicGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.AmplifierCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.AudioEquipmentCreationStrategy; -import com.ajou.hertz.domain.instrument.strategy.BassGuitarCreationStrategy; +import com.ajou.hertz.domain.instrument.bass_guitar.strategy.BassGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.EffectorCreationStrategy; import com.ajou.hertz.domain.instrument.electric_guitar.strategy.ElectricGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java index 6735912..451e7f4 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java @@ -9,14 +9,14 @@ import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.Instrument; diff --git a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java index 7da6f37..1408150 100644 --- a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java +++ b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java @@ -25,9 +25,9 @@ import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; @@ -38,13 +38,13 @@ import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java index a40b06d..3b89616 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java @@ -37,9 +37,9 @@ import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; @@ -52,7 +52,7 @@ import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; @@ -60,11 +60,11 @@ import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java index 22c4569..d30d54f 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java @@ -29,9 +29,9 @@ import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; @@ -41,19 +41,19 @@ import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentImageCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentImageCommandServiceTest.java index 89c65d7..90f7d6c 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentImageCommandServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentImageCommandServiceTest.java @@ -21,12 +21,12 @@ import com.ajou.hertz.common.entity.Address; import com.ajou.hertz.common.file.dto.FileDto; import com.ajou.hertz.common.file.service.FileService; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.entity.InstrumentImage; import com.ajou.hertz.domain.instrument.repository.InstrumentImageRepository; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentImageQueryServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentImageQueryServiceTest.java index 4cc1a04..33c7511 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentImageQueryServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentImageQueryServiceTest.java @@ -15,12 +15,12 @@ import org.mockito.junit.jupiter.MockitoExtension; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.entity.InstrumentImage; import com.ajou.hertz.domain.instrument.repository.InstrumentImageRepository; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java index abcec6c..77112c6 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java @@ -28,9 +28,9 @@ import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; @@ -42,20 +42,20 @@ import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; diff --git a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java index 6539f1b..d2f13fb 100644 --- a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java +++ b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java @@ -26,9 +26,9 @@ import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; -import com.ajou.hertz.domain.instrument.constant.BassGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.BassGuitarPreAmplifier; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; +import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; import com.ajou.hertz.domain.instrument.constant.EffectorFeature; import com.ajou.hertz.domain.instrument.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; @@ -38,18 +38,18 @@ import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; -import com.ajou.hertz.domain.instrument.dto.BassGuitarDto; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.BassGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewBassGuitarRequest; +import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; @@ -58,7 +58,7 @@ import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; -import com.ajou.hertz.domain.instrument.entity.BassGuitar; +import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; From 907f57f6c9ac59a68ea178c1db27db6aaec88abc Mon Sep 17 00:00:00 2001 From: Wo-ogie Date: Sat, 23 Mar 2024 11:08:30 +0900 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=20#90=20=EC=96=B4=EC=BF=A0?= =?UTF-8?q?=EC=8A=A4=ED=8B=B1&=ED=81=B4=EB=9E=98=EC=8B=9D=20=EA=B8=B0?= =?UTF-8?q?=ED=83=80=20package=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/AcousticAndClassicGuitarBrand.java | 4 +++- .../constant/AcousticAndClassicGuitarModel.java | 2 +- .../constant/AcousticAndClassicGuitarPickUp.java | 2 +- .../constant/AcousticAndClassicGuitarWood.java | 2 +- .../dto/AcousticAndClassicGuitarDto.java | 14 ++++++++------ ...AcousticAndClassicGuitarFilterConditions.java | 11 ++++++----- ...CreateNewAcousticAndClassicGuitarRequest.java | 13 +++++++------ .../AcousticAndClassicGuitarResponse.java | 14 ++++++++------ .../entity/AcousticAndClassicGuitar.java | 11 ++++++----- ...AcousticAndClassicGuitarCreationStrategy.java | 7 ++++--- .../controller/InstrumentController.java | 8 ++++---- .../domain/instrument/dto/InstrumentDto.java | 2 +- .../instrument/mapper/InstrumentMapper.java | 6 +++--- .../repository/InstrumentRepositoryCustom.java | 4 ++-- .../InstrumentRepositoryCustomImpl.java | 6 +++--- .../service/InstrumentCommandService.java | 8 ++++---- .../service/InstrumentQueryService.java | 4 ++-- .../repository/InstrumentRepositoryTest.java | 12 ++++++------ .../controller/InstrumentControllerTest.java | 14 +++++++------- .../service/InstrumentCommandServiceTest.java | 14 +++++++------- .../service/InstrumentQueryServiceTest.java | 14 +++++++------- .../com/ajou/hertz/util/ReflectionUtils.java | 16 ++++++++-------- 22 files changed, 99 insertions(+), 89 deletions(-) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/constant/AcousticAndClassicGuitarBrand.java (78%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/constant/AcousticAndClassicGuitarModel.java (60%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/constant/AcousticAndClassicGuitarPickUp.java (74%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/constant/AcousticAndClassicGuitarWood.java (54%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/dto/AcousticAndClassicGuitarDto.java (70%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/dto/request/AcousticAndClassicGuitarFilterConditions.java (61%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/dto/request/CreateNewAcousticAndClassicGuitarRequest.java (72%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/dto/response/AcousticAndClassicGuitarResponse.java (71%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/entity/AcousticAndClassicGuitar.java (79%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => acoustic_and_classic_guitar}/strategy/AcousticAndClassicGuitarCreationStrategy.java (50%) diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarBrand.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarBrand.java similarity index 78% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarBrand.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarBrand.java index 68e6172..71a614b 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarBrand.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarBrand.java @@ -1,7 +1,9 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant; import static com.ajou.hertz.domain.instrument.constant.ProductOrigin.*; +import com.ajou.hertz.domain.instrument.constant.ProductOrigin; + import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarModel.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarModel.java similarity index 60% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarModel.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarModel.java index 9fdfd42..3a81577 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarModel.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarModel.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant; public enum AcousticAndClassicGuitarModel { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarPickUp.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarPickUp.java similarity index 74% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarPickUp.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarPickUp.java index eeb8d84..a3a96e1 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarPickUp.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarPickUp.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarWood.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarWood.java similarity index 54% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarWood.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarWood.java index d080fce..2fef904 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/AcousticAndClassicGuitarWood.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/constant/AcousticAndClassicGuitarWood.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant; public enum AcousticAndClassicGuitarWood { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/AcousticAndClassicGuitarDto.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/AcousticAndClassicGuitarDto.java similarity index 70% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/AcousticAndClassicGuitarDto.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/AcousticAndClassicGuitarDto.java index 811f7de..d5cbeb9 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/AcousticAndClassicGuitarDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/AcousticAndClassicGuitarDto.java @@ -1,15 +1,17 @@ -package com.ajou.hertz.domain.instrument.dto; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto; import java.util.List; import com.ajou.hertz.common.dto.AddressDto; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.dto.InstrumentDto; +import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.user.dto.UserDto; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/AcousticAndClassicGuitarFilterConditions.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/request/AcousticAndClassicGuitarFilterConditions.java similarity index 61% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/AcousticAndClassicGuitarFilterConditions.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/request/AcousticAndClassicGuitarFilterConditions.java index e35cd06..d430f9d 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/AcousticAndClassicGuitarFilterConditions.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/request/AcousticAndClassicGuitarFilterConditions.java @@ -1,10 +1,11 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAcousticAndClassicGuitarRequest.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/request/CreateNewAcousticAndClassicGuitarRequest.java similarity index 72% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAcousticAndClassicGuitarRequest.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/request/CreateNewAcousticAndClassicGuitarRequest.java index a4429a6..e30f528 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAcousticAndClassicGuitarRequest.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/request/CreateNewAcousticAndClassicGuitarRequest.java @@ -1,16 +1,17 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request; import java.util.List; import org.springframework.web.multipart.MultipartFile; import com.ajou.hertz.common.dto.request.AddressRequest; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.user.entity.User; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/AcousticAndClassicGuitarResponse.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/response/AcousticAndClassicGuitarResponse.java similarity index 71% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/response/AcousticAndClassicGuitarResponse.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/response/AcousticAndClassicGuitarResponse.java index bbcafcf..8248462 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/AcousticAndClassicGuitarResponse.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/dto/response/AcousticAndClassicGuitarResponse.java @@ -1,15 +1,17 @@ -package com.ajou.hertz.domain.instrument.dto.response; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response; import java.util.List; import com.ajou.hertz.common.dto.response.AddressResponse; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/entity/AcousticAndClassicGuitar.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/entity/AcousticAndClassicGuitar.java similarity index 79% rename from src/main/java/com/ajou/hertz/domain/instrument/entity/AcousticAndClassicGuitar.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/entity/AcousticAndClassicGuitar.java index fad70b8..dd1e93d 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/entity/AcousticAndClassicGuitar.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/entity/AcousticAndClassicGuitar.java @@ -1,11 +1,12 @@ -package com.ajou.hertz.domain.instrument.entity; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.entity.User; import jakarta.persistence.Column; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/strategy/AcousticAndClassicGuitarCreationStrategy.java b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/strategy/AcousticAndClassicGuitarCreationStrategy.java similarity index 50% rename from src/main/java/com/ajou/hertz/domain/instrument/strategy/AcousticAndClassicGuitarCreationStrategy.java rename to src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/strategy/AcousticAndClassicGuitarCreationStrategy.java index 2a07fda..4635de3 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/strategy/AcousticAndClassicGuitarCreationStrategy.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/acoustic_and_classic_guitar/strategy/AcousticAndClassicGuitarCreationStrategy.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.strategy; +package com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.strategy; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; import com.ajou.hertz.domain.user.entity.User; public class AcousticAndClassicGuitarCreationStrategy diff --git a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java index 74ef2cf..603d61b 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java @@ -20,18 +20,18 @@ import com.ajou.hertz.common.auth.UserPrincipal; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; -import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; @@ -39,7 +39,7 @@ import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.response.AcousticAndClassicGuitarResponse; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java index d2f83d7..97338e4 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java @@ -6,7 +6,7 @@ import com.ajou.hertz.common.dto.AddressDto; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java index cf203e2..048cb12 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java @@ -1,14 +1,14 @@ package com.ajou.hertz.domain.instrument.mapper; import com.ajou.hertz.common.dto.response.AddressResponse; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; -import com.ajou.hertz.domain.instrument.dto.response.AcousticAndClassicGuitarResponse; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; @@ -17,7 +17,7 @@ import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentSummaryResponse; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java index 6c39a2f..f05f8ee 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java @@ -3,13 +3,13 @@ import org.springframework.data.domain.Page; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; -import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java index 2fa25a6..a2a993f 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java @@ -1,6 +1,6 @@ package com.ajou.hertz.domain.instrument.repository; -import static com.ajou.hertz.domain.instrument.entity.QAcousticAndClassicGuitar.*; +import static com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.QAcousticAndClassicGuitar.*; import static com.ajou.hertz.domain.instrument.entity.QAmplifier.*; import static com.ajou.hertz.domain.instrument.entity.QAudioEquipment.*; import static com.ajou.hertz.domain.instrument.bass_guitar.entity.QBassGuitar.*; @@ -20,14 +20,14 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; -import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java index 2d8152e..04954d5 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java @@ -6,20 +6,20 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; @@ -32,7 +32,7 @@ import com.ajou.hertz.domain.instrument.mapper.InstrumentMapper; import com.ajou.hertz.domain.instrument.repository.InstrumentHashtagRepository; import com.ajou.hertz.domain.instrument.repository.InstrumentRepository; -import com.ajou.hertz.domain.instrument.strategy.AcousticAndClassicGuitarCreationStrategy; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.strategy.AcousticAndClassicGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.AmplifierCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.AudioEquipmentCreationStrategy; import com.ajou.hertz.domain.instrument.bass_guitar.strategy.BassGuitarCreationStrategy; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java index 451e7f4..2b8666e 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java @@ -6,14 +6,14 @@ import org.springframework.transaction.annotation.Transactional; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; -import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; diff --git a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java index 1408150..fe4a86b 100644 --- a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java +++ b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java @@ -17,10 +17,10 @@ import com.ajou.hertz.common.config.JpaConfig; import com.ajou.hertz.common.config.QuerydslConfig; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; @@ -35,13 +35,13 @@ import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; -import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java index 3b89616..16f752a 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java @@ -29,10 +29,10 @@ import com.ajou.hertz.common.dto.AddressDto; import com.ajou.hertz.common.dto.request.AddressRequest; import com.ajou.hertz.config.ControllerTestConfig; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; @@ -49,7 +49,7 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.controller.InstrumentController; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; @@ -57,11 +57,11 @@ import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; -import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java index d30d54f..f5d7361 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java @@ -21,10 +21,10 @@ import com.ajou.hertz.common.dto.request.AddressRequest; import com.ajou.hertz.common.entity.Address; import com.ajou.hertz.common.file.dto.FileDto; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; @@ -38,19 +38,19 @@ import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java index 77112c6..02e6fa2 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java @@ -20,10 +20,10 @@ import org.springframework.data.domain.Pageable; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; @@ -39,20 +39,20 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; -import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; diff --git a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java index d2f13fb..0421d72 100644 --- a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java +++ b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java @@ -18,10 +18,10 @@ import com.ajou.hertz.domain.administrative_area.entity.AdministrativeAreaEmd; import com.ajou.hertz.domain.administrative_area.entity.AdministrativeAreaSgg; import com.ajou.hertz.domain.administrative_area.entity.AdministrativeAreaSido; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarBrand; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarModel; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarPickUp; -import com.ajou.hertz.domain.instrument.constant.AcousticAndClassicGuitarWood; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarBrand; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.constant.AmplifierType; import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; @@ -35,18 +35,18 @@ import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.dto.AcousticAndClassicGuitarDto; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; -import com.ajou.hertz.domain.instrument.dto.request.AcousticAndClassicGuitarFilterConditions; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAcousticAndClassicGuitarRequest; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; @@ -55,7 +55,7 @@ import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; -import com.ajou.hertz.domain.instrument.entity.AcousticAndClassicGuitar; +import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; From aedb5f10c478363a608e97dc5c65bb679b3b4401 Mon Sep 17 00:00:00 2001 From: Wo-ogie Date: Sat, 23 Mar 2024 11:10:29 +0900 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20#90=20=EC=9D=B4=ED=8E=99?= =?UTF-8?q?=ED=84=B0=20package=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instrument/controller/InstrumentController.java | 8 ++++---- .../hertz/domain/instrument/dto/InstrumentDto.java | 2 +- .../{ => effector}/constant/EffectorFeature.java | 4 ++-- .../{ => effector}/constant/EffectorType.java | 2 +- .../instrument/{ => effector}/dto/EffectorDto.java | 10 ++++++---- .../dto/request/CreateNewEffectorRequest.java | 9 +++++---- .../dto/request/EffectorFilterConditions.java | 7 ++++--- .../dto/response/EffectorResponse.java | 10 ++++++---- .../instrument/{ => effector}/entity/Effector.java | 7 ++++--- .../strategy/EffectorCreationStrategy.java | 7 ++++--- .../domain/instrument/mapper/InstrumentMapper.java | 6 +++--- .../repository/InstrumentRepositoryCustom.java | 4 ++-- .../repository/InstrumentRepositoryCustomImpl.java | 6 +++--- .../instrument/service/InstrumentCommandService.java | 8 ++++---- .../instrument/service/InstrumentQueryService.java | 4 ++-- .../repository/InstrumentRepositoryTest.java | 8 ++++---- .../controller/InstrumentControllerTest.java | 10 +++++----- .../service/InstrumentCommandServiceTest.java | 10 +++++----- .../service/InstrumentQueryServiceTest.java | 10 +++++----- .../java/com/ajou/hertz/util/ReflectionUtils.java | 12 ++++++------ 20 files changed, 76 insertions(+), 68 deletions(-) rename src/main/java/com/ajou/hertz/domain/instrument/{ => effector}/constant/EffectorFeature.java (87%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => effector}/constant/EffectorType.java (52%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => effector}/dto/EffectorDto.java (75%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => effector}/dto/request/CreateNewEffectorRequest.java (80%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => effector}/dto/request/EffectorFilterConditions.java (69%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => effector}/dto/response/EffectorResponse.java (76%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => effector}/entity/Effector.java (85%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => effector}/strategy/EffectorCreationStrategy.java (50%) diff --git a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java index 603d61b..a8e743a 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java @@ -24,7 +24,7 @@ import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; @@ -35,15 +35,15 @@ import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; +import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; +import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; -import com.ajou.hertz.domain.instrument.dto.response.EffectorResponse; +import com.ajou.hertz.domain.instrument.effector.dto.response.EffectorResponse; import com.ajou.hertz.domain.instrument.electric_guitar.dto.response.ElectricGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentSummaryResponse; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java index 97338e4..5e2af02 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java @@ -10,7 +10,7 @@ import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.dto.UserDto; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/EffectorFeature.java b/src/main/java/com/ajou/hertz/domain/instrument/effector/constant/EffectorFeature.java similarity index 87% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/EffectorFeature.java rename to src/main/java/com/ajou/hertz/domain/instrument/effector/constant/EffectorFeature.java index 4093946..d795586 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/EffectorFeature.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/effector/constant/EffectorFeature.java @@ -1,6 +1,6 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.effector.constant; -import static com.ajou.hertz.domain.instrument.constant.EffectorType.*; +import static com.ajou.hertz.domain.instrument.effector.constant.EffectorType.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/EffectorType.java b/src/main/java/com/ajou/hertz/domain/instrument/effector/constant/EffectorType.java similarity index 52% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/EffectorType.java rename to src/main/java/com/ajou/hertz/domain/instrument/effector/constant/EffectorType.java index 6023e8c..bcb078d 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/EffectorType.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/effector/constant/EffectorType.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.effector.constant; public enum EffectorType { GUITAR, diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/EffectorDto.java b/src/main/java/com/ajou/hertz/domain/instrument/effector/dto/EffectorDto.java similarity index 75% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/EffectorDto.java rename to src/main/java/com/ajou/hertz/domain/instrument/effector/dto/EffectorDto.java index 4d7618b..2bf799a 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/EffectorDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/effector/dto/EffectorDto.java @@ -1,13 +1,15 @@ -package com.ajou.hertz.domain.instrument.dto; +package com.ajou.hertz.domain.instrument.effector.dto; import java.util.List; import com.ajou.hertz.common.dto.AddressDto; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.dto.InstrumentDto; +import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.user.dto.UserDto; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewEffectorRequest.java b/src/main/java/com/ajou/hertz/domain/instrument/effector/dto/request/CreateNewEffectorRequest.java similarity index 80% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewEffectorRequest.java rename to src/main/java/com/ajou/hertz/domain/instrument/effector/dto/request/CreateNewEffectorRequest.java index e70a98a..8396f19 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewEffectorRequest.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/effector/dto/request/CreateNewEffectorRequest.java @@ -1,14 +1,15 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.effector.dto.request; import java.util.List; import org.springframework.web.multipart.MultipartFile; import com.ajou.hertz.common.dto.request.AddressRequest; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.user.entity.User; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/EffectorFilterConditions.java b/src/main/java/com/ajou/hertz/domain/instrument/effector/dto/request/EffectorFilterConditions.java similarity index 69% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/EffectorFilterConditions.java rename to src/main/java/com/ajou/hertz/domain/instrument/effector/dto/request/EffectorFilterConditions.java index 0e80f3e..9ea430d 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/EffectorFilterConditions.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/effector/dto/request/EffectorFilterConditions.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.effector.dto.request; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/EffectorResponse.java b/src/main/java/com/ajou/hertz/domain/instrument/effector/dto/response/EffectorResponse.java similarity index 76% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/response/EffectorResponse.java rename to src/main/java/com/ajou/hertz/domain/instrument/effector/dto/response/EffectorResponse.java index 15de107..42f57c5 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/EffectorResponse.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/effector/dto/response/EffectorResponse.java @@ -1,13 +1,15 @@ -package com.ajou.hertz.domain.instrument.dto.response; +package com.ajou.hertz.domain.instrument.effector.dto.response; import java.util.List; import com.ajou.hertz.common.dto.response.AddressResponse; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/entity/Effector.java b/src/main/java/com/ajou/hertz/domain/instrument/effector/entity/Effector.java similarity index 85% rename from src/main/java/com/ajou/hertz/domain/instrument/entity/Effector.java rename to src/main/java/com/ajou/hertz/domain/instrument/effector/entity/Effector.java index d3136c0..9f87d7b 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/entity/Effector.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/effector/entity/Effector.java @@ -1,9 +1,10 @@ -package com.ajou.hertz.domain.instrument.entity; +package com.ajou.hertz.domain.instrument.effector.entity; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.entity.User; import jakarta.persistence.Column; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/strategy/EffectorCreationStrategy.java b/src/main/java/com/ajou/hertz/domain/instrument/effector/strategy/EffectorCreationStrategy.java similarity index 50% rename from src/main/java/com/ajou/hertz/domain/instrument/strategy/EffectorCreationStrategy.java rename to src/main/java/com/ajou/hertz/domain/instrument/effector/strategy/EffectorCreationStrategy.java index 39b8f50..ce85b99 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/strategy/EffectorCreationStrategy.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/effector/strategy/EffectorCreationStrategy.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.strategy; +package com.ajou.hertz.domain.instrument.effector.strategy; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; +import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; import com.ajou.hertz.domain.user.entity.User; public class EffectorCreationStrategy implements InstrumentCreationStrategy { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java index 048cb12..5fd3a55 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java @@ -5,14 +5,14 @@ import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; -import com.ajou.hertz.domain.instrument.dto.response.EffectorResponse; +import com.ajou.hertz.domain.instrument.effector.dto.response.EffectorResponse; import com.ajou.hertz.domain.instrument.electric_guitar.dto.response.ElectricGuitarResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; @@ -21,7 +21,7 @@ import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java index f05f8ee..284156f 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java @@ -7,13 +7,13 @@ import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; +import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; public interface InstrumentRepositoryCustom { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java index a2a993f..ced0c2d 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java @@ -4,7 +4,7 @@ import static com.ajou.hertz.domain.instrument.entity.QAmplifier.*; import static com.ajou.hertz.domain.instrument.entity.QAudioEquipment.*; import static com.ajou.hertz.domain.instrument.bass_guitar.entity.QBassGuitar.*; -import static com.ajou.hertz.domain.instrument.entity.QEffector.*; +import static com.ajou.hertz.domain.instrument.effector.entity.QEffector.*; import static com.ajou.hertz.domain.instrument.electric_guitar.entity.QElectricGuitar.*; import static com.ajou.hertz.domain.user.entity.QUser.*; @@ -24,14 +24,14 @@ import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; +import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.entity.User; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java index 04954d5..37e99ae 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java @@ -10,20 +10,20 @@ import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; +import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.entity.InstrumentHashtag; @@ -36,7 +36,7 @@ import com.ajou.hertz.domain.instrument.strategy.AmplifierCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.AudioEquipmentCreationStrategy; import com.ajou.hertz.domain.instrument.bass_guitar.strategy.BassGuitarCreationStrategy; -import com.ajou.hertz.domain.instrument.strategy.EffectorCreationStrategy; +import com.ajou.hertz.domain.instrument.effector.strategy.EffectorCreationStrategy; import com.ajou.hertz.domain.instrument.electric_guitar.strategy.ElectricGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; import com.ajou.hertz.domain.user.entity.User; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java index 2b8666e..1813551 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java @@ -10,14 +10,14 @@ import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; +import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.exception.InstrumentNotFoundByIdException; diff --git a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java index fe4a86b..2b2529f 100644 --- a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java +++ b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java @@ -28,8 +28,8 @@ import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; @@ -39,13 +39,13 @@ import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; +import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.repository.InstrumentRepository; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java index 16f752a..3cb55dd 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java @@ -40,8 +40,8 @@ import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; @@ -53,7 +53,7 @@ import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; @@ -65,9 +65,9 @@ import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; +import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; +import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.service.InstrumentCommandService; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java index f5d7361..5df74bd 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java @@ -32,8 +32,8 @@ import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; @@ -42,19 +42,19 @@ import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; +import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.entity.InstrumentHashtag; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java index 02e6fa2..c854c5e 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java @@ -31,8 +31,8 @@ import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; @@ -43,20 +43,20 @@ import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; +import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.exception.InstrumentNotFoundByIdException; diff --git a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java index 0421d72..8b81c35 100644 --- a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java +++ b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java @@ -29,8 +29,8 @@ import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; -import com.ajou.hertz.domain.instrument.constant.EffectorFeature; -import com.ajou.hertz.domain.instrument.constant.EffectorType; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorFeature; +import com.ajou.hertz.domain.instrument.effector.constant.EffectorType; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarBrand; import com.ajou.hertz.domain.instrument.electric_guitar.constant.ElectricGuitarModel; import com.ajou.hertz.domain.instrument.constant.GuitarColor; @@ -39,7 +39,7 @@ import com.ajou.hertz.domain.instrument.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; -import com.ajou.hertz.domain.instrument.dto.EffectorDto; +import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; @@ -50,16 +50,16 @@ import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewEffectorRequest; +import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.EffectorFilterConditions; +import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; -import com.ajou.hertz.domain.instrument.entity.Effector; +import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.instrument.entity.InstrumentHashtag; From 151a01b5b081af1324c09a5c0baa85e593c33925 Mon Sep 17 00:00:00 2001 From: Wo-ogie Date: Sat, 23 Mar 2024 11:11:36 +0900 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20#90=20=EC=95=B0=ED=94=84=20pack?= =?UTF-8?q?age=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => amplifier}/constant/AmplifierBrand.java | 2 +- .../amplifier/constant/AmplifierType.java | 7 +++++++ .../{ => amplifier}/constant/AmplifierUsage.java | 2 +- .../{ => amplifier}/dto/AmplifierDto.java | 12 +++++++----- .../dto/request/AmplifierFilterConditions.java | 9 +++++---- .../dto/request/CreateNewAmplifierRequest.java | 11 ++++++----- .../dto/response/AmplifierResponse.java | 12 +++++++----- .../{ => amplifier}/entity/Amplifier.java | 9 +++++---- .../strategy/AmplifierCreationStrategy.java | 7 ++++--- .../domain/instrument/constant/AmplifierType.java | 7 ------- .../controller/InstrumentController.java | 8 ++++---- .../hertz/domain/instrument/dto/InstrumentDto.java | 2 +- .../domain/instrument/mapper/InstrumentMapper.java | 6 +++--- .../repository/InstrumentRepositoryCustom.java | 4 ++-- .../repository/InstrumentRepositoryCustomImpl.java | 6 +++--- .../service/InstrumentCommandService.java | 8 ++++---- .../instrument/service/InstrumentQueryService.java | 4 ++-- .../repository/InstrumentRepositoryTest.java | 10 +++++----- .../controller/InstrumentControllerTest.java | 12 ++++++------ .../service/InstrumentCommandServiceTest.java | 12 ++++++------ .../service/InstrumentQueryServiceTest.java | 12 ++++++------ .../java/com/ajou/hertz/util/ReflectionUtils.java | 14 +++++++------- 22 files changed, 92 insertions(+), 84 deletions(-) rename src/main/java/com/ajou/hertz/domain/instrument/{ => amplifier}/constant/AmplifierBrand.java (68%) create mode 100644 src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierType.java rename src/main/java/com/ajou/hertz/domain/instrument/{ => amplifier}/constant/AmplifierUsage.java (73%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => amplifier}/dto/AmplifierDto.java (73%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => amplifier}/dto/request/AmplifierFilterConditions.java (66%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => amplifier}/dto/request/CreateNewAmplifierRequest.java (77%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => amplifier}/dto/response/AmplifierResponse.java (74%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => amplifier}/entity/Amplifier.java (83%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => amplifier}/strategy/AmplifierCreationStrategy.java (50%) delete mode 100644 src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierType.java diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierBrand.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierBrand.java similarity index 68% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierBrand.java rename to src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierBrand.java index dd98eba..d16bed4 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierBrand.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierBrand.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.amplifier.constant; public enum AmplifierBrand { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierType.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierType.java new file mode 100644 index 0000000..123f62c --- /dev/null +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierType.java @@ -0,0 +1,7 @@ +package com.ajou.hertz.domain.instrument.amplifier.constant; + +public enum AmplifierType { + + GUITAR, + BASS +} diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierUsage.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierUsage.java similarity index 73% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierUsage.java rename to src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierUsage.java index 46c6316..83da814 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierUsage.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/constant/AmplifierUsage.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.amplifier.constant; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/AmplifierDto.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/AmplifierDto.java similarity index 73% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/AmplifierDto.java rename to src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/AmplifierDto.java index 7521f85..3897780 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/AmplifierDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/AmplifierDto.java @@ -1,14 +1,16 @@ -package com.ajou.hertz.domain.instrument.dto; +package com.ajou.hertz.domain.instrument.amplifier.dto; import java.util.List; import com.ajou.hertz.common.dto.AddressDto; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.dto.InstrumentDto; +import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.user.dto.UserDto; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/AmplifierFilterConditions.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/request/AmplifierFilterConditions.java similarity index 66% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/AmplifierFilterConditions.java rename to src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/request/AmplifierFilterConditions.java index 7afd461..b535319 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/AmplifierFilterConditions.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/request/AmplifierFilterConditions.java @@ -1,9 +1,10 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.amplifier.dto.request; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAmplifierRequest.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/request/CreateNewAmplifierRequest.java similarity index 77% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAmplifierRequest.java rename to src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/request/CreateNewAmplifierRequest.java index 39a95c5..765d0d6 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAmplifierRequest.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/request/CreateNewAmplifierRequest.java @@ -1,15 +1,16 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.amplifier.dto.request; import java.util.List; import org.springframework.web.multipart.MultipartFile; import com.ajou.hertz.common.dto.request.AddressRequest; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.user.entity.User; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/AmplifierResponse.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/response/AmplifierResponse.java similarity index 74% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/response/AmplifierResponse.java rename to src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/response/AmplifierResponse.java index d93f4c3..ec3d6f0 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/AmplifierResponse.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/dto/response/AmplifierResponse.java @@ -1,14 +1,16 @@ -package com.ajou.hertz.domain.instrument.dto.response; +package com.ajou.hertz.domain.instrument.amplifier.dto.response; import java.util.List; import com.ajou.hertz.common.dto.response.AddressResponse; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/entity/Amplifier.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/entity/Amplifier.java similarity index 83% rename from src/main/java/com/ajou/hertz/domain/instrument/entity/Amplifier.java rename to src/main/java/com/ajou/hertz/domain/instrument/amplifier/entity/Amplifier.java index 6edc097..6fb8fe5 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/entity/Amplifier.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/entity/Amplifier.java @@ -1,10 +1,11 @@ -package com.ajou.hertz.domain.instrument.entity; +package com.ajou.hertz.domain.instrument.amplifier.entity; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.entity.User; import jakarta.persistence.Column; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/strategy/AmplifierCreationStrategy.java b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/strategy/AmplifierCreationStrategy.java similarity index 50% rename from src/main/java/com/ajou/hertz/domain/instrument/strategy/AmplifierCreationStrategy.java rename to src/main/java/com/ajou/hertz/domain/instrument/amplifier/strategy/AmplifierCreationStrategy.java index 4437c57..7ae0378 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/strategy/AmplifierCreationStrategy.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/amplifier/strategy/AmplifierCreationStrategy.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.strategy; +package com.ajou.hertz.domain.instrument.amplifier.strategy; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; +import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; import com.ajou.hertz.domain.user.entity.User; public class AmplifierCreationStrategy implements InstrumentCreationStrategy { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierType.java b/src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierType.java deleted file mode 100644 index f98c091..0000000 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/AmplifierType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ajou.hertz.domain.instrument.constant; - -public enum AmplifierType { - - GUITAR, - BASS -} diff --git a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java index a8e743a..0260745 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java @@ -21,18 +21,18 @@ import com.ajou.hertz.common.auth.UserPrincipal; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; @@ -40,7 +40,7 @@ import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response.AcousticAndClassicGuitarResponse; -import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; +import com.ajou.hertz.domain.instrument.amplifier.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; import com.ajou.hertz.domain.instrument.effector.dto.response.EffectorResponse; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java index 5e2af02..2e35529 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java @@ -7,7 +7,7 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java index 5fd3a55..8b9c8b1 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java @@ -2,14 +2,14 @@ import com.ajou.hertz.common.dto.response.AddressResponse; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response.AcousticAndClassicGuitarResponse; -import com.ajou.hertz.domain.instrument.dto.response.AmplifierResponse; +import com.ajou.hertz.domain.instrument.amplifier.dto.response.AmplifierResponse; import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; import com.ajou.hertz.domain.instrument.effector.dto.response.EffectorResponse; @@ -18,7 +18,7 @@ import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import com.ajou.hertz.domain.instrument.dto.response.InstrumentSummaryResponse; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java index 284156f..693fa23 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java @@ -4,13 +4,13 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java index ced0c2d..75db28a 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java @@ -1,7 +1,7 @@ package com.ajou.hertz.domain.instrument.repository; import static com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.QAcousticAndClassicGuitar.*; -import static com.ajou.hertz.domain.instrument.entity.QAmplifier.*; +import static com.ajou.hertz.domain.instrument.amplifier.entity.QAmplifier.*; import static com.ajou.hertz.domain.instrument.entity.QAudioEquipment.*; import static com.ajou.hertz.domain.instrument.bass_guitar.entity.QBassGuitar.*; import static com.ajou.hertz.domain.instrument.effector.entity.QEffector.*; @@ -21,14 +21,14 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java index 37e99ae..489d484 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java @@ -7,20 +7,20 @@ import org.springframework.web.multipart.MultipartFile; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; @@ -33,7 +33,7 @@ import com.ajou.hertz.domain.instrument.repository.InstrumentHashtagRepository; import com.ajou.hertz.domain.instrument.repository.InstrumentRepository; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.strategy.AcousticAndClassicGuitarCreationStrategy; -import com.ajou.hertz.domain.instrument.strategy.AmplifierCreationStrategy; +import com.ajou.hertz.domain.instrument.amplifier.strategy.AmplifierCreationStrategy; import com.ajou.hertz.domain.instrument.strategy.AudioEquipmentCreationStrategy; import com.ajou.hertz.domain.instrument.bass_guitar.strategy.BassGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.effector.strategy.EffectorCreationStrategy; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java index 1813551..c224de5 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java @@ -7,14 +7,14 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; diff --git a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java index 2b2529f..4c26a38 100644 --- a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java +++ b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java @@ -21,9 +21,9 @@ import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; @@ -36,13 +36,13 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java index 3cb55dd..1119cab 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java @@ -33,9 +33,9 @@ import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; @@ -50,7 +50,7 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.controller.InstrumentController; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; @@ -58,11 +58,11 @@ import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java index 5df74bd..a70d16e 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java @@ -25,9 +25,9 @@ import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; @@ -39,19 +39,19 @@ import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java index c854c5e..3d6452d 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java @@ -24,9 +24,9 @@ import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; @@ -40,20 +40,20 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; diff --git a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java index 8b81c35..4e1f280 100644 --- a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java +++ b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java @@ -22,9 +22,9 @@ import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarModel; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarPickUp; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.constant.AcousticAndClassicGuitarWood; -import com.ajou.hertz.domain.instrument.constant.AmplifierBrand; -import com.ajou.hertz.domain.instrument.constant.AmplifierType; -import com.ajou.hertz.domain.instrument.constant.AmplifierUsage; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; +import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; @@ -36,18 +36,18 @@ import com.ajou.hertz.domain.instrument.constant.GuitarColor; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; -import com.ajou.hertz.domain.instrument.dto.AmplifierDto; +import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AmplifierFilterConditions; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAmplifierRequest; +import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; @@ -56,7 +56,7 @@ import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; -import com.ajou.hertz.domain.instrument.entity.Amplifier; +import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; import com.ajou.hertz.domain.instrument.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; From e193d498d70e64ca188b838b9a25588010cc265c Mon Sep 17 00:00:00 2001 From: Wo-ogie Date: Sat, 23 Mar 2024 11:12:48 +0900 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20#90=20=EC=9D=8C=ED=96=A5=20?= =?UTF-8?q?=EC=9E=A5=EB=B9=84=20package=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/AudioEquipmentType.java | 2 +- .../{ => audio_equipment}/dto/AudioEquipmentDto.java | 8 +++++--- .../dto/request/AudioEquipmentFilterConditions.java | 5 +++-- .../dto/request/CreateNewAudioEquipmentRequest.java | 7 ++++--- .../dto/response/AudioEquipmentResponse.java | 8 +++++--- .../{ => audio_equipment}/entity/AudioEquipment.java | 5 +++-- .../strategy/AudioEquipmentCreationStrategy.java | 7 ++++--- .../instrument/controller/InstrumentController.java | 8 ++++---- .../hertz/domain/instrument/dto/InstrumentDto.java | 2 +- .../domain/instrument/mapper/InstrumentMapper.java | 6 +++--- .../repository/InstrumentRepositoryCustom.java | 4 ++-- .../repository/InstrumentRepositoryCustomImpl.java | 6 +++--- .../instrument/service/InstrumentCommandService.java | 8 ++++---- .../instrument/service/InstrumentQueryService.java | 4 ++-- .../repository/InstrumentRepositoryTest.java | 6 +++--- .../controller/InstrumentControllerTest.java | 8 ++++---- .../service/InstrumentCommandServiceTest.java | 8 ++++---- .../instrument/service/InstrumentQueryServiceTest.java | 8 ++++---- src/test/java/com/ajou/hertz/util/ReflectionUtils.java | 10 +++++----- 19 files changed, 64 insertions(+), 56 deletions(-) rename src/main/java/com/ajou/hertz/domain/instrument/{ => audio_equipment}/constant/AudioEquipmentType.java (51%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => audio_equipment}/dto/AudioEquipmentDto.java (76%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => audio_equipment}/dto/request/AudioEquipmentFilterConditions.java (71%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => audio_equipment}/dto/request/CreateNewAudioEquipmentRequest.java (81%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => audio_equipment}/dto/response/AudioEquipmentResponse.java (76%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => audio_equipment}/entity/AudioEquipment.java (87%) rename src/main/java/com/ajou/hertz/domain/instrument/{ => audio_equipment}/strategy/AudioEquipmentCreationStrategy.java (50%) diff --git a/src/main/java/com/ajou/hertz/domain/instrument/constant/AudioEquipmentType.java b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/constant/AudioEquipmentType.java similarity index 51% rename from src/main/java/com/ajou/hertz/domain/instrument/constant/AudioEquipmentType.java rename to src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/constant/AudioEquipmentType.java index 0114f55..9c5a4e1 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/constant/AudioEquipmentType.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/constant/AudioEquipmentType.java @@ -1,4 +1,4 @@ -package com.ajou.hertz.domain.instrument.constant; +package com.ajou.hertz.domain.instrument.audio_equipment.constant; public enum AudioEquipmentType { diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/AudioEquipmentDto.java b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/AudioEquipmentDto.java similarity index 76% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/AudioEquipmentDto.java rename to src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/AudioEquipmentDto.java index 8433aec..ac44845 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/AudioEquipmentDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/AudioEquipmentDto.java @@ -1,12 +1,14 @@ -package com.ajou.hertz.domain.instrument.dto; +package com.ajou.hertz.domain.instrument.audio_equipment.dto; import java.util.List; import com.ajou.hertz.common.dto.AddressDto; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.dto.InstrumentDto; +import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.user.dto.UserDto; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/AudioEquipmentFilterConditions.java b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/request/AudioEquipmentFilterConditions.java similarity index 71% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/AudioEquipmentFilterConditions.java rename to src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/request/AudioEquipmentFilterConditions.java index dcd4f50..42671b1 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/AudioEquipmentFilterConditions.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/request/AudioEquipmentFilterConditions.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.audio_equipment.dto.request; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAudioEquipmentRequest.java b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/request/CreateNewAudioEquipmentRequest.java similarity index 81% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAudioEquipmentRequest.java rename to src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/request/CreateNewAudioEquipmentRequest.java index 8c26f13..51ef7c6 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/request/CreateNewAudioEquipmentRequest.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/request/CreateNewAudioEquipmentRequest.java @@ -1,13 +1,14 @@ -package com.ajou.hertz.domain.instrument.dto.request; +package com.ajou.hertz.domain.instrument.audio_equipment.dto.request; import java.util.List; import org.springframework.web.multipart.MultipartFile; import com.ajou.hertz.common.dto.request.AddressRequest; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.user.entity.User; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/AudioEquipmentResponse.java b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/response/AudioEquipmentResponse.java similarity index 76% rename from src/main/java/com/ajou/hertz/domain/instrument/dto/response/AudioEquipmentResponse.java rename to src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/response/AudioEquipmentResponse.java index a1a18c7..b98f7f6 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/response/AudioEquipmentResponse.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/dto/response/AudioEquipmentResponse.java @@ -1,12 +1,14 @@ -package com.ajou.hertz.domain.instrument.dto.response; +package com.ajou.hertz.domain.instrument.audio_equipment.dto.response; import java.util.List; import com.ajou.hertz.common.dto.response.AddressResponse; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.constant.InstrumentCategory; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentImageResponse; +import com.ajou.hertz.domain.instrument.dto.response.InstrumentResponse; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/entity/AudioEquipment.java b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/entity/AudioEquipment.java similarity index 87% rename from src/main/java/com/ajou/hertz/domain/instrument/entity/AudioEquipment.java rename to src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/entity/AudioEquipment.java index 3420bad..c6ca285 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/entity/AudioEquipment.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/entity/AudioEquipment.java @@ -1,8 +1,9 @@ -package com.ajou.hertz.domain.instrument.entity; +package com.ajou.hertz.domain.instrument.audio_equipment.entity; import com.ajou.hertz.common.entity.Address; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; +import com.ajou.hertz.domain.instrument.entity.Instrument; import com.ajou.hertz.domain.user.entity.User; import jakarta.persistence.Column; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/strategy/AudioEquipmentCreationStrategy.java b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/strategy/AudioEquipmentCreationStrategy.java similarity index 50% rename from src/main/java/com/ajou/hertz/domain/instrument/strategy/AudioEquipmentCreationStrategy.java rename to src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/strategy/AudioEquipmentCreationStrategy.java index 1da44d3..3a53a28 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/strategy/AudioEquipmentCreationStrategy.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/audio_equipment/strategy/AudioEquipmentCreationStrategy.java @@ -1,7 +1,8 @@ -package com.ajou.hertz.domain.instrument.strategy; +package com.ajou.hertz.domain.instrument.audio_equipment.strategy; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.CreateNewAudioEquipmentRequest; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.strategy.InstrumentCreationStrategy; import com.ajou.hertz.domain.user.entity.User; public class AudioEquipmentCreationStrategy diff --git a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java index 0260745..a8f2b94 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/controller/InstrumentController.java @@ -22,18 +22,18 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; @@ -41,7 +41,7 @@ import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.amplifier.dto.response.AmplifierResponse; -import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; import com.ajou.hertz.domain.instrument.effector.dto.response.EffectorResponse; import com.ajou.hertz.domain.instrument.electric_guitar.dto.response.ElectricGuitarResponse; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java index 2e35529..69966cf 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/dto/InstrumentDto.java @@ -8,7 +8,7 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java index 8b9c8b1..cb5443e 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/mapper/InstrumentMapper.java @@ -3,14 +3,14 @@ import com.ajou.hertz.common.dto.response.AddressResponse; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.response.AcousticAndClassicGuitarResponse; import com.ajou.hertz.domain.instrument.amplifier.dto.response.AmplifierResponse; -import com.ajou.hertz.domain.instrument.dto.response.AudioEquipmentResponse; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.response.AudioEquipmentResponse; import com.ajou.hertz.domain.instrument.bass_guitar.dto.response.BassGuitarResponse; import com.ajou.hertz.domain.instrument.effector.dto.response.EffectorResponse; import com.ajou.hertz.domain.instrument.electric_guitar.dto.response.ElectricGuitarResponse; @@ -19,7 +19,7 @@ import com.ajou.hertz.domain.instrument.dto.response.InstrumentSummaryResponse; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java index 693fa23..47f2a9b 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustom.java @@ -5,13 +5,13 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java index 75db28a..c6f39a9 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java @@ -2,7 +2,7 @@ import static com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.QAcousticAndClassicGuitar.*; import static com.ajou.hertz.domain.instrument.amplifier.entity.QAmplifier.*; -import static com.ajou.hertz.domain.instrument.entity.QAudioEquipment.*; +import static com.ajou.hertz.domain.instrument.audio_equipment.entity.QAudioEquipment.*; import static com.ajou.hertz.domain.instrument.bass_guitar.entity.QBassGuitar.*; import static com.ajou.hertz.domain.instrument.effector.entity.QEffector.*; import static com.ajou.hertz.domain.instrument.electric_guitar.entity.QElectricGuitar.*; @@ -22,14 +22,14 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java index 489d484..502e665 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentCommandService.java @@ -8,20 +8,20 @@ import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.dto.request.CreateNewInstrumentRequest; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; @@ -34,7 +34,7 @@ import com.ajou.hertz.domain.instrument.repository.InstrumentRepository; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.strategy.AcousticAndClassicGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.amplifier.strategy.AmplifierCreationStrategy; -import com.ajou.hertz.domain.instrument.strategy.AudioEquipmentCreationStrategy; +import com.ajou.hertz.domain.instrument.audio_equipment.strategy.AudioEquipmentCreationStrategy; import com.ajou.hertz.domain.instrument.bass_guitar.strategy.BassGuitarCreationStrategy; import com.ajou.hertz.domain.instrument.effector.strategy.EffectorCreationStrategy; import com.ajou.hertz.domain.instrument.electric_guitar.strategy.ElectricGuitarCreationStrategy; diff --git a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java index c224de5..f6afd1d 100644 --- a/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java +++ b/src/main/java/com/ajou/hertz/domain/instrument/service/InstrumentQueryService.java @@ -8,14 +8,14 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; diff --git a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java index 4c26a38..f503c5e 100644 --- a/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java +++ b/src/test/java/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java @@ -24,7 +24,7 @@ import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; @@ -37,13 +37,13 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java index 1119cab..69c10ba 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/controller/InstrumentControllerTest.java @@ -36,7 +36,7 @@ import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; @@ -51,7 +51,7 @@ import com.ajou.hertz.domain.instrument.controller.InstrumentController; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; @@ -59,11 +59,11 @@ import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java index a70d16e..4ac8c73 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentCommandServiceTest.java @@ -28,7 +28,7 @@ import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; @@ -40,19 +40,19 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; diff --git a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java index 3d6452d..1b93884 100644 --- a/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java +++ b/src/test/java/com/ajou/hertz/unit/domain/instrument/service/InstrumentQueryServiceTest.java @@ -27,7 +27,7 @@ import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; @@ -41,20 +41,20 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentSortOption; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.effector.dto.request.EffectorFilterConditions; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.ElectricGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar; diff --git a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java index 4e1f280..2249fae 100644 --- a/src/test/java/com/ajou/hertz/util/ReflectionUtils.java +++ b/src/test/java/com/ajou/hertz/util/ReflectionUtils.java @@ -25,7 +25,7 @@ import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierBrand; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierType; import com.ajou.hertz.domain.instrument.amplifier.constant.AmplifierUsage; -import com.ajou.hertz.domain.instrument.constant.AudioEquipmentType; +import com.ajou.hertz.domain.instrument.audio_equipment.constant.AudioEquipmentType; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarBrand; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPickUp; import com.ajou.hertz.domain.instrument.bass_guitar.constant.BassGuitarPreAmplifier; @@ -37,18 +37,18 @@ import com.ajou.hertz.domain.instrument.constant.InstrumentProgressStatus; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.AcousticAndClassicGuitarDto; import com.ajou.hertz.domain.instrument.amplifier.dto.AmplifierDto; -import com.ajou.hertz.domain.instrument.dto.AudioEquipmentDto; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.AudioEquipmentDto; import com.ajou.hertz.domain.instrument.bass_guitar.dto.BassGuitarDto; import com.ajou.hertz.domain.instrument.effector.dto.EffectorDto; import com.ajou.hertz.domain.instrument.electric_guitar.dto.ElectricGuitarDto; import com.ajou.hertz.domain.instrument.dto.InstrumentImageDto; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.AcousticAndClassicGuitarFilterConditions; import com.ajou.hertz.domain.instrument.amplifier.dto.request.AmplifierFilterConditions; -import com.ajou.hertz.domain.instrument.dto.request.AudioEquipmentFilterConditions; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.AudioEquipmentFilterConditions; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.BassGuitarFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.dto.request.CreateNewAcousticAndClassicGuitarRequest; import com.ajou.hertz.domain.instrument.amplifier.dto.request.CreateNewAmplifierRequest; -import com.ajou.hertz.domain.instrument.dto.request.CreateNewAudioEquipmentRequest; +import com.ajou.hertz.domain.instrument.audio_equipment.dto.request.CreateNewAudioEquipmentRequest; import com.ajou.hertz.domain.instrument.bass_guitar.dto.request.CreateNewBassGuitarRequest; import com.ajou.hertz.domain.instrument.effector.dto.request.CreateNewEffectorRequest; import com.ajou.hertz.domain.instrument.electric_guitar.dto.request.CreateNewElectricGuitarRequest; @@ -57,7 +57,7 @@ import com.ajou.hertz.domain.instrument.dto.request.InstrumentFilterConditions; import com.ajou.hertz.domain.instrument.acoustic_and_classic_guitar.entity.AcousticAndClassicGuitar; import com.ajou.hertz.domain.instrument.amplifier.entity.Amplifier; -import com.ajou.hertz.domain.instrument.entity.AudioEquipment; +import com.ajou.hertz.domain.instrument.audio_equipment.entity.AudioEquipment; import com.ajou.hertz.domain.instrument.bass_guitar.entity.BassGuitar; import com.ajou.hertz.domain.instrument.effector.entity.Effector; import com.ajou.hertz.domain.instrument.electric_guitar.entity.ElectricGuitar;