Merge pull request #143 from tukcomCD2024/Dev-backend

Dev backend
tukcomCD2024 · Jun 17, 2024 · 0e1a3ad · 0e1a3ad
2 parents 63a880b + 826ced8
commit 0e1a3ad
Show file tree

Hide file tree

Showing 27 changed files with 668 additions and 224 deletions.
diff --git a/backend/core/build.gradle b/backend/core/build.gradle
@@ -51,6 +51,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
+	testImplementation 'io.rest-assured:rest-assured:5.1.1'
 }
 
 tasks.named('bootBuildImage') {

diff --git a/backend/core/src/main/java/com/rollthedice/backend/domain/member/api/MemberController.java b/backend/core/src/main/java/com/rollthedice/backend/domain/member/api/MemberController.java
@@ -16,19 +16,6 @@
 public class MemberController implements MemberApi{
     private final MemberService memberService;
 
-    @PostMapping("")
-    public ResponseEntity<HttpStatus> updateMember(@LoginMemberEmail String email,
-                                                   @RequestBody MemberUpdateDto memberUpdateDto) {
-        MemberServiceDto memberServiceDto = memberUpdateDto.toServiceDto(email);
-
-        if (memberService.isDuplicatedNickname(memberServiceDto)) {
-            return ResponseEntity.status(HttpStatus.CONFLICT).build();
-        }
-        memberService.update(memberServiceDto);
-
-        return ResponseEntity.status(HttpStatus.OK).build();
-    }
-
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("")
     @Override

diff --git a/backend/core/src/main/java/com/rollthedice/backend/domain/member/service/MemberService.java b/backend/core/src/main/java/com/rollthedice/backend/domain/member/service/MemberService.java
@@ -1,6 +1,7 @@
 package com.rollthedice.backend.domain.member.service;
 
 import com.rollthedice.backend.domain.member.dto.MemberServiceDto;
+import com.rollthedice.backend.domain.member.dto.MemberUpdateDto;
 import com.rollthedice.backend.domain.member.dto.response.MemberResponse;
 import com.rollthedice.backend.domain.member.entity.Member;
 import com.rollthedice.backend.domain.member.exception.MemberNotFoundException;
@@ -11,9 +12,11 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class MemberService {
@@ -27,8 +30,9 @@ public boolean isDuplicatedNickname(MemberServiceDto memberServiceDto) {
     }
 
     @Transactional
-    public void update(MemberServiceDto memberServiceDto) {
-        findByEmail(memberServiceDto.getEmail()).update(memberServiceDto);
+    public void update(MemberUpdateDto memberUpdateDto) {
+        Member loginMember = authService.getMember();
+        loginMember.signUp(memberUpdateDto.getNickname());
     }
 
     @Transactional(readOnly = true)

diff --git a/backend/core/src/main/java/com/rollthedice/backend/domain/news/api/NewsController.java b/backend/core/src/main/java/com/rollthedice/backend/domain/news/api/NewsController.java
@@ -1,6 +1,5 @@
 package com.rollthedice.backend.domain.news.api;
 
-import com.rollthedice.backend.domain.crawling.NewsCrawlingService;
 import com.rollthedice.backend.domain.news.dto.response.NewsDetailResponse;
 import com.rollthedice.backend.domain.news.dto.response.NewsResponse;
 import com.rollthedice.backend.domain.news.dto.response.ReadNewsResponse;
@@ -19,7 +18,6 @@
 public class NewsController implements NewsApi {
     private final NewsService newsService;
     private final ReadNewsService readNewsService;
-    private final NewsCrawlingService crawlingService;
 
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("")

diff --git a/backend/core/src/main/java/com/rollthedice/backend/domain/news/entity/News.java b/backend/core/src/main/java/com/rollthedice/backend/domain/news/entity/News.java
@@ -2,10 +2,7 @@
 
 import com.rollthedice.backend.global.config.BaseTimeEntity;
 import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.annotations.ColumnDefault;
 
@@ -31,9 +28,14 @@ public class News extends BaseTimeEntity {
     private long views;
 
     @Builder
-    public News(String url, String thumbnailUrl) {
+    public News(Long id, String url, String thumbnailUrl, String title, String content, String category, String postDate) {
+        this.id = id;
         this.url = url;
         this.thumbnailUrl = thumbnailUrl;
+        this.title = title;
+        this.content = content;
+        this.category = category;
+        this.postDate = postDate;
     }
 
     public void addNewsBody(String title, String content, String category, String postDate) {

diff --git a/...d/core/src/main/java/com/rollthedice/backend/domain/notification/entity/Notification.java b/...d/core/src/main/java/com/rollthedice/backend/domain/notification/entity/Notification.java
diff --git a/backend/core/src/main/java/com/rollthedice/backend/global/error/ErrorCode.java b/backend/core/src/main/java/com/rollthedice/backend/global/error/ErrorCode.java
@@ -21,5 +21,5 @@ public enum ErrorCode {
 
 
     private final HttpStatus status;
-    private final String message;
+    private final String errorMessage;
 }
diff --git a/backend/core/src/main/java/com/rollthedice/backend/global/error/ErrorResponse.java b/backend/core/src/main/java/com/rollthedice/backend/global/error/ErrorResponse.java
@@ -3,22 +3,20 @@
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
 
-import java.util.Collections;
-
 @Getter
 public class ErrorResponse {
-    private HttpStatus status;
-    private String message;
+    private final HttpStatus status;
+    private final String errorMessage;
 
-    public ErrorResponse(HttpStatus status, String message) {
+    public ErrorResponse(HttpStatus status, String errorMessage) {
         this.status = status;
-        this.message = message;
+        this.errorMessage = errorMessage;
     }
 
     public static ErrorResponse create(final ErrorCode errorCode) {
         return new ErrorResponse(
                 errorCode.getStatus(),
-                errorCode.getMessage()
+                errorCode.getErrorMessage()
         );
     }
 }
diff --git a/backend/core/src/main/java/com/rollthedice/backend/global/error/GlobalExceptionHandler.java b/backend/core/src/main/java/com/rollthedice/backend/global/error/GlobalExceptionHandler.java
@@ -18,7 +18,7 @@ protected ResponseEntity<ErrorResponse> handleRuntimeException(BusinessException
         return ResponseEntity
                 .status(errorCode.getStatus())
                 .body(new ErrorResponse(errorCode.getStatus(),
-                        errorCode.getMessage()));
+                        errorCode.getErrorMessage()));
     }
 
 }
diff --git a/.../core/src/main/java/com/rollthedice/backend/global/error/exception/BusinessException.java b/.../core/src/main/java/com/rollthedice/backend/global/error/exception/BusinessException.java
@@ -8,7 +8,7 @@ public class BusinessException extends RuntimeException{
     private final ErrorCode errorCode;
 
     public BusinessException(ErrorCode errorCode) {
-        super(errorCode.getMessage());
+        super(errorCode.getErrorMessage());
         this.errorCode = errorCode;
     }
 }
diff --git a/backend/core/src/main/java/com/rollthedice/backend/global/oauth2/OAuthAttributes.java b/backend/core/src/main/java/com/rollthedice/backend/global/oauth2/OAuthAttributes.java
@@ -41,7 +41,7 @@ public Member toEntity(SocialType socialType, OAuth2UserInfo oauth2UserInfo) {
                 .email(oauth2UserInfo.getEmail())
                 .nickname(oauth2UserInfo.getNickname())
                 .imageUrl(oauth2UserInfo.getImageUrl())
-                .role(Role.GUEST)
+                .role(Role.USER)
                 .status(Status.ACTIVE)
                 .build();
     }

diff --git a/...d/core/src/main/java/com/rollthedice/backend/global/oauth2/controller/AuthController.java b/...d/core/src/main/java/com/rollthedice/backend/global/oauth2/controller/AuthController.java
@@ -1,23 +1,38 @@
 package com.rollthedice.backend.global.oauth2.controller;
 
+import com.rollthedice.backend.domain.member.dto.MemberUpdateDto;
+import com.rollthedice.backend.domain.member.service.MemberService;
+import com.rollthedice.backend.global.annotation.LoginMemberEmail;
 import com.rollthedice.backend.global.oauth2.dto.LoginRequest;
 import com.rollthedice.backend.global.oauth2.service.AuthService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 public class AuthController {
     private final AuthService authService;
+    private final MemberService memberService;
 
     @PostMapping("/login")
     public ResponseEntity<HttpStatus> login(@RequestBody LoginRequest request, HttpServletResponse response) {
         authService.authenticateOrRegisterUser(request, response);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @PostMapping("/oauth2/sign-up")
+    public ResponseEntity<HttpStatus> updateMember(@LoginMemberEmail String email,
+                                                   @RequestBody MemberUpdateDto memberUpdateDto) {
+        memberService.update(memberUpdateDto);
+
+        return ResponseEntity.status(HttpStatus.OK).build();
+    }
+
 }
diff --git a/backend/core/src/main/java/com/rollthedice/backend/global/oauth2/service/AuthService.java b/backend/core/src/main/java/com/rollthedice/backend/global/oauth2/service/AuthService.java
@@ -41,8 +41,8 @@ private Member registerMember(SocialType socialType, OAuth2UserInfo userInfo) {
         Member member = Member.builder()
                 .socialType(socialType)
                 .oauthId(userInfo.getId())
-                .email(UUID.randomUUID() + "@socialUser.com")
-                .nickname(String.valueOf(UUID.randomUUID()))
+                .email(userInfo.getEmail())
+                .nickname(userInfo.getNickname())
                 .imageUrl(userInfo.getImageUrl())
                 .role(Role.USER)
                 .build();
@@ -51,10 +51,9 @@ private Member registerMember(SocialType socialType, OAuth2UserInfo userInfo) {
     }
 
     public Member getMember() {
-
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        UserDetails userDetails = (UserDetails) authentication.getPrincipal();
-        return memberRepository.findByEmail(userDetails.getUsername()).orElseThrow(MemberNotFoundException::new);
+        String username = authentication.getName();
+        return memberRepository.findByEmail(username).orElseThrow(MemberNotFoundException::new);
     }
 
 }
diff --git a/...nd/core/src/main/java/com/rollthedice/backend/global/security/jwt/service/JwtService.java b/...nd/core/src/main/java/com/rollthedice/backend/global/security/jwt/service/JwtService.java
@@ -51,7 +51,7 @@ public void sendAccessAndRefreshToken(HttpServletResponse response, String email
         log.info("Access Token, Refresh Token 헤더 설정 완료");
     }
 
-    private String createAccessToken(String email) {
+    public String createAccessToken(String email) {
         Date now = new Date();
         return JWT.create()
                 .withSubject(ACCESS_TOKEN_SUBJECT)

diff --git a/backend/core/src/test/java/com/rollthedice/backend/domain/auth/AuthTest.java b/backend/core/src/test/java/com/rollthedice/backend/domain/auth/AuthTest.java