refactor: add nextstep parent package

javajigi · javajigi · commit 0c65f879eec5 · 2023-03-27T12:43:50.000+09:00
diff --git a/src/main/java/nextstep/NextstepApplication.java b/src/main/java/nextstep/NextstepApplication.java
@@ -1,13 +1,13 @@
-package lms;
+package nextstep;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class LmsApplication {
+public class NextstepApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(LmsApplication.class, args);
+		SpringApplication.run(NextstepApplication.class, args);
 	}
 
 }
diff --git a/src/main/java/nextstep/courses/domain/Course.java b/src/main/java/nextstep/courses/domain/Course.java
@@ -1,4 +1,4 @@
-package lms.domain;
+package nextstep.courses.domain;
 
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/nextstep/courses/domain/CourseRepository.java b/src/main/java/nextstep/courses/domain/CourseRepository.java
@@ -1,4 +1,4 @@
-package lms.domain;
+package nextstep.courses.domain;
 
 public interface CourseRepository {
     int save(Course course);
diff --git a/src/main/java/nextstep/courses/infrastructure/JdbcCourseRepository.java b/src/main/java/nextstep/courses/infrastructure/JdbcCourseRepository.java
@@ -1,8 +1,7 @@
-package lms.infrastructure;
+package nextstep.courses.infrastructure;
 
-import lms.domain.Course;
-import lms.domain.CourseRepository;
-import org.springframework.beans.factory.annotation.Autowired;
+import nextstep.courses.domain.CourseRepository;
+import nextstep.courses.domain.Course;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
@@ -12,9 +11,12 @@
 
 @Repository("courseRepository")
 public class JdbcCourseRepository implements CourseRepository {
-    @Autowired
     private JdbcOperations jdbcTemplate;
 
+    public JdbcCourseRepository(JdbcOperations jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
     @Override
     public int save(Course course) {
         String sql = "insert into course (title, creator_id, created_at) values(?, ?, ?)";
diff --git a/src/main/java/nextstep/qna/CannotDeleteException.java b/src/main/java/nextstep/qna/CannotDeleteException.java
@@ -1,9 +1,9 @@
-package qna;
+package nextstep.qna;
 
 public class CannotDeleteException extends Exception {
     private static final long serialVersionUID = 1L;
 
     public CannotDeleteException(String message) {
         super(message);
     }
-}
+}
diff --git a/src/main/java/nextstep/qna/ForbiddenException.java b/src/main/java/nextstep/qna/ForbiddenException.java
@@ -1,4 +1,4 @@
-package qna;
+package nextstep.qna;
 
 public class ForbiddenException extends RuntimeException{
     public ForbiddenException() {
diff --git a/src/main/java/nextstep/qna/NotFoundException.java b/src/main/java/nextstep/qna/NotFoundException.java
@@ -1,4 +1,4 @@
-package qna;
+package nextstep.qna;
 
 public class NotFoundException extends RuntimeException {
 }
diff --git a/src/main/java/nextstep/qna/UnAuthenticationException.java b/src/main/java/nextstep/qna/UnAuthenticationException.java
@@ -1,4 +1,4 @@
-package qna;
+package nextstep.qna;
 
 public class UnAuthenticationException extends Exception {
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/nextstep/qna/UnAuthorizedException.java b/src/main/java/nextstep/qna/UnAuthorizedException.java
@@ -1,4 +1,4 @@
-package qna;
+package nextstep.qna;
 
 public class UnAuthorizedException extends RuntimeException {
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/nextstep/qna/domain/Answer.java b/src/main/java/nextstep/qna/domain/Answer.java
@@ -1,8 +1,8 @@
-package qna.domain;
+package nextstep.qna.domain;
 
-import qna.NotFoundException;
-import qna.UnAuthorizedException;
-import users.domain.NsUser;
+import nextstep.qna.NotFoundException;
+import nextstep.qna.UnAuthorizedException;
+import nextstep.users.domain.NsUser;
 
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/nextstep/qna/domain/AnswerRepository.java b/src/main/java/nextstep/qna/domain/AnswerRepository.java
@@ -1,4 +1,4 @@
-package qna.domain;
+package nextstep.qna.domain;
 
 import java.util.List;
 
diff --git a/src/main/java/nextstep/qna/domain/ContentType.java b/src/main/java/nextstep/qna/domain/ContentType.java
@@ -1,4 +1,4 @@
-package qna.domain;
+package nextstep.qna.domain;
 
 public enum ContentType {
     QUESTION, ANSWER;
diff --git a/src/main/java/nextstep/qna/domain/DeleteHistory.java b/src/main/java/nextstep/qna/domain/DeleteHistory.java
@@ -1,6 +1,6 @@
-package qna.domain;
+package nextstep.qna.domain;
 
-import users.domain.NsUser;
+import nextstep.users.domain.NsUser;
 
 import java.time.LocalDateTime;
 import java.util.Objects;
diff --git a/src/main/java/nextstep/qna/domain/DeleteHistoryRepository.java b/src/main/java/nextstep/qna/domain/DeleteHistoryRepository.java
@@ -1,4 +1,4 @@
-package qna.domain;
+package nextstep.qna.domain;
 
 import java.util.List;
 
diff --git a/src/main/java/nextstep/qna/domain/Question.java b/src/main/java/nextstep/qna/domain/Question.java
@@ -1,6 +1,6 @@
-package qna.domain;
+package nextstep.qna.domain;
 
-import users.domain.NsUser;
+import nextstep.users.domain.NsUser;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
diff --git a/src/main/java/nextstep/qna/domain/QuestionRepository.java b/src/main/java/nextstep/qna/domain/QuestionRepository.java
@@ -1,4 +1,4 @@
-package qna.domain;
+package nextstep.qna.domain;
 
 import java.util.Optional;
 
diff --git a/src/main/java/nextstep/qna/infrastructure/JdbcAnswerRepository.java b/src/main/java/nextstep/qna/infrastructure/JdbcAnswerRepository.java
@@ -1,8 +1,8 @@
-package qna.infrastructure;
+package nextstep.qna.infrastructure;
 
 import org.springframework.stereotype.Repository;
-import qna.domain.Answer;
-import qna.domain.AnswerRepository;
+import nextstep.qna.domain.Answer;
+import nextstep.qna.domain.AnswerRepository;
 
 import java.util.List;
 
diff --git a/src/main/java/nextstep/qna/infrastructure/JdbcDeleteHistoryRepository.java b/src/main/java/nextstep/qna/infrastructure/JdbcDeleteHistoryRepository.java
@@ -1,8 +1,8 @@
-package qna.infrastructure;
+package nextstep.qna.infrastructure;
 
+import nextstep.qna.domain.DeleteHistory;
 import org.springframework.stereotype.Repository;
-import qna.domain.DeleteHistory;
-import qna.domain.DeleteHistoryRepository;
+import nextstep.qna.domain.DeleteHistoryRepository;
 
 import java.util.List;
 
diff --git a/src/main/java/nextstep/qna/infrastructure/JdbcQuestionRepository.java b/src/main/java/nextstep/qna/infrastructure/JdbcQuestionRepository.java
@@ -1,8 +1,8 @@
-package qna.infrastructure;
+package nextstep.qna.infrastructure;
 
 import org.springframework.stereotype.Repository;
-import qna.domain.Question;
-import qna.domain.QuestionRepository;
+import nextstep.qna.domain.Question;
+import nextstep.qna.domain.QuestionRepository;
 
 import java.util.Optional;
 
diff --git a/src/main/java/nextstep/qna/service/DeleteHistoryService.java b/src/main/java/nextstep/qna/service/DeleteHistoryService.java
@@ -1,10 +1,10 @@
-package qna.service;
+package nextstep.qna.service;
 
+import nextstep.qna.domain.DeleteHistory;
+import nextstep.qna.domain.DeleteHistoryRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import qna.domain.DeleteHistory;
-import qna.domain.DeleteHistoryRepository;
 
 import javax.annotation.Resource;
 import java.util.List;
diff --git a/src/main/java/nextstep/qna/service/QnAService.java b/src/main/java/nextstep/qna/service/QnAService.java
@@ -1,11 +1,11 @@
-package qna.service;
+package nextstep.qna.service;
 
+import nextstep.qna.CannotDeleteException;
+import nextstep.qna.NotFoundException;
+import nextstep.qna.domain.*;
+import nextstep.users.domain.NsUser;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import qna.CannotDeleteException;
-import qna.NotFoundException;
-import qna.domain.*;
-import users.domain.NsUser;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
diff --git a/src/main/java/nextstep/users/domain/NsUser.java b/src/main/java/nextstep/users/domain/NsUser.java
@@ -1,6 +1,6 @@
-package users.domain;
+package nextstep.users.domain;
 
-import qna.UnAuthorizedException;
+import nextstep.qna.UnAuthorizedException;
 
 import java.time.LocalDateTime;
 import java.util.Objects;
@@ -18,23 +18,25 @@ public class NsUser {
 
     private String email;
 
-    private LocalDateTime createdDate = LocalDateTime.now();
+    private LocalDateTime createdAt;
 
-    private LocalDateTime updatedDate;
+    private LocalDateTime updatedAt;
 
     public NsUser() {
     }
 
-    public NsUser(String userId, String password, String name, String email) {
-        this(null, userId, password, name, email);
+    public NsUser(Long id, String userId, String password, String name, String email) {
+        this(id, userId, password, name, email, LocalDateTime.now(), null);
     }
 
-    public NsUser(Long id, String userId, String password, String name, String email) {
+    public NsUser(Long id, String userId, String password, String name, String email, LocalDateTime createdAt, LocalDateTime updatedAt) {
         this.id = id;
         this.userId = userId;
         this.password = password;
         this.name = name;
         this.email = email;
+        this.createdAt = createdAt;
+        this.updatedAt = updatedAt;
     }
 
     public Long getId() {
@@ -124,6 +126,13 @@ public boolean isGuestUser() {
 
     @Override
     public String toString() {
-        return "User [userId=" + userId + ", password=" + password + ", name=" + name + ", email=" + email + "]";
+        return "NsUser{" +
+                "id=" + id +
+                ", userId='" + userId + '\'' +
+                ", name='" + name + '\'' +
+                ", email='" + email + '\'' +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                '}';
     }
 }
diff --git a/src/main/java/nextstep/users/domain/UserRepository.java b/src/main/java/nextstep/users/domain/UserRepository.java
@@ -1,4 +1,4 @@
-package users.domain;
+package nextstep.users.domain;
 
 import java.util.Optional;
 
diff --git a/src/main/java/nextstep/users/infrastructure/JdbcUserRepository.java b/src/main/java/nextstep/users/infrastructure/JdbcUserRepository.java
@@ -0,0 +1,42 @@
+package nextstep.users.infrastructure;
+
+import nextstep.users.domain.NsUser;
+import nextstep.users.domain.UserRepository;
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Repository;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.Optional;
+
+@Repository("userRepository")
+public class JdbcUserRepository implements UserRepository {
+    private JdbcOperations jdbcTemplate;
+
+    public JdbcUserRepository(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    @Override
+    public Optional<NsUser> findByUserId(String userId) {
+        String sql = "select id, user_id, password, name, email, created_at, updated_at from ns_user where user_id = ?";
+        RowMapper<NsUser> rowMapper = (rs, rowNum) -> new NsUser(
+                rs.getLong(1),
+                rs.getString(2),
+                rs.getString(3),
+                rs.getString(4),
+                rs.getString(5),
+                toLocalDateTime(rs.getTimestamp(6)),
+                toLocalDateTime(rs.getTimestamp(7)));
+        return Optional.of(jdbcTemplate.queryForObject(sql, rowMapper, userId));
+    }
+
+    private LocalDateTime toLocalDateTime(Timestamp timestamp) {
+        if (timestamp == null) {
+            return null;
+        }
+        return timestamp.toLocalDateTime();
+    }
+}
diff --git a/src/main/java/users/infrastructure/JdbcUserRepository.java b/src/main/java/users/infrastructure/JdbcUserRepository.java
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -7,9 +7,7 @@
         </layout>
     </appender>
 
-    <logger name="qna" level="DEBUG"/>
-
-    <logger name="lms" level="DEBUG"/>
+    <logger name="nextstep" level="DEBUG"/>
 
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
@@ -9,12 +9,12 @@ create table course (
 
 create table ns_user (
     id bigint generated by default as identity,
+    user_id varchar(20) not null,
+    password varchar(20) not null,
+    name varchar(20) not null,
+    email varchar(50),
     created_at timestamp not null,
     updated_at timestamp,
-    email varchar(50),
-    name varchar(20) not null,
-    password varchar(20) not null,
-    user_id varchar(20) not null,
     primary key (id)
 );
 
diff --git a/src/test/java/nextstep/NextstepApplicationTest.java b/src/test/java/nextstep/NextstepApplicationTest.java
@@ -1,10 +1,10 @@
-package lms;
+package nextstep;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class LmsApplicationTest {
+class NextstepApplicationTest {
     @Test
     void contextLoads() {
     }
diff --git a/src/test/java/nextstep/courses/infrastruecture/CourseRepositoryTest.java b/src/test/java/nextstep/courses/infrastruecture/CourseRepositoryTest.java
diff --git a/src/test/java/nextstep/qna/domain/AnswerTest.java b/src/test/java/nextstep/qna/domain/AnswerTest.java
diff --git a/src/test/java/nextstep/qna/domain/QuestionTest.java b/src/test/java/nextstep/qna/domain/QuestionTest.java
diff --git a/src/test/java/nextstep/qna/service/QnaServiceTest.java b/src/test/java/nextstep/qna/service/QnaServiceTest.java
diff --git a/src/test/java/nextstep/users/domain/NsUserTest.java b/src/test/java/nextstep/users/domain/NsUserTest.java
diff --git a/src/test/java/nextstep/users/infrastructure/UserRepositoryTest.java b/src/test/java/nextstep/users/infrastructure/UserRepositoryTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`		`-package lms;`
	`1`	`+package nextstep;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.SpringApplication;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
`5`	`5`
`6`	`6`	`@SpringBootApplication`
`7`		`-public class LmsApplication {`
	`7`	`+public class NextstepApplication {`
`8`	`8`
`9`	`9`	`public static void main(String[] args) {`
`10`		`- SpringApplication.run(LmsApplication.class, args);`
	`10`	`+ SpringApplication.run(NextstepApplication.class, args);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package lms.domain;`
	`1`	`+package nextstep.courses.domain;`
`2`	`2`
`3`	`3`	`import java.time.LocalDateTime;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package qna;`
	`1`	`+package nextstep.qna;`
`2`	`2`
`3`	`3`	`public class ForbiddenException extends RuntimeException{`
`4`	`4`	`public ForbiddenException() {`