feat : calendar 추가

build.gradle

@@ -41,7 +41,6 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
     implementation 'com.amazonaws:aws-java-sdk-s3:1.12.609'
-    implementation 'com.naver.cloud:ncloud-objectstorage-sdk-java:1.0.0'
     implementation 'org.apache.httpcomponents:httpclient:4.5.13'
     implementation 'org.apache.httpcomponents:httpmime:4.5.13'
     implementation 'com.google.code.gson:gson:2.8.9'

src/main/java/mvc/promiseme/calendar/repository/CalendarRepository.java

@@ -4,9 +4,11 @@
 import mvc.promiseme.calendar.entity.Calendar;
 import mvc.promiseme.project.entity.Project;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface CalendarRepository extends JpaRepository<Calendar, Long> {
+    @Query("SELECT NEW mvc.promiseme.calendar.dto.CalendarResponseDTO(c.content, c.startDate, c.finishDate, u.nickname) from Calendar c join c.member m join m.users u where c.project = :project")
     List<CalendarResponseDTO> findByProject(Project project);
 }

src/main/java/mvc/promiseme/common/exception/ErrorCode.java

@@ -12,17 +12,13 @@ public enum ErrorCode implements EnumModel{
 
     //예시
     //회원 로그인 시 발생 가능 예외
-    INVALID_Customer_Login(401, "C001", "존재하지 않는 고객 정보입니다."),
-    INVALID_Customer_Password(401, "C002", "비밀번호가 일치하지 않습니다."),
-
-
-    // 행원 로그인 시 발생 가능 예외
-    INVALID_BANKER_Login(401,"B001","존재하지 않는 행원 정보입니다."),
-    INVALID_BANKER_Password(401,"B002","비밀번호가 일치하지 않습니다."),
+    INVALID_User_Login(401, "U001", "존재하지 않는 고객 정보입니다."),
+    INVALID_User_Password(401, "U002", "비밀번호가 일치하지 않습니다."),
 
     //중복여부 체크
     DUPLICATE_USER(400,"D001","중복된 이메일입니다.");
 
+
     private int status;
     private String code;
     private String message;

src/main/java/mvc/promiseme/users/dto/LoginResponseDTO.java

@@ -8,7 +8,7 @@
 @Setter
 @Builder
 public class LoginResponseDTO {
-    private String userId;
+    private Long userId;
     private String nickname;
-    private String token;
+//    private String token;
 }

src/main/java/mvc/promiseme/users/service/UserServiceImpl.java

@@ -29,7 +29,15 @@ public String register(UserDTO userDTO) {
 
     @Override
     public LoginResponseDTO login(LoginRequestDTO loginRequestDTO) {
-        return null;
+
+        Users loginUser = userRepository.findByEmail(loginRequestDTO.getEmail());
+        if(loginUser == null)
+            throw new UserException(ErrorCode.INVALID_User_Login);
+
+        if(!loginRequestDTO.getPassword().equals(loginUser.getPassword()))
+            throw new UserException(ErrorCode.INVALID_User_Password);
+
+        return new LoginResponseDTO(loginUser.getUserId(),loginUser.getNickname());
     }
 
     @Override
@@ -39,6 +47,11 @@ public String logout(String token) {
 
     @Override
     public Long check(String email) {
-        return null;
+        Users checkUser = userRepository.findByEmail(email);
+        if(checkUser == null)
+            throw new UserException(ErrorCode.INVALID_User_Login);
+
+
+        return checkUser.getUserId();
     }
 }