Merge pull request #91 from Ajou-Hertz/feature/#90-refactor-instrumen…

…t-package-structure Instrument domain에 대한 package structure refactoring
Ajou-Hertz · Mar 23, 2024 · 9756df4 · 9756df4
2 parents c454d52 + e193d49
commit 9756df4
Show file tree

Hide file tree

Showing 66 changed files with 500 additions and 450 deletions.
diff --git a/...nstant/AcousticAndClassicGuitarBrand.java → ...nstant/AcousticAndClassicGuitarBrand.java b/...nstant/AcousticAndClassicGuitarBrand.java → ...nstant/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/...nstant/AcousticAndClassicGuitarModel.java → ...nstant/AcousticAndClassicGuitarModel.java b/...nstant/AcousticAndClassicGuitarModel.java → ...nstant/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/...stant/AcousticAndClassicGuitarPickUp.java → ...stant/AcousticAndClassicGuitarPickUp.java b/...stant/AcousticAndClassicGuitarPickUp.java → ...stant/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/...onstant/AcousticAndClassicGuitarWood.java → ...onstant/AcousticAndClassicGuitarWood.java b/...onstant/AcousticAndClassicGuitarWood.java → ...onstant/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/...ment/dto/AcousticAndClassicGuitarDto.java → ...itar/dto/AcousticAndClassicGuitarDto.java b/...ment/dto/AcousticAndClassicGuitarDto.java → ...itar/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/...sticAndClassicGuitarFilterConditions.java → ...sticAndClassicGuitarFilterConditions.java b/...sticAndClassicGuitarFilterConditions.java → ...sticAndClassicGuitarFilterConditions.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/...teNewAcousticAndClassicGuitarRequest.java → ...teNewAcousticAndClassicGuitarRequest.java b/...teNewAcousticAndClassicGuitarRequest.java → ...teNewAcousticAndClassicGuitarRequest.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/...nse/AcousticAndClassicGuitarResponse.java → ...nse/AcousticAndClassicGuitarResponse.java b/...nse/AcousticAndClassicGuitarResponse.java → ...nse/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/...ment/entity/AcousticAndClassicGuitar.java → ...itar/entity/AcousticAndClassicGuitar.java b/...ment/entity/AcousticAndClassicGuitar.java → ...itar/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/...sticAndClassicGuitarCreationStrategy.java → ...sticAndClassicGuitarCreationStrategy.java b/...sticAndClassicGuitarCreationStrategy.java → ...sticAndClassicGuitarCreationStrategy.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/...n/instrument/constant/AmplifierBrand.java → ...nt/amplifier/constant/AmplifierBrand.java b/...n/instrument/constant/AmplifierBrand.java → ...nt/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
@@ -0,0 +1,7 @@
+package com.ajou.hertz.domain.instrument.amplifier.constant;
+
+public enum AmplifierType {
+
+	GUITAR,
+	BASS
+}
diff --git a/...n/instrument/constant/AmplifierUsage.java → ...nt/amplifier/constant/AmplifierUsage.java b/...n/instrument/constant/AmplifierUsage.java → ...nt/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/...z/domain/instrument/dto/AmplifierDto.java → ...nstrument/amplifier/dto/AmplifierDto.java b/...z/domain/instrument/dto/AmplifierDto.java → ...nstrument/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/...to/request/AmplifierFilterConditions.java → ...to/request/AmplifierFilterConditions.java b/...to/request/AmplifierFilterConditions.java → ...to/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/...to/request/CreateNewAmplifierRequest.java → ...to/request/CreateNewAmplifierRequest.java b/...to/request/CreateNewAmplifierRequest.java → ...to/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/...ument/dto/response/AmplifierResponse.java → ...ifier/dto/response/AmplifierResponse.java b/...ument/dto/response/AmplifierResponse.java → ...ifier/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/...z/domain/instrument/entity/Amplifier.java → ...nstrument/amplifier/entity/Amplifier.java b/...z/domain/instrument/entity/Amplifier.java → ...nstrument/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/...t/strategy/AmplifierCreationStrategy.java → ...r/strategy/AmplifierCreationStrategy.java b/...t/strategy/AmplifierCreationStrategy.java → ...r/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<Amplifier, CreateNewAmplifierRequest> {

diff --git a/...strument/constant/AudioEquipmentType.java → ...quipment/constant/AudioEquipmentType.java b/...strument/constant/AudioEquipmentType.java → ...quipment/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/...ain/instrument/dto/AudioEquipmentDto.java → ...udio_equipment/dto/AudioEquipmentDto.java b/...ain/instrument/dto/AudioEquipmentDto.java → ...udio_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/...quest/AudioEquipmentFilterConditions.java → ...quest/AudioEquipmentFilterConditions.java b/...quest/AudioEquipmentFilterConditions.java → ...quest/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/...quest/CreateNewAudioEquipmentRequest.java → ...quest/CreateNewAudioEquipmentRequest.java b/...quest/CreateNewAudioEquipmentRequest.java → ...quest/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/.../dto/response/AudioEquipmentResponse.java → .../dto/response/AudioEquipmentResponse.java b/.../dto/response/AudioEquipmentResponse.java → .../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/...ain/instrument/entity/AudioEquipment.java → ...udio_equipment/entity/AudioEquipment.java b/...ain/instrument/entity/AudioEquipment.java → ...udio_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/...ategy/AudioEquipmentCreationStrategy.java → ...ategy/AudioEquipmentCreationStrategy.java b/...ategy/AudioEquipmentCreationStrategy.java → ...ategy/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/.../instrument/constant/BassGuitarBrand.java → ...bass_guitar/constant/BassGuitarBrand.java b/.../instrument/constant/BassGuitarBrand.java → ...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/...instrument/constant/BassGuitarPickUp.java → ...ass_guitar/constant/BassGuitarPickUp.java b/...instrument/constant/BassGuitarPickUp.java → ...ass_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/...ment/constant/BassGuitarPreAmplifier.java → ...itar/constant/BassGuitarPreAmplifier.java b/...ment/constant/BassGuitarPreAmplifier.java → ...itar/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 {