feat: 회원가입시 보드 임의 생성 추가, 카테고리 임의 생성 Service 제거

.gitignore

@@ -36,4 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 
-application-security.yml
+application-security.yml
+/src/main/resources/application-dev.yml

src/main/java/com/ddd/moodof/adapter/infrastructure/configuration/SecurityConfig.java

@@ -15,12 +15,15 @@
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.firewall.HttpFirewall;
+import org.springframework.security.web.firewall.StrictHttpFirewall;
 
 @RequiredArgsConstructor
 @Configuration
@@ -49,6 +52,19 @@ public void configure(AuthenticationManagerBuilder authenticationManagerBuilder)
                 .userDetailsService(customUserDetailsService)
                 .passwordEncoder(passwordEncoder());
     }
+    @Override
+    public void configure(WebSecurity web) throws Exception {
+        super.configure(web);
+        web.httpFirewall(allowUrlEncodedSlashHttpFirewall());
+    }
+
+    @Bean
+    public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
+        StrictHttpFirewall firewall = new StrictHttpFirewall();
+        firewall.setAllowUrlEncodedSlash(true);
+        return firewall;
+    }
+
 
     @Bean
     public PasswordEncoder passwordEncoder() {
@@ -93,7 +109,8 @@ protected void configure(HttpSecurity http) throws Exception {
                             "/webjars/**",
                             "/v2/**",
                             "/swagger-resources/**",
-                            "/api/public/**"
+                            "/api/public/**",
+                            "/api/public/**/**"
                     ).permitAll()
                     .anyRequest()
                         .authenticated()

src/main/java/com/ddd/moodof/adapter/infrastructure/persistence/querydsl/CategoryQuerydslRepository.java

@@ -44,6 +44,7 @@ public List<CategoryDTO.CategoryWithBoardResponse> findAllByUserId(Long userId)
                             board.userId,
                             board.name,
                             board.categoryId,
+                            board.sharedKey,
                             board.createdDate,
                             board.lastModifiedDate))
                     .from(board)

src/main/java/com/ddd/moodof/adapter/infrastructure/persistence/querydsl/StoragePhotoQuerydslRepository.java

@@ -215,6 +215,7 @@ private List<BoardDTO.BoardResponse> findBoards(Long storagePhotoId) {
                         board.userId,
                         board.name,
                         board.categoryId,
+                        board.sharedKey,
                         board.createdDate,
                         board.lastModifiedDate
                 ))

src/main/java/com/ddd/moodof/adapter/infrastructure/security/encrypt/EncryptUtil.java

@@ -0,0 +1,26 @@
+package com.ddd.moodof.adapter.infrastructure.security.encrypt;
+
+import org.springframework.stereotype.Component;
+import java.security.MessageDigest;
+
+@Component
+public class EncryptUtil {
+
+    public static String encryptSHA256(String msg){
+        try{
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            byte[] hash = digest.digest(msg.getBytes("UTF-8"));
+            StringBuffer hexString = new StringBuffer();
+
+            for (byte b : hash) {
+                String hex = Integer.toHexString(0xff & b);
+                if (hex.length() == 1) hexString.append('0');
+                hexString.append(hex);
+            }
+
+            return hexString.toString();
+        } catch(Exception ex){
+            throw new RuntimeException(ex);
+        }
+    }
+}

src/main/java/com/ddd/moodof/adapter/infrastructure/security/oauth2/CustomOAuth2UserService.java

@@ -4,7 +4,10 @@
 import com.ddd.moodof.adapter.infrastructure.security.exception.OAuth2AuthenticationProcessingException;
 import com.ddd.moodof.adapter.infrastructure.security.oauth2.user.OAuth2UserInfo;
 import com.ddd.moodof.adapter.infrastructure.security.oauth2.user.OAuth2UserInfoFactory;
-import com.ddd.moodof.domain.model.category.CategoryInitializer;
+import com.ddd.moodof.application.BoardService;
+import com.ddd.moodof.application.CategoryService;
+import com.ddd.moodof.application.dto.BoardDTO;
+import com.ddd.moodof.application.dto.CategoryDTO;
 import com.ddd.moodof.domain.model.user.AuthProvider;
 import com.ddd.moodof.domain.model.user.User;
 import com.ddd.moodof.domain.model.user.UserRepository;
@@ -24,8 +27,11 @@
 @Service
 public class CustomOAuth2UserService extends DefaultOAuth2UserService {
 
+    public static final String CATEGORY_SUB_TITLE = "님의 카테고리";
+    public static final String BOARD_SUB_TITLE = "님의 보드";
     private final UserRepository userRepository;
-    private final CategoryInitializer categoryInitializer;
+    private final BoardService boardService;
+    private final CategoryService categoryService;
 
     @Override
     @Transactional
@@ -68,7 +74,13 @@ private OAuth2User processOAuth2User(OAuth2UserRequest oAuth2UserRequest, OAuth2
     private User registerNewUser(OAuth2UserRequest oAuth2UserRequest, OAuth2UserInfo oAuth2UserInfo) {
         User user = new User(null, oAuth2UserInfo.getEmail(), null, oAuth2UserInfo.getName(), oAuth2UserInfo.getImageUrl(), null, null, AuthProvider.valueOf(oAuth2UserRequest.getClientRegistration().getRegistrationId()), oAuth2UserInfo.getId());
         User saved = userRepository.save(user);
-        categoryInitializer.create(saved.getId(), saved.getNickname());
+
+        CategoryDTO.CreateCategoryRequest category = new CategoryDTO.CreateCategoryRequest(user.getNickname()+ CATEGORY_SUB_TITLE,0L);
+        CategoryDTO.CategoryResponse responseCategory = categoryService.create(category, user.getId());
+
+        BoardDTO.CreateBoard board = new BoardDTO.CreateBoard(0L, responseCategory.getId(), user.getNickname()+ BOARD_SUB_TITLE);
+        boardService.create(user.getId(), board);
+
         return saved;
     }
     private User updateExistingUser(User existingUser, OAuth2UserInfo oAuth2UserInfo) {

src/main/java/com/ddd/moodof/adapter/presentation/BoardController.java

@@ -8,6 +8,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.servlet.http.HttpServletRequest;
 import java.net.URI;
 
 @RequiredArgsConstructor
@@ -45,4 +46,9 @@ public ResponseEntity<BoardDTO.BoardResponse> delete(@LoginUserId Long userId, @
         boardService.delete(userId, id);
         return ResponseEntity.noContent().build();
     }
+    @GetMapping("/{id}")
+    public ResponseEntity<BoardDTO.BoardSharedResponse> getSharedKey(@LoginUserId Long userId, @PathVariable Long id, HttpServletRequest httpServletRequest){
+        BoardDTO.BoardSharedResponse response = boardService.getSharedURI(userId, id, httpServletRequest);
+        return ResponseEntity.ok(response);
+    }
 }

src/main/java/com/ddd/moodof/adapter/presentation/PublicBoardController.java

@@ -0,0 +1,41 @@
+package com.ddd.moodof.adapter.presentation;
+
+import com.ddd.moodof.adapter.presentation.api.PublicBoardAPI;
+import com.ddd.moodof.application.BoardPhotoService;
+import com.ddd.moodof.application.StoragePhotoService;
+import com.ddd.moodof.application.dto.BoardPhotoDTO;
+import com.ddd.moodof.application.dto.StoragePhotoDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+@RequestMapping(PublicBoardController.API_PUBLIC_BOARDS)
+@RestController
+public class PublicBoardController implements PublicBoardAPI {
+
+    public static final String API_PUBLIC_BOARDS = "/api/public/boards";
+
+    private final StoragePhotoService storagePhotoService;
+
+    private final BoardPhotoService boardPhotoService;
+
+    @Override
+    @GetMapping("/{sharedKey}")
+    public ResponseEntity<List<BoardPhotoDTO.BoardPhotoResponse>> findAllByBoard(@PathVariable String sharedKey) {
+        List<BoardPhotoDTO.BoardPhotoResponse> responses = boardPhotoService.findAllBySharedKey(sharedKey);
+        return ResponseEntity.ok(responses);
+    }
+
+    @Override
+    @GetMapping("/{sharedKey}/detail/{id}")
+    public ResponseEntity<StoragePhotoDTO.StoragePhotoDetailResponse> getSharedBoardDetail(
+            @PathVariable String sharedKey,
+            @PathVariable Long id,
+            @RequestParam(required = false, value = "tagIds") List<Long> tagIds){
+        StoragePhotoDTO.StoragePhotoDetailResponse response = storagePhotoService.findSharedBoardDetail(sharedKey, id, tagIds);
+        return ResponseEntity.ok(response);
+    }
+}

src/main/java/com/ddd/moodof/adapter/presentation/SharedBoardId.java

@@ -0,0 +1,10 @@
+package com.ddd.moodof.adapter.presentation;
+
+import java.lang.annotation.*;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface SharedBoardId {
+    String value() default "";
+}

src/main/java/com/ddd/moodof/adapter/presentation/api/BoardAPI.java

@@ -2,11 +2,14 @@
 
 import com.ddd.moodof.adapter.presentation.LoginUserId;
 import com.ddd.moodof.application.dto.BoardDTO;
+import com.ddd.moodof.application.dto.SharedDTO;
 import io.swagger.annotations.ApiImplicitParam;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
+
 public interface BoardAPI {
     @ApiImplicitParam(name = "Authorization", value = "Access Token", required = true, paramType = "header", dataTypeClass = String.class, example = "Bearer access_token")
     @PostMapping
@@ -23,4 +26,5 @@ public interface BoardAPI {
     @ApiImplicitParam(name = "Authorization", value = "Access Token", required = true, paramType = "header", dataTypeClass = String.class, example = "Bearer access_token")
     @DeleteMapping("/{id}")
     ResponseEntity<BoardDTO.BoardResponse> delete(@ApiIgnore @LoginUserId Long userId, @PathVariable Long id);
+
 }

src/main/java/com/ddd/moodof/adapter/presentation/api/PublicBoardAPI.java

@@ -0,0 +1,18 @@
+package com.ddd.moodof.adapter.presentation.api;
+import com.ddd.moodof.application.dto.BoardPhotoDTO;
+import com.ddd.moodof.application.dto.StoragePhotoDTO;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+public interface PublicBoardAPI {
+    @GetMapping("/{sharedKey}")
+    ResponseEntity<List<BoardPhotoDTO.BoardPhotoResponse>> findAllByBoard(@PathVariable String sharedKey);
+
+    @GetMapping("/{sharedKey}/detail/{id}")
+    ResponseEntity<StoragePhotoDTO.StoragePhotoDetailResponse> getSharedBoardDetail(@PathVariable String sharedKey, @PathVariable Long id, @RequestParam(required = false, value = "tagIds") List<Long> tagIds);
+
+}

src/main/java/com/ddd/moodof/application/BoardPhotoService.java

@@ -2,6 +2,8 @@
 
 import com.ddd.moodof.application.dto.BoardPhotoDTO;
 import com.ddd.moodof.application.verifier.BoardPhotoVerifier;
+import com.ddd.moodof.domain.model.board.Board;
+import com.ddd.moodof.domain.model.board.BoardRepository;
 import com.ddd.moodof.domain.model.board.photo.BoardPhoto;
 import com.ddd.moodof.domain.model.board.photo.BoardPhotoRepository;
 import lombok.RequiredArgsConstructor;
@@ -19,6 +21,7 @@ public class BoardPhotoService {
 
     private final BoardPhotoRepository boardPhotoRepository;
     private final BoardPhotoVerifier boardPhotoVerifier;
+    private final BoardRepository boardRepository;
 
     public List<BoardPhotoDTO.BoardPhotoResponse> addPhotos(Long userId, BoardPhotoDTO.AddBoardPhoto request) {
         // TODO: 2021/05/25 StoragePhoto 삭제 대응
@@ -61,4 +64,10 @@ public List<BoardPhotoDTO.BoardPhotoResponse> findAllByBoardId(Long boardId, Lon
         List<BoardPhoto> boardPhotos = boardPhotoRepository.findAllByBoardIdAndUserId(boardId, userId);
         return BoardPhotoDTO.BoardPhotoResponse.listFrom(boardPhotos);
     }
+    public List<BoardPhotoDTO.BoardPhotoResponse> findAllBySharedKey(String sharedKey) {
+        Board board = boardRepository.findBySharedKey(sharedKey)
+                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 sharedKey =" + sharedKey));
+        List<BoardPhoto> boardPhotos = boardPhotoRepository.findAllByBoardIdAndUserId(board.getId(), board.getUserId());
+        return BoardPhotoDTO.BoardPhotoResponse.listFrom(boardPhotos);
+    }
 }

src/main/java/com/ddd/moodof/application/BoardService.java

@@ -1,13 +1,17 @@
 package com.ddd.moodof.application;
 
+import com.ddd.moodof.adapter.infrastructure.security.encrypt.EncryptUtil;
 import com.ddd.moodof.application.dto.BoardDTO;
 import com.ddd.moodof.application.verifier.BoardVerifier;
 import com.ddd.moodof.domain.model.board.Board;
 import com.ddd.moodof.domain.model.board.BoardRepository;
 import com.ddd.moodof.domain.model.board.BoardSequenceUpdater;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.stereotype.Service;
-
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
+import javax.servlet.http.HttpServletRequest;
 import javax.transaction.Transactional;
 
 @RequiredArgsConstructor
@@ -16,9 +20,14 @@ public class BoardService {
     public static final int MAX_BOARD_IN_CATEGORY_COUNT = 10;
 
     private final BoardRepository boardRepository;
+
     private final BoardVerifier boardVerifier;
+
     private final BoardSequenceUpdater boardSequenceUpdater;
 
+    public static final String LOCALHOST = "localhost";
+
+
     @Transactional
     public BoardDTO.BoardResponse create(Long userId, BoardDTO.CreateBoard request) {
         if (boardRepository.countByCategoryId(request.getCategoryId()) >= MAX_BOARD_IN_CATEGORY_COUNT) {
@@ -27,13 +36,19 @@ public BoardDTO.BoardResponse create(Long userId, BoardDTO.CreateBoard request)
 
         Board board = boardVerifier.toEntity(request.getPreviousBoardId(), request.getCategoryId(), request.getName(), userId);
         Board saved = boardRepository.save(board);
-
+        encryptByBoardId(userId, saved);
         boardRepository.findByUserIdAndPreviousBoardIdAndIdNot(userId, request.getPreviousBoardId(), saved.getId())
                 .ifPresent(it -> it.changePreviousBoardId(saved.getId(), userId));
 
         return BoardDTO.BoardResponse.from(saved);
     }
 
+    public void encryptByBoardId(Long userId, Board saved) {
+        String sharedKey = EncryptUtil.encryptSHA256(Long.toString(saved.getId()));
+        saved.updateSharedkey(sharedKey, userId);
+        boardRepository.save(saved);
+    }
+
     public BoardDTO.BoardResponse changeName(Long userId, Long id, BoardDTO.ChangeBoardName request) {
         Board board = boardRepository.findById(id)
                 .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 보드입니다. id = " + id));
@@ -58,4 +73,44 @@ public void delete(Long userId, Long id) {
         }
         boardRepository.deleteById(id);
     }
+
+    public BoardDTO.BoardSharedResponse getSharedURI(Long userId, Long id, HttpServletRequest httpServletRequest) {
+        Board board = boardRepository.findByIdAndUserId(id, userId)
+                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 Board, id = " + id));
+        String requestURI = getUrl(httpServletRequest);
+        String sharedKey = board.getSharedKey();
+        String sharedURI = generatedURI(requestURI, sharedKey);
+        return BoardDTO.BoardSharedResponse.from(id,sharedURI, sharedKey);
+    }
+
+    public String getUrl(HttpServletRequest request) {
+        ServletServerHttpRequest httpRequest = new ServletServerHttpRequest(request);
+        UriComponents uriComponents = UriComponentsBuilder.fromHttpRequest(httpRequest).build();
+
+        String scheme = uriComponents.getScheme();
+        String serverName = request.getServerName();
+        int serverPort = request.getServerPort();
+        String contextPath = request.getRequestURI();
+        StringBuilder url = new StringBuilder();
+
+        url.append(scheme).append("://");
+        url.append(serverName);
+
+        if (serverName.equals(LOCALHOST)) {
+            url.append(":").append("8080");
+        }else {
+            if (serverPort != 80 && serverPort != 443) {
+                url.append(":").append(serverPort);
+            }
+        }
+        url.append(contextPath);
+        return url.toString();
+    }
+
+    private String generatedURI(String requestURL, String sharedKey) {
+        return UriComponentsBuilder.fromUriString(requestURL)
+                .path(sharedKey)
+                .build()
+                .toUriString();
+    }
 }