mindol1004/hexagonal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

21.12.05 리팩토링중

Browse Source
This commit is contained in:
jinia91
2021-12-05 22:10:12 +09:00
parent c62a003d26
commit f45bfa1571
18 changed files with 309 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/myblog/blog/article/controller/ArticleController.java
View File

@@ -23,6 +23,7 @@ import org.modelmapper.ModelMapper;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Slice;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
@@ -54,7 +55,7 @@ public class ArticleController {
categoryService
.findCategoryByTier(2)
.stream()
.map(c -> modelMapper.map(c, CategoryNormalDto.class))
.map(category -> modelMapper.map(category, CategoryNormalDto.class))
.collect(Collectors.toList());
model.addAttribute("categoryInput", categoryForInput);
@@ -62,7 +63,7 @@ public class ArticleController {
tagsService
.findAllTags()
.stream()
.map(c -> new TagsDto(c.getName()))
.map(tag -> new TagsDto(tag.getName()))
.collect(Collectors.toList());
model.addAttribute("tagsInput", tagsForInput);
@@ -81,13 +82,15 @@ public class ArticleController {
return "article/articleWriteForm";
}
/*
- 넘어온 articleForm을 저장
*/
@PostMapping("article/write")
@Transactional
public String writeArticle(@ModelAttribute ArticleForm articleForm, Authentication authentication) {
public String writeArticle(ArticleForm articleForm, @AuthenticationPrincipal PrincipalDetails principal) {
PrincipalDetails principal = (PrincipalDetails) authentication.getPrincipal();
articleForm.setMemberId(principal.getMemberId());
Article article = articleService.writeArticle(articleForm);
Article article = articleService.writeArticle(articleForm, principal.getMember());
// articleService.pushArticleToGithub(article);
tempArticleService.deleteTemp();
@@ -311,10 +314,8 @@ public class ArticleController {
@PostMapping("/article/edit")
@Transactional
public String editArticle(@RequestParam Long articleId,
@ModelAttribute ArticleForm articleForm, Authentication authentication) {
@ModelAttribute ArticleForm articleForm, @AuthenticationPrincipal PrincipalDetails principal) {
PrincipalDetails principal = (PrincipalDetails) authentication.getPrincipal();
articleForm.setMemberId(principal.getMemberId());
articleService.editArticle(articleId, articleForm);