Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions HalfFifty_BE/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@ repositories {

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
// implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-web'
// implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
Expand All @@ -38,7 +36,6 @@ dependencies {
testImplementation 'org.springframework.security:spring-security-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
implementation 'software.amazon.awssdk:lambda:2.20.26' // AWS Lambda SDK

}

tasks.named('test') {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package HalfFifty.HalfFifty_BE.user.bean;

import HalfFifty.HalfFifty_BE.user.bean.small.GetUserDAOBean;
import HalfFifty.HalfFifty_BE.user.domain.DTO.RequestUserLoginDTO;
import HalfFifty.HalfFifty_BE.user.domain.UserDAO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.UUID;

@Component
public class LoginBean {
GetUserDAOBean getUserDAOBean;

@Autowired
public LoginBean(GetUserDAOBean getUserDAOBean) {
this.getUserDAOBean = getUserDAOBean;
}

public UUID exec(RequestUserLoginDTO requestUserLoginDTO) {
// id와 password로 객체 찾기
System.out.println("requestUserLoginDTO = " + requestUserLoginDTO.getAppleId());
System.out.println("requestUserLoginDTO = " + requestUserLoginDTO.getPassword());
UserDAO userDAO = getUserDAOBean.exec(requestUserLoginDTO.getAppleId(), requestUserLoginDTO.getPassword());
if (userDAO == null) return null;

// 찾은 객체의 키값 반환
return userDAO.getUserId();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public class CreateUserDAOBean {
// 유저 객체 생성
public UserDAO exec(RequestUserSaveDTO requestUserSaveDTO) {
return UserDAO.builder()
.userId(UUID.randomUUID())
.appleId(requestUserSaveDTO.getAppleId())
.password(requestUserSaveDTO.getPassword())
.username(requestUserSaveDTO.getUsername())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@ public GetUserDAOBean(UserRepositoryJPA userRepositoryJPA) {
public UserDAO exec(UUID userId) {
return userRepositoryJPA.findById(userId).orElse(null);
}

public UserDAO exec(String appleId, String password) {
return userRepositoryJPA.findByAppleIdAndPassword(appleId, password);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package HalfFifty.HalfFifty_BE.user.controller;

import HalfFifty.HalfFifty_BE.user.domain.DTO.RequestUserLoginDTO;
import HalfFifty.HalfFifty_BE.user.domain.DTO.RequestUserSaveDTO;
import HalfFifty.HalfFifty_BE.user.domain.DTO.RequestUserUpdateDTO;
import HalfFifty.HalfFifty_BE.user.domain.DTO.ResponseUserGetDTO;
Expand Down Expand Up @@ -78,4 +79,22 @@ public ResponseEntity<Map<String, Object>> saveUser(@RequestBody RequestUserSave
// status, body 설정해서 응답 리턴
return ResponseEntity.status(HttpStatus.OK).body(requestMap);
}

@GetMapping("/login")
public ResponseEntity<Map<String, Object>> login(@RequestBody RequestUserLoginDTO requestUserLoginDTO) {
// 유저 로그인 service
UUID userId = userService.login(requestUserLoginDTO);

// 유저 로그인 성공 여부
boolean success = userId != null;

// Map을 통해 메시지와 id 값 json 테이터로 변환
Map<String, Object> requestMap = new HashMap<>();
requestMap.put("success", success);
requestMap.put("message", success ? "유저 로그인 성공" : "유저 로그인 실패");
requestMap.put("userId", userId);

// status, body 설정해서 응답 리턴
return ResponseEntity.status(HttpStatus.OK).body(requestMap);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package HalfFifty.HalfFifty_BE.user.domain.DTO;

import lombok.Data;

@Data
public class RequestUserLoginDTO {
String appleId;
String password;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@

@Repository
public interface UserRepositoryJPA extends JpaRepository<UserDAO, UUID> {
UserDAO findByAppleIdAndPassword(String appleId, String password);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import HalfFifty.HalfFifty_BE.user.bean.GetUserBean;
import HalfFifty.HalfFifty_BE.user.bean.SaveUserBean;
import HalfFifty.HalfFifty_BE.user.bean.UpdateUserBean;
import HalfFifty.HalfFifty_BE.user.bean.LoginBean;
import HalfFifty.HalfFifty_BE.user.domain.DTO.RequestUserLoginDTO;
import HalfFifty.HalfFifty_BE.user.domain.DTO.RequestUserSaveDTO;
import HalfFifty.HalfFifty_BE.user.domain.DTO.RequestUserUpdateDTO;
import HalfFifty.HalfFifty_BE.user.domain.DTO.ResponseUserGetDTO;
Expand All @@ -16,12 +18,14 @@ public class UserService {
SaveUserBean saveUserBean;
GetUserBean getUserBean;
UpdateUserBean updateUserBean;
LoginBean loginBean;

@Autowired
public UserService(SaveUserBean saveUserBean, GetUserBean getUserBean, UpdateUserBean updateUserBean) {
public UserService(SaveUserBean saveUserBean, GetUserBean getUserBean, UpdateUserBean updateUserBean, LoginBean loginBean) {
this.saveUserBean = saveUserBean;
this.getUserBean = getUserBean;
this.updateUserBean = updateUserBean;
this.loginBean = loginBean;
}

// 유저 프로필 조회
Expand All @@ -38,4 +42,9 @@ public UUID updateUser(RequestUserUpdateDTO requestUserUpdateDTO) {
public UUID exec(RequestUserSaveDTO requestUserSaveDTO) {
return saveUserBean.exec(requestUserSaveDTO);
}

// 유저 로그인
public UUID login(RequestUserLoginDTO requestUserLoginDTO) {
return loginBean.exec(requestUserLoginDTO);
}
}
Loading