리팩토링, 테스트 추가

api/throwapi/src/main/java/sosteam/throwapi/domain/store/controller/StoreController.java

@@ -1,6 +1,5 @@
 package sosteam.throwapi.domain.store.controller;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,15 +12,10 @@
 import sosteam.throwapi.domain.store.entity.dto.StoreDto;
 import sosteam.throwapi.domain.store.entity.dto.StoreInRadiusDto;
 import sosteam.throwapi.domain.store.entity.dto.StoreSaveDto;
-import sosteam.throwapi.domain.store.exception.BiznoAPIException;
-import sosteam.throwapi.domain.store.exception.NoSuchRegistrationNumberException;
-import sosteam.throwapi.domain.store.exception.NoSuchStoreException;
-import sosteam.throwapi.domain.store.externalAPI.bizno.BiznoAPI;
-import sosteam.throwapi.domain.store.externalAPI.bizno.BiznoApiResponse;
-import sosteam.throwapi.domain.store.service.StoreCreateService;
-import sosteam.throwapi.domain.store.service.StoreDeleteService;
-import sosteam.throwapi.domain.store.service.StoreSearchService;
-import sosteam.throwapi.domain.store.service.StoreModifyService;
+import sosteam.throwapi.domain.store.service.*;
+import sosteam.throwapi.domain.user.entity.dto.user.UserInfoDto;
+import sosteam.throwapi.domain.user.service.UserSeaerchService;
+import sosteam.throwapi.global.service.JwtTokenService;
 
 import java.time.LocalDateTime;
 import java.util.Set;
@@ -46,50 +40,59 @@ public class StoreController {
     private final StoreCreateService storeCreateService;
     private final StoreModifyService storeModifyService;
     private final StoreDeleteService storeDeleteService;
+    private final BiznoService biznoService;
+    private final JwtTokenService jwtTokenService;
+    private final UserSeaerchService userSearchService;
 
-    private final BiznoAPI biznoAPI;
-    ObjectMapper mapper = new ObjectMapper();
-
+    /**
+     * 새로운 가게를 등록합니다.
+     * @param auth 사용자의 토큰
+     * @param request 생성할 가게 정보
+     * @return 가게의 외부 UUID
+     */
     @PostMapping
     public ResponseEntity<UUID> saveStore(
             @RequestHeader(name = "Authorization", required = true)
             String auth,
-
             @RequestBody @Valid StoreSaveRequest request
     ) {
-        // Bizno RegistrationNumber Confirm API Error checking
-        String storeName = confirmCompanyRegistrationNumber(request.getCrn(),auth);
-        log.debug("POST : BIZNO API RESULT : StoreName ={}",storeName);
+        // 비즈노 API 호출 성공 시, 해당 사업자 번호의 가게 이름을 가져옵니다.
         String accessToken = auth.split(" ")[1];
-        // if CompanyRegistrationNumber Form is XXX-XX-XXXXX,
-        // remove '-'
-        // Call save Service
+        String storeName = biznoService.confirmCompanyRegistrationNumber(request.getCrn(), accessToken);
+
+        // Bearer qwee..가 acdessToken이므로 실제 토큰인 뒷 부분을 가져옵니다.
+        UUID userId = getUserByToken(accessToken);
+
+        // 사업자 번호 입력 시 "-" 를 제거합니다
+        String crn = request.getCrn().replaceAll("-", "");
         StoreSaveDto dto = new StoreSaveDto(
-                accessToken,
                 null,
                 storeName,
                 request.getStorePhone(),
-                request.getCrn().replaceAll("-",""),
+                crn,
                 request.getLatitude(),
                 request.getLongitude(),
                 request.getZipCode(),
                 request.getFullAddress(),
                 request.getTrashType()
         );
-        log.debug("StoreSaveRequest = {}", dto);
-
-        Store store = storeCreateService.saveStore(dto);
-
+        Store store = storeCreateService.saveStore(userId,dto);
         return ResponseEntity.ok(store.getExtStoreId());
     }
 
+    /**
+     * 내 가게 불러오기
+     * @param auth 사용자 토큰
+     * @return 해당 사용자의 가게들을 반환
+     */
     @GetMapping("/user")
     public ResponseEntity<Set<StoreResponse>> searchMyStores(
             @RequestHeader(name = "Authorization", required = true)
             String auth
     ) {
         String accessToken = auth.split(" ")[1];
-        Set<StoreDto> storeDtos = storeSearchService.searchMyStores(accessToken);
+        UUID userId = getUserByToken(accessToken);
+        Set<StoreDto> storeDtos = storeSearchService.searchMyStores(userId);
         Set<StoreResponse> resp = storeDtos.stream().map(StoreDto::toResponse).collect(Collectors.toSet());
         return ResponseEntity.ok(resp);
     }
@@ -112,6 +115,7 @@ public ResponseEntity<Set<StoreResponse>> searchStoreInRadius(@RequestBody @Vali
                 request.getDistance(),
                 request.getTrashType().replace("0","_")
         );
+
         // Convert Dto to Response
         Set<StoreDto> storeDtos = storeSearchService.searchStoreInRadius(dto);
         Set<StoreResponse> resp = storeDtos.stream().map(StoreDto::toResponse).collect(Collectors.toSet());
@@ -129,7 +133,6 @@ public ResponseEntity<Set<StoreResponse>> searchStoreInRadius(@RequestBody @Vali
     @PostMapping("/crn")
     public ResponseEntity<StoreResponse> searchByCompanyRegistrationNumber(@RequestBody @Valid StoreCrnRequest request) {
         StoreDto dto =  storeSearchService.searchByCRN(request.getCrn().replaceAll("-",""));
-        if(dto == null) throw new NoSuchStoreException();
         StoreResponse resp = dto.toResponse();
         return ResponseEntity.ok(resp);
     }
@@ -157,63 +160,69 @@ public ResponseEntity<Set<StoreResponse>> searchByName(@RequestBody @Valid Store
     public ResponseEntity<StoreResponse> modifyStore(
             @RequestHeader(name = "Authorization", required = true)
             String auth,
-
             @RequestBody @Valid StoreModifyRequest request
     ) {
+        // Bearer qwee..가 acdessToken이므로 실제 토큰인 뒷 부분을 가져옵니다.
         String accessToken = auth.split(" ")[1];
-        // Bizno RegistrationNumber Confirm API Error checking
-        String storeName = confirmCompanyRegistrationNumber(request.getCrn(),auth);
-        log.debug("PUT: BIZNO API RESULT : StoreName ={}",storeName);
+        UUID userId = getUserByToken(accessToken);
 
-        // if CompanyRegistrationNumber Form is XXX-XX-XXXXX,
-        // remove '-'
+        // 비즈노 호출 성공 시 가게 이름을 받는다.
+        String storeName = biznoService.confirmCompanyRegistrationNumber(request.getCrn(), accessToken);
+
+        // 사업자 번호 입력 시 "-" 를 제거합니다
+        String crn = request.getCrn().replaceAll("-", "");
+
+        // 수정 데이터가 담긴 dto를 생성합니다.
         StoreDto dto = new StoreDto(
                 request.getExtStoreId(),
                 storeName,
                 request.getStorePhone(),
-                request.getCrn().replaceAll("-",""),
+                crn,
                 request.getLatitude(),
                 request.getLongitude(),
                 request.getZipCode(),
                 request.getFullAddress(),
                 request.getTrashType()
         );
-        // Call modify Method
-        log.debug("StoreModifyRequest = {}", dto);
-        StoreDto storeDto = storeModifyService.modify(accessToken,dto);
+
+        // 수정 서비스를 호출합니다.
+        StoreDto storeDto = storeModifyService.modify(userId,dto);
+
+        // 수정이 완료되었다면, 수정 된 가게 데이터를 반환합니다.
         return ResponseEntity.ok(storeDto.toResponse());
     }
 
+    /**
+     * 요청 가게를 삭제합니다.
+     * @param auth 요청한 사용자 토큰
+     * @param request 삭제를 원하는 가게의 외부 UUID
+     * @return 삭제 완료 문구
+     */
     @DeleteMapping
     public ResponseEntity<String> deleteStore(
             @RequestHeader(name = "Authorization", required = true)
             String auth,
-
             @RequestBody @Valid StoreDeleteRequest request
     ) {
+        // Bearer qwee..가 acdessToken이므로 실제 토큰인 뒷 부분을 가져옵니다.
         String accessToken = auth.split(" ")[1];
-        storeDeleteService.deleteStore(accessToken,request.getExtStoreId());
+        UUID userId = getUserByToken(accessToken);
+
+        // 가게 삭제 서비스 호출
+        storeDeleteService.deleteStore(userId,request.getExtStoreId());
+
+        // 삭제 서비스가 완료되면 삭제 된 가게의 외부 UUID와 삭제 된 시간을 문자열로 반환합니다.
         String resp = "Delete Store: " + request.getExtStoreId() +
                 "<" + String.valueOf(LocalDateTime.now()) + ">";
         return ResponseEntity.ok(resp);
     }
 
-    /**
-     * BIZNO API를 이용하여 해당 사업자 번호가 국세청에 등록된 번호인지 확인
-     * @param number 사업자 등록 번호
-     * @return result 사업자 등록 번호로 등록된 가게 이름 -> storeName
-     * response.getResultCode() :
-     *  -1 : 미등록 사용자 -> Wrong API-KEY
-     *  -2 : 파라메터 오류`
-     *  -3 : 1일 100건 조회수 초과
-     *  9 : 기타 오류
-     *  -10 : 해당 번호 존재 X
-     */
-    public String confirmCompanyRegistrationNumber(String number,String accessToken){
-        BiznoApiResponse response = biznoAPI.confirmCompanyRegistrationNumber(number,accessToken);
-        if( response == null || response.getTotalCount() == 0) throw new NoSuchRegistrationNumberException();
-        if(response.getResultCode() < 0) throw new BiznoAPIException(response.getResultCode());
-        return response.getItems().get(0).getCompany();
+    // 토큰을 통해 사용자를 가져 옵니다.
+    public UUID getUserByToken(String token) {
+        UserInfoDto userInfoDto = new UserInfoDto(
+                jwtTokenService.extractSubject(token)
+        );
+        return userSearchService.searchByInputId(userInfoDto).getId();
     }
 }
 

api/throwapi/src/main/java/sosteam/throwapi/domain/store/controller/request/StoreDeleteRequest.java

@@ -1,9 +1,7 @@
 package sosteam.throwapi.domain.store.controller.request;
 
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import lombok.Data;
-import org.hibernate.validator.constraints.Range;
 
 import java.util.UUID;
 

api/throwapi/src/main/java/sosteam/throwapi/domain/store/entity/Address.java

@@ -1,9 +1,6 @@
 package sosteam.throwapi.domain.store.entity;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -40,7 +37,8 @@ public Address(Point location, double latitude, double longitude, String fullAdd
         this.zipCode = zipCode;
     }
 
-    @OneToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "store_id")
     private Store store;
 
     public Store modifyStore(Store store){

api/throwapi/src/main/java/sosteam/throwapi/domain/store/entity/Store.java

@@ -10,6 +10,7 @@
 import sosteam.throwapi.domain.user.entity.User;
 import sosteam.throwapi.global.entity.PrimaryKeyEntity;
 
+import java.util.List;
 import java.util.UUID;
 
 @Getter
@@ -34,19 +35,19 @@ public class Store extends PrimaryKeyEntity {
     // 일반쓰레기 | 병 | 플라스틱 | 종이 | 캔
     @NotNull
     private String trashType;
+
     @NotNull
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;
-    @NotNull
-    @OneToOne(
+
+    @OneToMany(
             mappedBy = "store",
             fetch = FetchType.LAZY,
             cascade = CascadeType.ALL,
             orphanRemoval = true
     )
-    @JoinColumn(name = "address_id")
-    private Address address;
+    private List<Address> address;
 
     public Store(UUID extStoreId, String storeName, String storePhone, String companyRegistrationNumber, String trashType) {
         this.extStoreId = extStoreId;
@@ -68,7 +69,7 @@ public User modifyUser(User user) {
         return this.user;
     }
 
-    public Address modifyAddress(Address address) {
+    public List<Address> modifyAddress(List<Address> address) {
         this.address = address;
         return this.address;
     }

api/throwapi/src/main/java/sosteam/throwapi/domain/store/entity/dto/StoreSaveDto.java

@@ -1,6 +1,5 @@
 package sosteam.throwapi.domain.store.entity.dto;
 
-import com.querydsl.core.annotations.QueryProjection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -9,7 +8,6 @@
 @Data
 @AllArgsConstructor
 public class StoreSaveDto {
-    private String accessToken;
     private UUID extStoreId;
     private String storeName;
     private String storePhone;

api/throwapi/src/main/java/sosteam/throwapi/domain/store/exception/InvalidRequestException.java

@@ -5,6 +5,6 @@
 
 public class InvalidRequestException extends CommonException {
     public InvalidRequestException(String code) {
-        super("INVALID_REQUEST_OF_"+code, "검증 실패! : 잘못된 접근입니다.", HttpStatus.BAD_REQUEST);
+        super("INVALID_REQUEST_OF_"+code, "검증 실패! : 잘못된 접근입니다.", HttpStatus.UNAUTHORIZED);
     }
 }

api/throwapi/src/main/java/sosteam/throwapi/domain/store/exception/NoSuchRegistrationNumberException.java

@@ -5,6 +5,6 @@
 
 public class NoSuchRegistrationNumberException extends CommonException {
     public NoSuchRegistrationNumberException() {
-            super("NO_SUCH_REGISTRATION_NUMBER", "국세청에 등록되지 않은 사업자등록번호입니다.", HttpStatus.BAD_REQUEST);
+            super("NO_SUCH_REGISTRATION_NUMBER", "국세청에 등록되지 않은 사업자등록번호입니다.", HttpStatus.UNAUTHORIZED);
     }
 }

api/throwapi/src/main/java/sosteam/throwapi/domain/store/exception/WrongStoreIdException.java

@@ -5,6 +5,6 @@
 
 public class WrongStoreIdException extends CommonException {
     public WrongStoreIdException() {
-        super("STORE_ID_DON'T_MATCH", "가게 아이디가 올바르지 않습니다.", HttpStatus.BAD_REQUEST);
+        super("STORE_ID_DON'T_MATCH", "가게 아이디가 올바르지 않습니다.", HttpStatus.UNAUTHORIZED);
     }
 }

api/throwapi/src/main/java/sosteam/throwapi/domain/store/log/CrnLog.java

@@ -3,6 +3,8 @@
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 import sosteam.throwapi.global.service.TimeStamped;
 
 import java.util.UUID;
@@ -17,7 +19,8 @@ public class CrnLog extends TimeStamped {
     @Column
     private String ip;
 
-    @Column
+    @Column(name = "user_id", updatable = false, nullable = false, columnDefinition = "VARCHAR(36)")
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     private UUID userId;
 
 public CrnLog(String ip, UUID userId) {

api/throwapi/src/main/java/sosteam/throwapi/domain/store/log/CrnLogRepository.java

@@ -1,7 +1,6 @@
 package sosteam.throwapi.domain.store.log;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import sosteam.throwapi.domain.store.log.CrnLog;
 
 public interface CrnLogRepository extends JpaRepository<CrnLog,Long> {
 }

api/throwapi/src/main/java/sosteam/throwapi/domain/store/repository/repoCustom/StoreCustomRepository.java

@@ -2,8 +2,8 @@
 
 import sosteam.throwapi.domain.store.entity.Address;
 import sosteam.throwapi.domain.store.entity.Store;
-import sosteam.throwapi.domain.store.entity.dto.StoreInRadiusDto;
 import sosteam.throwapi.domain.store.entity.dto.StoreDto;
+import sosteam.throwapi.domain.store.entity.dto.StoreInRadiusDto;
 
 import java.util.Optional;
 import java.util.Set;