#19 [Done] 유저 업장 등록 구현 완료

MeongPanNyaengPan-MPNP · Jul 11, 2022 · fe1a5cb · fe1a5cb
1 parent 9cdc9a6
commit fe1a5cb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/main/java/com/mpnp/baechelin/store/controller/UserRegisterStoreController.java b/src/main/java/com/mpnp/baechelin/store/controller/UserRegisterStoreController.java
@@ -2,11 +2,11 @@
 
 import com.mpnp.baechelin.store.dto.userRegisterStore.UserRegisterStoreRequestDto;
 import com.mpnp.baechelin.store.service.UserRegisterStoreService;
-import com.mpnp.baechelin.user.entity.user.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.User;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,8 +26,12 @@ public class UserRegisterStoreController {
      */
     @PostMapping("/register")
     public ResponseEntity<String> registerStore(
-            @ModelAttribute UserRegisterStoreRequestDto userRegisterStoreRequestDto) {
-        userRegisterStoreService.registerStore(userRegisterStoreRequestDto);
+            @ModelAttribute UserRegisterStoreRequestDto userRegisterStoreRequestDto,
+            @AuthenticationPrincipal User userDetails) {
+
+        userRegisterStoreService.registerStore(userRegisterStoreRequestDto, userDetails.getUsername());
         return new ResponseEntity<>("업장 등록 성공", HttpStatus.OK);
     }
+
+
 }
diff --git a/src/main/java/com/mpnp/baechelin/store/domain/UserRegisterStore.java b/src/main/java/com/mpnp/baechelin/store/domain/UserRegisterStore.java
@@ -1,5 +1,6 @@
 package com.mpnp.baechelin.store.domain;
 
+import com.mpnp.baechelin.user.entity.user.User;
 import com.mpnp.baechelin.util.TimeStamped;
 import lombok.Builder;
 import lombok.Getter;
@@ -35,23 +36,30 @@ public class UserRegisterStore extends TimeStamped {
     @Column(nullable = false, length = 1)
     private String approach;
 
+    // 연관관계 매핑
     @OneToMany(mappedBy = "userRegisterStore", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<UserRegisterStoreImg> userRegisterStoreImgList;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "USER_ID", nullable = false)
+    private User user;
+
     @Builder
     public UserRegisterStore(
             String name,
             String address,
             String elevator,
             String toilet,
             String heightDifferent,
-            String approach
+            String approach,
+            User user
     ) {
         this.name = name;
         this.address = address;
         this.elevator = elevator;
         this.toilet = toilet;
         this.heightDifferent = heightDifferent;
         this.approach = approach;
+        this.user = user;
     }
 }
diff --git a/src/main/java/com/mpnp/baechelin/store/service/UserRegisterStoreService.java b/src/main/java/com/mpnp/baechelin/store/service/UserRegisterStoreService.java
@@ -5,6 +5,8 @@
 import com.mpnp.baechelin.store.dto.userRegisterStore.UserRegisterStoreRequestDto;
 import com.mpnp.baechelin.store.repository.UserRegisterStoreImgRepository;
 import com.mpnp.baechelin.store.repository.UserRegisterStoreRepository;
+import com.mpnp.baechelin.user.entity.user.User;
+import com.mpnp.baechelin.user.repository.UserRepository;
 import com.mpnp.baechelin.util.AwsS3Manager;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -21,13 +23,16 @@ public class UserRegisterStoreService {
     private final AwsS3Manager awsS3Manager;
     private final UserRegisterStoreRepository userRegisterStoreRepository;
     private final UserRegisterStoreImgRepository userRegisterStoreImgRepository;
+    private final UserRepository userRepository;
 
 
     /**
      * 유저 업장 등록
      * @param userRegisterStoreRequestDto
      */
-    public void registerStore(UserRegisterStoreRequestDto userRegisterStoreRequestDto) {
+    public void registerStore(UserRegisterStoreRequestDto userRegisterStoreRequestDto, String socialId) {
+        User user = userRepository.findBySocialId(socialId);
+
         // 업장 등록
         UserRegisterStore userRegisterStore = UserRegisterStore.builder()
                 .name(userRegisterStoreRequestDto.getName())
@@ -36,6 +41,7 @@ public void registerStore(UserRegisterStoreRequestDto userRegisterStoreRequestDt
                 .toilet(userRegisterStoreRequestDto.getToilet())
                 .heightDifferent(userRegisterStoreRequestDto.getHeightDifferent())
                 .approach(userRegisterStoreRequestDto.getApproach())
+                .user(user)
                 .build();
 
         // 업장의 이미지 여러개 등록