[1주차 미션] 구현 완료했습니다. 리뷰 부탁드립니다.

build.gradle

@@ -11,7 +11,6 @@ buildscript {
 }
 
 apply plugin: 'java'
-apply plugin: 'eclipse'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
@@ -23,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.junit.jupiter:junit-jupiter:5.9.0'
+    implementation 'org.junit.jupiter:junit-jupiter:5.3.2'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-devtools'
@@ -37,6 +36,11 @@ dependencies {
     implementation 'org.modelmapper:modelmapper:3.0.0'
     implementation 'org.springdoc:springdoc-openapi-ui:1.6.11'
     implementation 'com.h2database:h2'
+    implementation 'org.mapstruct:mapstruct:1.5.2.Final'
+    implementation 'org.mockito:mockito-core:2.22.0'
+    implementation 'org.mockito:mockito-junit-jupiter:2.22.0'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.2.Final'
+    annotationProcessor 'org.projectlombok:lombok:1.18.24'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

src/main/java/codesquad/AppConfig.java

@@ -1,22 +1,36 @@
 package codesquad;
 
-import codesquad.repository.ArrayUserRepository;
+import codesquad.repository.QuestionRepositoryImpl;
+import codesquad.repository.UserRepositoryImpl;
+import codesquad.repository.QuestionRepository;
 import codesquad.repository.UserRepository;
+import codesquad.service.QuestionService;
+import codesquad.service.QuestionServiceImpl;
 import codesquad.service.UserService;
 import codesquad.service.UserServiceImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class AppConfig {
-
+    
     @Bean
     public UserService userService() {
         return new UserServiceImpl(userRepository());
     }
 
     @Bean
     public UserRepository userRepository() {
-        return new ArrayUserRepository();
+        return new UserRepositoryImpl();
+    }
+
+    @Bean
+    public QuestionService questionService() {
+        return new QuestionServiceImpl(questionRepository());
+    }
+
+    @Bean
+    public QuestionRepository questionRepository() {
+        return new QuestionRepositoryImpl();
     }
 }

src/main/java/codesquad/controller/QuestionController.java

@@ -0,0 +1,74 @@
+package codesquad.controller;
+
+import codesquad.AppConfig;
+import codesquad.dto.question.QuestionRequestDto;
+import codesquad.dto.question.QuestionResponseDto;
+import codesquad.entity.QuestionEntity;
+import codesquad.mapper.QuestionMapper;
+import codesquad.service.QuestionService;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Controller
+public class QuestionController {
+    ApplicationContext applicationContext = new AnnotationConfigApplicationContext(AppConfig.class);
+    QuestionService questionService = applicationContext.getBean("questionService", QuestionService.class);
+
+    @GetMapping("/questions/post")
+    public String getQuestionForm() {
+        return "qna/form";
+    }
+
+    @PostMapping("/questions")
+    public String postQuestion(QuestionRequestDto questionRequestDto) {
+        QuestionEntity questionEntity = QuestionMapper.dtoToEntity(questionRequestDto);
+        questionService.postQuestion(questionEntity);
+        return "redirect:/questions";
+    }
+
+    @GetMapping("/questions")
+    public String getQuestionList(Model model) {
+        List<QuestionResponseDto> questions = questionService.findQuestions().stream()
+                .map(questionEntity -> QuestionMapper.entityToDto(questionEntity))
+                .collect(Collectors.toList());
+
+        model.addAttribute("questions", questions);
+
+        return "qna/list";
+    }
+
+    @GetMapping("/questions/{id}")
+    public String getQuestionShow(@PathVariable String id, Model model) {
+        QuestionResponseDto question = new QuestionResponseDto(questionService.findQuestion(id));
+
+        model.addAttribute("writer", question.getWriter());
+        model.addAttribute("title", question.getTitle());
+        model.addAttribute("contents", question.getContents());
+        model.addAttribute("date", question.getDate());
+
+        return "qna/show";
+    }
+
+    @GetMapping("/")
+    public String getHome(Model model) {
+        List<QuestionEntity> questionEntityList = questionService.findQuestions();
+        if (questionEntityList.size() == 0) {
+            return "qna/list";
+        }
+
+        List<QuestionResponseDto> questionResponseDtoList = questionService.findQuestions().stream()
+                .map(questionEntity -> QuestionMapper.entityToDto(questionEntity))
+                .collect(Collectors.toList());
+
+        model.addAttribute("questions", questionResponseDtoList);
+        return "qna/list";
+    }
+}

src/main/java/codesquad/controller/UserController.java

@@ -1,18 +1,17 @@
 package codesquad.controller;
 
 import codesquad.AppConfig;
-import codesquad.dto.UserDto;
+import codesquad.dto.user.UserDto;
+import codesquad.dto.user.UserUpdateRequestDto;
 import codesquad.entity.UserEntity;
+import codesquad.mapper.UserMapper;
 import codesquad.service.UserService;
 import org.modelmapper.ModelMapper;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -39,7 +38,6 @@ public String registerUser(UserDto userDto) {
 
     @GetMapping()
     public String getUserList(Model model) {
-        System.out.println("userService.findUsers().get(0) = " + userService.findUsers().get(0));
         List<UserDto> users = userService.findUsers().stream()
                 .map(userEntity -> modelMapper.map(userEntity, UserDto.class)).collect(Collectors.toList());
         model.addAttribute("users", users);
@@ -57,4 +55,15 @@ public String getUserProfile(@PathVariable String userId, Model model) {
 
         return "user/profile";
     }
+
+    @GetMapping("/{userId}/form")
+    public String getProfileEditForm() {
+        return "user/update_form";
+    }
+
+    @PutMapping("/{userId}/update")
+    public String updateUserProfile(@PathVariable("userId") String userId, UserUpdateRequestDto requestDto) {
+        userService.updateUser(userId, UserMapper.dtoToEntity(requestDto));
+        return "redirect:/users";
+    }
 }

src/main/java/codesquad/dto/question/QuestionRequestDto.java

@@ -0,0 +1,22 @@
+package codesquad.dto.question;
+
+import lombok.*;
+
+@AllArgsConstructor
+@Getter
+@Setter
+@Builder
+public class QuestionRequestDto {
+    private String writer;
+    private String title;
+    private String contents;
+
+    @Override
+    public String toString() {
+        return "QuestionDto{" +
+                "writer='" + writer + '\'' +
+                ", title='" + title + '\'' +
+                ", contents='" + contents + '\'' +
+                '}';
+    }
+}

src/main/java/codesquad/dto/question/QuestionResponseDto.java

@@ -0,0 +1,23 @@
+package codesquad.dto.question;
+
+import codesquad.entity.QuestionEntity;
+import codesquad.mapper.QuestionMapper;
+import lombok.*;
+
+@AllArgsConstructor
+@Getter
+@Setter
+@Builder
+public class QuestionResponseDto {
+    private String writer;
+    private String title;
+    private String contents;
+    private String date;
+
+    public QuestionResponseDto(QuestionEntity questionEntity) {
+        writer = questionEntity.getWriter();
+        title = questionEntity.getTitle();
+        contents = questionEntity.getContents();
+        date = QuestionMapper.localTimeToString(questionEntity.getCreatedDate());
+    }
+}

src/main/java/codesquad/dto/UserDto.java → src/main/java/codesquad/dto/user/UserDto.java

@@ -1,13 +1,11 @@
-package codesquad.dto;
+package codesquad.dto.user;
 
 import codesquad.entity.UserEntity;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @NoArgsConstructor
-@AllArgsConstructor
 @Getter
 @Setter
 public class UserDto {
@@ -23,22 +21,6 @@ public UserDto(UserEntity userEntity) {
         email = userEntity.getEmail();
     }
 
-    public String getUserId() {
-        return userId;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
     @Override
     public String toString() {
         return "UserDto{" +

src/main/java/codesquad/dto/user/UserUpdateRequestDto.java

@@ -0,0 +1,40 @@
+package codesquad.dto.user;
+
+import lombok.Builder;
+
+@Builder
+public class UserUpdateRequestDto {
+    private String password;
+    private String name;
+    private String email;
+
+    public UserUpdateRequestDto(String password, String name, String email) {
+        this.password = password;
+        this.name = name;
+        this.email = email;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}

src/main/java/codesquad/entity/BaseTimeEntity.java

@@ -0,0 +1,13 @@
+package codesquad.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public abstract class BaseTimeEntity {
+
+    private LocalDateTime createdDate;
+    private LocalDateTime modifiedDate;
+}

src/main/java/codesquad/entity/QuestionEntity.java

@@ -0,0 +1,24 @@
+package codesquad.entity;
+
+import lombok.*;
+
+@Setter
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class QuestionEntity extends BaseTimeEntity {
+
+    private String writer;
+    private String title;
+    private String contents;
+
+    @Override
+    public String toString() {
+        return "QuestionEntity{" +
+                "writer='" + writer + '\'' +
+                ", title='" + title + '\'' +
+                ", contents='" + contents + '\'' +
+                '}';
+    }
+}