-
Notifications
You must be signed in to change notification settings - Fork 2
hw3-1 완료 #7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Uechann
wants to merge
1
commit into
main
Choose a base branch
from
uechann
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
hw3-1 완료 #7
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
15 changes: 13 additions & 2 deletions
15
src/main/java/com/example/springhw31/controller/UserController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,27 @@ | ||
| package com.example.springhw31.controller; | ||
|
|
||
| import com.example.springhw31.dto.UserDto; | ||
| import org.springframework.web.bind.annotation.ModelAttribute; | ||
| import com.example.springhw31.service.UserService; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
| /** | ||
| * 회원가입 메서드처럼 UserDto를 파라미터로 받아주세요 | ||
| */ | ||
|
|
||
| @RestController | ||
| @RequiredArgsConstructor | ||
| public class UserController { | ||
|
|
||
| private final UserService userService; | ||
|
|
||
| public UserDto join(@ModelAttribute UserDto userDto) { | ||
| @PostMapping("/signup") | ||
| public UserDto signup(@ModelAttribute UserDto userDto) { | ||
| return userService.signup(userDto); | ||
| } | ||
|
|
||
| @GetMapping("/signin") | ||
| public String signin(@ModelAttribute UserDto userDto) { | ||
| return userService.signin(userDto); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,9 +11,6 @@ | |
| public class UserDto { | ||
|
|
||
| private String username; | ||
|
|
||
| private String password; | ||
|
|
||
| private String nickname; | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,27 @@ | ||
| package com.example.springhw31.entity; | ||
|
|
||
|
|
||
| import jakarta.persistence.*; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| /** | ||
| * TODO: 완성된 코드 아닙니다~ | ||
| */ | ||
| @Entity | ||
| @Getter | ||
| @Setter | ||
| public class User { | ||
| @Id | ||
| @GeneratedValue(strategy = GenerationType.AUTO) | ||
| private Long id; | ||
|
|
||
| @Column(nullable = false, unique = true) | ||
| private String username; | ||
|
|
||
| @Column(nullable = false) | ||
| private String password; | ||
|
|
||
| @Column(nullable = false, unique = true) | ||
| private String nickname; | ||
| } |
7 changes: 6 additions & 1 deletion
7
src/main/java/com/example/springhw31/repository/UserRepository.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| package com.example.springhw31.repository; | ||
|
|
||
| public class UserRepository { | ||
| import org.springframework.data.jpa.repository.JpaRepository; | ||
| import com.example.springhw31.entity.User; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| public interface UserRepository extends JpaRepository<User, Long> { | ||
| Optional<User> findByUsername(String username); | ||
| } |
34 changes: 33 additions & 1 deletion
34
src/main/java/com/example/springhw31/service/UserService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,46 @@ | ||
| package com.example.springhw31.service; | ||
|
|
||
| import com.example.springhw31.dto.UserDto; | ||
| import com.example.springhw31.entity.User; | ||
| import com.example.springhw31.repository.UserRepository; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import java.util.NoSuchElementException; | ||
|
|
||
| /** | ||
| * Controller에 반환할 때도 DTO 객체를 반환합니다. | ||
| */ | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class UserService { | ||
|
|
||
| public UserDto join(UserDto userDto) { | ||
| private final UserRepository userRepository; | ||
|
|
||
| //회원가입 로직 | ||
| //아이디, 비밀번호, 닉네임은 null 불가(@Column 사용) | ||
| //아이디 또는 닉네님이 중복된 경우 회원가입불가 | ||
| public UserDto signup(UserDto userDto) { | ||
| User user = new User(); | ||
| user.setUsername(userDto.getUsername()); | ||
| user.setPassword(userDto.getPassword()); | ||
| user.setNickname(userDto.getNickname()); | ||
| userRepository.save(user); | ||
| return userDto; | ||
| } | ||
|
|
||
| //로그인 로직 | ||
| //로그인 성공 시 “{회원 닉네임} 님, 환영합니다!!” 라는 문자열 출력 | ||
| //로그인 실패 시 “아이디 및 비밀번호가 일치하지 않습니다.” 문자열 출력 | ||
| public String signin(UserDto userDto) { | ||
| User user = userRepository.findByUsername(userDto.getUsername()) | ||
| .orElseThrow(() -> new NoSuchElementException("해당 유저가 없습니다.")); | ||
|
|
||
| if(user.getPassword().equals(userDto.getPassword())){ | ||
| return user.getNickname() + "님 환영합니다.!!"; | ||
| }else{ | ||
| return "비밀번호가 일치하지 않습니다."; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
여기 로직 넘 맘에 들어여 ㅎㅎ